diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index d671773d25..e0c11cafe9 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -85,13 +85,13 @@ impl DisplayMap { let (snapshot, edits) = self .wrap_map .update(cx, |map, cx| map.sync(snapshot, edits, cx)); - self.block_map.sync(&snapshot, edits, cx); + self.block_map.read(snapshot, edits, cx); let (snapshot, edits) = fold_map.fold(ranges, cx); let (snapshot, edits) = self.tab_map.sync(snapshot, edits); let (snapshot, edits) = self .wrap_map .update(cx, |map, cx| map.sync(snapshot, edits, cx)); - self.block_map.sync(&snapshot, edits, cx); + self.block_map.read(snapshot, edits, cx); } pub fn unfold( @@ -104,13 +104,13 @@ impl DisplayMap { let (snapshot, edits) = self .wrap_map .update(cx, |map, cx| map.sync(snapshot, edits, cx)); - self.block_map.sync(&snapshot, edits, cx); + self.block_map.read(snapshot, edits, cx); let (snapshot, edits) = fold_map.unfold(ranges, cx); let (snapshot, edits) = self.tab_map.sync(snapshot, edits); let (snapshot, edits) = self .wrap_map .update(cx, |map, cx| map.sync(snapshot, edits, cx)); - self.block_map.sync(&snapshot, edits, cx); + self.block_map.read(snapshot, edits, cx); } pub fn insert_blocks( diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs index 7e7cdc328f..3d40bf74d7 100644 --- a/crates/editor/src/display_map/block_map.rs +++ b/crates/editor/src/display_map/block_map.rs @@ -163,7 +163,7 @@ impl BlockMap { BlockMapWriter(self) } - pub fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec, cx: &AppContext) { + fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec, cx: &AppContext) { if edits.is_empty() { return; } diff --git a/crates/editor/src/lib.rs b/crates/editor/src/lib.rs index 151dffa324..911e83b39b 100644 --- a/crates/editor/src/lib.rs +++ b/crates/editor/src/lib.rs @@ -24,7 +24,7 @@ use smol::Timer; use std::{ cell::RefCell, cmp::{self, Ordering}, - collections::{HashMap, HashSet}, + collections::HashMap, iter, mem, ops::{Range, RangeInclusive}, rc::Rc,