mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix panic when canceling with a pending selection

Browse source
This commit is contained in:
Max Brunsfeld 2022-02-11 15:31:54 -08:00
parent 01664d494c
commit 06bb8d2779
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/editor/src/editor.rs
View file

@ -1453,18 +1453,13 @@ impl Editor {
if self.active_diagnostics.is_some() {
self.dismiss_diagnostics(cx);
} else if let Some(PendingSelection { selection, .. }) = self.pending_selection.take() {
let buffer = self.buffer.read(cx).snapshot(cx);
let selection = Selection {
id: selection.id,
start: selection.start.to_point(&buffer),
end: selection.end.to_point(&buffer),
reversed: selection.reversed,
goal: selection.goal,
};
if self.local_selections::<Point>(cx).is_empty() {
self.update_selections(vec![selection], Some(Autoscroll::Fit), cx);
} else if let Some(pending) = self.pending_selection.clone() {
let mut selections = self.selections.clone();
if selections.is_empty() {
selections = Arc::from([pending.selection]);
}
self.set_selections(selections, None, cx);
self.request_autoscroll(Autoscroll::Fit, cx);
} else {
let buffer = self.buffer.read(cx).snapshot(cx);
let mut oldest_selection = self.oldest_selection::<usize>(&buffer);