oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

End pending selection when starting a transaction

Browse Source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra
2021-11-03 19:15:54 +01:00
co-authored by Max Brunsfeld Nathan Sobo
parent c07d794249
commit 941d935c4a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/lib.rs
+6 -3
View File
@@ -670,8 +670,10 @@ impl Editor {
}
fn end_selection(&mut self, cx: &mut ViewContext<Self>) {
let selections = self.selections::<Point>(cx).collect::<Vec<_>>();
self.update_selections(selections, false, cx);
if self.pending_selection.is_some() {
let selections = self.selections::<usize>(cx).collect::<Vec<_>>();
self.update_selections(selections, false, cx);
}
}
pub fn is_selecting(&self) -> bool {
@@ -2404,7 +2406,8 @@ impl Editor {
cx.notify();
}
fn start_transaction(&self, cx: &mut ViewContext<Self>) {
fn start_transaction(&mut self, cx: &mut ViewContext<Self>) {
self.end_selection(cx);
self.buffer.update(cx, |buffer, _| {
buffer
.start_transaction(Some(self.selection_set_id))