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

Fix selection set id mismatch when rendering guest selections

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-11-22 14:10:17 -08:00
parent ca4086b844
commit cfe6103daf
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2458,12 +2458,15 @@ impl Editor {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx)); let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let selections = self let selections = self
.selection_set(cx) .buffer
.read(cx)
.selection_set(set_id)
.unwrap()
.selections::<Point, _>(buffer) .selections::<Point, _>(buffer)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let start = range.start.to_point(&display_map); let start = range.start.to_point(&display_map);
let start_index = self.selection_insertion_index(&selections, start); let start_index = self.selection_insertion_index(&selections, start);
let pending_selection = if set_id.replica_id == self.buffer.read(cx).replica_id() { let pending_selection = if set_id == self.selection_set_id {
self.pending_selection.as_ref().and_then(|pending| { self.pending_selection.as_ref().and_then(|pending| {
let mut selection_start = pending.start.to_display_point(&display_map); let mut selection_start = pending.start.to_display_point(&display_map);
let mut selection_end = pending.end.to_display_point(&display_map); let mut selection_end = pending.end.to_display_point(&display_map);