Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make BlockMap::sync private

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-11-19 15:44:19 +01:00
parent dfbfa86548
commit 61d8848b31
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/editor/src/display_map.rs
View file

@ -85,13 +85,13 @@ impl DisplayMap {
let (snapshot, edits) = self let (snapshot, edits) = self
.wrap_map .wrap_map
.update(cx, |map, cx| map.sync(snapshot, edits, cx)); .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) = fold_map.fold(ranges, cx);
let (snapshot, edits) = self.tab_map.sync(snapshot, edits); let (snapshot, edits) = self.tab_map.sync(snapshot, edits);
let (snapshot, edits) = self let (snapshot, edits) = self
.wrap_map .wrap_map
.update(cx, |map, cx| map.sync(snapshot, edits, cx)); .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<T: ToOffset>( pub fn unfold<T: ToOffset>(
@ -104,13 +104,13 @@ impl DisplayMap {
let (snapshot, edits) = self let (snapshot, edits) = self
.wrap_map .wrap_map
.update(cx, |map, cx| map.sync(snapshot, edits, cx)); .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) = fold_map.unfold(ranges, cx);
let (snapshot, edits) = self.tab_map.sync(snapshot, edits); let (snapshot, edits) = self.tab_map.sync(snapshot, edits);
let (snapshot, edits) = self let (snapshot, edits) = self
.wrap_map .wrap_map
.update(cx, |map, cx| map.sync(snapshot, edits, cx)); .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<P, T>( pub fn insert_blocks<P, T>(

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

@ -163,7 +163,7 @@ impl BlockMap {
BlockMapWriter(self) BlockMapWriter(self)
} }
pub fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec<WrapEdit>, cx: &AppContext) { fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec<WrapEdit>, cx: &AppContext) {
if edits.is_empty() { if edits.is_empty() {
return; return;
} }

2
crates/editor/src/lib.rs
View file

@ -24,7 +24,7 @@ use smol::Timer;
use std::{ use std::{
cell::RefCell, cell::RefCell,
cmp::{self, Ordering}, cmp::{self, Ordering},
collections::{HashMap, HashSet}, collections::HashMap,
iter, mem, iter, mem,
ops::{Range, RangeInclusive}, ops::{Range, RangeInclusive},
rc::Rc, rc::Rc,