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

Only store one nav history entry when opening excerpts

Browse Source 
Also: Introduce the ability to disable and enable the nav history directly. This allows us to explicitly push an entry when opening excerpts and then disable all pushes as we open individual buffers.
This commit is contained in:
Nathan Sobo
2022-02-25 19:26:15 -07:00
parent 721258911c
commit 60710fa5d5
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/editor.rs
+17 -15
View File
@@ -4172,6 +4172,7 @@ impl Editor {
cx.spawn(|workspace, mut cx| async move {
let definitions = definitions.await?;
workspace.update(&mut cx, |workspace, cx| {
let nav_history = workspace.active_pane().read(cx).nav_history().clone();
for definition in definitions {
let range = definition.range.to_offset(definition.buffer.read(cx));
let target_editor_handle = workspace
@@ -4182,15 +4183,11 @@ impl Editor {
target_editor_handle.update(cx, |target_editor, cx| {
// When selecting a definition in a different buffer, disable the nav history
// to avoid creating a history entry at the previous cursor location.
let prev_nav_history_len = target_editor
.nav_history()
.map_or(0, |history| history.len());
target_editor.select_ranges([range], Some(Autoscroll::Center), cx);
if editor_handle != target_editor_handle {
if let Some(history) = target_editor.nav_history() {
history.truncate(prev_nav_history_len);
}
nav_history.borrow_mut().disable();
}
target_editor.select_ranges([range], Some(Autoscroll::Center), cx);
nav_history.borrow_mut().enable();
});
}
});
@@ -5389,28 +5386,33 @@ impl Editor {
}
}
editor_handle.update(cx, |editor, cx| {
editor.push_to_nav_history(editor.newest_anchor_selection().head(), None, cx);
});
let nav_history = workspace.active_pane().read(cx).nav_history().clone();
nav_history.borrow_mut().disable();
// We defer the pane interaction because we ourselves are a workspace item
// and activating a new item causes the pane to call a method on us reentrantly,
// which panics if we're on the stack.
cx.defer(|workspace, cx| {
for (buffer, ranges) in new_selections_by_buffer {
cx.defer(move |workspace, cx| {
for (ix, (buffer, ranges)) in new_selections_by_buffer.into_iter().enumerate() {
let buffer = BufferItemHandle(buffer);
if !workspace.activate_pane_for_item(&buffer, cx) {
if ix == 0 && !workspace.activate_pane_for_item(&buffer, cx) {
workspace.activate_next_pane(cx);
}
let editor = workspace
.open_item(buffer, cx)
.downcast::<Editor>()
.unwrap();
editor.update(cx, |editor, cx| {
let prev_nav_history_len =
editor.nav_history().map_or(0, |history| history.len());
editor.select_ranges(ranges, Some(Autoscroll::Newest), cx);
if let Some(history) = editor.nav_history() {
history.truncate(prev_nav_history_len);
}
});
}
nav_history.borrow_mut().enable();
});
}
}