:lipstick:

Antonio Scandurra created 4 years ago

Change summary

zed/src/editor/display_map/fold_map.rs | 3 +--
zed/src/editor/display_map/mod.rs      | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)

Detailed changes

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()),
         }
     }
 

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)))
     }
 }