mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

wip

Browse source
This commit is contained in:
Max Brunsfeld 2021-11-12 12:09:35 -08:00
parent 227c612dac
commit 6f97a9be3b
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use buffer::{rope, Anchor, Bias, Point, Rope, ToOffset};
use gpui::fonts::HighlightStyle;
use language::HighlightedChunk;
use parking_lot::Mutex;
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;
struct BlockMap {
@ -63,7 +63,7 @@ struct TransformSummary {
}
struct HighlightedChunks<'a> {
transforms: sum_tree::Cursor<'a, Transform, (OutputRow, InputRow)>,
transform_cursor: sum_tree::Cursor<'a, Transform, (OutputRow, InputRow)>,
input_chunks: wrap_map::HighlightedChunks<'a>,
input_chunk: Option<HighlightedChunk<'a>>,
block_chunks: Option<BlockChunks<'a>>,
@ -202,7 +202,7 @@ impl BlockSnapshot {
input_chunks,
input_chunk: None,
block_chunks: None,
transforms: cursor,
transform_cursor: cursor,
output_position: BlockPoint(Point::new(rows.start, 0)),
max_output_row: rows.end,
}
@ -258,7 +258,25 @@ impl<'a> Iterator for HighlightedChunks<'a> {
type Item = HighlightedChunk<'a>;
fn next(&mut self) -> Option<Self::Item> {
//
if let Some(current_block) = self.block_chunks.as_mut() {
if let Some(chunk) = current_block.next() {
return Some(chunk);
} else {
self.block_chunks.take();
}
}
let transform = if let Some(item) = self.transform_cursor.item() {
item
} else {
return None;
};
if let Some(block) = &transform.block {
let of
}
None
}
}