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

Always change editor selection when navigating outline panel entries (#21375)

Browse source 
Also scroll to the center when doing so.

This way, related editor's breadcrumbs always update, bringing more
information.

Release Notes:

- Adjust outline panel item opening behavior to always change the editor
selection, and center it
This commit is contained in:
Kirill Bulatov 2024-12-01 01:49:41 +02:00 • committed by GitHub
parent 28849dd2a8
commit bf569d720e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/outline_panel/src/outline_panel.rs
View file

@ -811,7 +811,7 @@ impl OutlinePanel {
if self.filter_editor.focus_handle(cx).is_focused(cx) { if self.filter_editor.focus_handle(cx).is_focused(cx) {
cx.propagate() cx.propagate()
} else if let Some(selected_entry) = self.selected_entry().cloned() { } else if let Some(selected_entry) = self.selected_entry().cloned() {
self.open_entry(&selected_entry, true, cx); self.open_entry(&selected_entry, true, false, cx);
} }
} }
@ -834,7 +834,7 @@ impl OutlinePanel {
} else if let Some((active_editor, selected_entry)) = } else if let Some((active_editor, selected_entry)) =
self.active_editor().zip(self.selected_entry().cloned()) self.active_editor().zip(self.selected_entry().cloned())
{ {
self.open_entry(&selected_entry, true, cx); self.open_entry(&selected_entry, true, true, cx);
active_editor.update(cx, |editor, cx| editor.open_excerpts(action, cx)); active_editor.update(cx, |editor, cx| editor.open_excerpts(action, cx));
} }
} }
@ -849,7 +849,7 @@ impl OutlinePanel {
} else if let Some((active_editor, selected_entry)) = } else if let Some((active_editor, selected_entry)) =
self.active_editor().zip(self.selected_entry().cloned()) self.active_editor().zip(self.selected_entry().cloned())
{ {
self.open_entry(&selected_entry, true, cx); self.open_entry(&selected_entry, true, true, cx);
active_editor.update(cx, |editor, cx| editor.open_excerpts_in_split(action, cx)); active_editor.update(cx, |editor, cx| editor.open_excerpts_in_split(action, cx));
} }
} }
@ -858,6 +858,7 @@ impl OutlinePanel {
&mut self, &mut self,
entry: &PanelEntry, entry: &PanelEntry,
change_selection: bool, change_selection: bool,
change_focus: bool,
cx: &mut ViewContext<OutlinePanel>, cx: &mut ViewContext<OutlinePanel>,
) { ) {
let Some(active_editor) = self.active_editor() else { let Some(active_editor) = self.active_editor() else {
@ -929,9 +930,9 @@ impl OutlinePanel {
.workspace .workspace
.update(cx, |workspace, cx| match self.active_item() { .update(cx, |workspace, cx| match self.active_item() {
Some(active_item) => { Some(active_item) => {
workspace.activate_item(active_item.as_ref(), true, change_selection, cx) workspace.activate_item(active_item.as_ref(), true, change_focus, cx)
} }
None => workspace.activate_item(&active_editor, true, change_selection, cx), None => workspace.activate_item(&active_editor, true, change_focus, cx),
}); });
if activate.is_ok() { if activate.is_ok() {
@ -939,16 +940,20 @@ impl OutlinePanel {
if change_selection { if change_selection {
active_editor.update(cx, |editor, cx| { active_editor.update(cx, |editor, cx| {
editor.change_selections( editor.change_selections(
Some(Autoscroll::Strategy(AutoscrollStrategy::Top)), Some(Autoscroll::Strategy(AutoscrollStrategy::Center)),
cx, cx,
|s| s.select_ranges(Some(anchor..anchor)), |s| s.select_ranges(Some(anchor..anchor)),
); );
}); });
active_editor.focus_handle(cx).focus(cx);
} else { } else {
active_editor.update(cx, |editor, cx| { active_editor.update(cx, |editor, cx| {
editor.set_scroll_anchor(ScrollAnchor { offset, anchor }, cx); editor.set_scroll_anchor(ScrollAnchor { offset, anchor }, cx);
}); });
}
if change_focus {
active_editor.focus_handle(cx).focus(cx);
} else {
self.focus_handle.focus(cx); self.focus_handle.focus(cx);
} }
} }
@ -969,7 +974,7 @@ impl OutlinePanel {
self.select_first(&SelectFirst {}, cx) self.select_first(&SelectFirst {}, cx)
} }
if let Some(selected_entry) = self.selected_entry().cloned() { if let Some(selected_entry) = self.selected_entry().cloned() {
self.open_entry(&selected_entry, false, cx); self.open_entry(&selected_entry, true, false, cx);
} }
} }
@ -988,7 +993,7 @@ impl OutlinePanel {
self.select_last(&SelectLast, cx) self.select_last(&SelectLast, cx)
} }
if let Some(selected_entry) = self.selected_entry().cloned() { if let Some(selected_entry) = self.selected_entry().cloned() {
self.open_entry(&selected_entry, false, cx); self.open_entry(&selected_entry, true, false, cx);
} }
} }
@ -2027,9 +2032,9 @@ impl OutlinePanel {
if event.down.button == MouseButton::Right || event.down.first_mouse { if event.down.button == MouseButton::Right || event.down.first_mouse {
return; return;
} }
let change_selection = event.down.click_count > 1; let change_focus = event.down.click_count > 1;
outline_panel.toggle_expanded(&clicked_entry, cx); outline_panel.toggle_expanded(&clicked_entry, cx);
outline_panel.open_entry(&clicked_entry, change_selection, cx); outline_panel.open_entry(&clicked_entry, true, change_focus, cx);
}) })
}) })
.cursor_pointer() .cursor_pointer()
@ -4863,9 +4868,13 @@ mod tests {
), ),
select_first_in_all_matches(navigated_outline_selection) select_first_in_all_matches(navigated_outline_selection)
); );
});
cx.executor()
.advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
outline_panel.update(cx, |_, cx| {
assert_eq!( assert_eq!(
selected_row_text(&active_editor, cx), selected_row_text(&active_editor, cx),
initial_outline_selection.replace("search: ", ""), // Clear outline metadata prefixes navigated_outline_selection.replace("search: ", ""), // Clear outline metadata prefixes
"Should still have the initial caret position after SelectNext calls" "Should still have the initial caret position after SelectNext calls"
); );
}); });
@ -4895,9 +4904,13 @@ mod tests {
), ),
select_first_in_all_matches(next_navigated_outline_selection) select_first_in_all_matches(next_navigated_outline_selection)
); );
});
cx.executor()
.advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
outline_panel.update(cx, |_, cx| {
assert_eq!( assert_eq!(
selected_row_text(&active_editor, cx), selected_row_text(&active_editor, cx),
navigated_outline_selection.replace("search: ", ""), // Clear outline metadata prefixes next_navigated_outline_selection.replace("search: ", ""), // Clear outline metadata prefixes
"Should again preserve the selection after another SelectNext call" "Should again preserve the selection after another SelectNext call"
); );
}); });