From 2e7593dd79ebbe19a6316ce69edc9356c0128c6b Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 25 May 2021 14:16:33 +0200 Subject: [PATCH] :lipstick: --- zed/src/editor/display_map/fold_map.rs | 3 +-- zed/src/editor/display_map/mod.rs | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/zed/src/editor/display_map/fold_map.rs b/zed/src/editor/display_map/fold_map.rs index 8a8471d6ee2f37a0b84d67eb04d5d02eb23f6b1a..3496433d677335e1a653e209cb0e0eef58f77abb 100644 --- a/zed/src/editor/display_map/fold_map.rs +++ b/zed/src/editor/display_map/fold_map.rs @@ -418,11 +418,10 @@ impl FoldMapSnapshot { transform_cursor.seek(&offset, SeekBias::Right, &()); let overshoot = offset.0 - transform_cursor.start().display.bytes; let buffer_offset = transform_cursor.start().buffer.bytes + overshoot; - let rope_cursor = self.buffer.text_for_range(buffer_offset..self.buffer.len()); Chunks { transform_cursor, buffer_offset, - buffer_chunks: rope_cursor, + buffer_chunks: self.buffer.text_for_range(buffer_offset..self.buffer.len()), } } diff --git a/zed/src/editor/display_map/mod.rs b/zed/src/editor/display_map/mod.rs index 2cf9de0b8c8deaf58030d4bc659e939636cc8989..56cc06468f8ae0a6313c6e697bffbc1e18e7e443 100644 --- a/zed/src/editor/display_map/mod.rs +++ b/zed/src/editor/display_map/mod.rs @@ -377,9 +377,7 @@ impl<'a> Iterator for HighlightedChunks<'a> { } } - let style_id = self.style_id; - self.style_id = StyleId::default(); - Some((mem::take(&mut self.chunk), style_id)) + Some((mem::take(&mut self.chunk), mem::take(&mut self.style_id))) } }