mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 21:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix compile errors

Browse source
This commit is contained in:
Max Brunsfeld 2021-11-12 13:55:47 -08:00
parent e605a5ead2
commit 2e61a586b6
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/editor/src/display_map/block_map.rs
View file

@ -3,8 +3,7 @@ use buffer::{rope, Anchor, Bias, Point, Rope, ToOffset};
use gpui::fonts::HighlightStyle; use gpui::fonts::HighlightStyle;
use language::HighlightedChunk; use language::HighlightedChunk;
use parking_lot::Mutex; use parking_lot::Mutex;
use smol::io::AsyncBufReadExt; use std::{cmp, collections::HashSet, iter, ops::Range, slice, sync::Arc};
use std::{borrow::Borrow, cmp, collections::HashSet, iter, ops::Range, slice, sync::Arc};
use sum_tree::SumTree; use sum_tree::SumTree;
struct BlockMap { struct BlockMap {
@ -169,7 +168,7 @@ impl BlockPoint {
self.0.row self.0.row
} }
fn row_mut(&self) -> &mut u32 { fn row_mut(&mut self) -> &mut u32 {
&mut self.0.row &mut self.0.row
} }
@ -177,7 +176,7 @@ impl BlockPoint {
self.0.column self.0.column
} }
fn column_mut(&self) -> &mut u32 { fn column_mut(&mut self) -> &mut u32 {
&mut self.0.column &mut self.0.column
} }
} }
@ -212,17 +211,19 @@ impl BlockSnapshot {
cursor.seek(&OutputRow(rows.start), Bias::Right, &()); cursor.seek(&OutputRow(rows.start), Bias::Right, &());
let (input_start, output_start) = cursor.start(); let (input_start, output_start) = cursor.start();
let row_overshoot = rows.start - output_start.0; let row_overshoot = rows.start - output_start.0;
let input_row = input_start.0 + row_overshoot; let input_start_row = input_start.0 + row_overshoot;
let input_end = self.to_wrap_point(BlockPoint(Point::new(rows.end, 0))); let input_end_row = self
.to_wrap_point(BlockPoint(Point::new(rows.end, 0)))
.row();
let input_chunks = self let input_chunks = self
.wrap_snapshot .wrap_snapshot
.highlighted_chunks_for_rows(input_row..input_end.row()); .highlighted_chunks_for_rows(input_start_row..input_end_row);
HighlightedChunks { HighlightedChunks {
input_chunks, input_chunks,
input_chunk: None, input_chunk: Default::default(),
block_chunks: None, block_chunks: None,
transforms: cursor, transforms: cursor,
output_position: BlockPoint(Point::new(rows.start, 0)), output_row: rows.start,
max_output_row: rows.end, max_output_row: rows.end,
} }
} }