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

Move focus into editor for outline_panel::Open action on outlines and search results (#24535)

Browse source 
Follow-up of
https://github.com/zed-industries/zed/discussions/19782#discussioncomment-12055976

Release Notes:

- Fixed outline panel not focusing editor when outlines and search
results were opened with `outline_panel::Open`
This commit is contained in:
Kirill Bulatov 2025-02-09 19:27:41 +02:00 • committed by GitHub
parent f42177a912
commit 6ee447ee58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -930,7 +930,7 @@ impl OutlinePanel {
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.toggle_expanded(&selected_entry, window, cx); self.toggle_expanded(&selected_entry, window, cx);
self.scroll_editor_to_entry(&selected_entry, true, false, window, cx); self.scroll_editor_to_entry(&selected_entry, true, true, window, cx);
} }
} }
@ -985,7 +985,7 @@ impl OutlinePanel {
&mut self, &mut self,
entry: &PanelEntry, entry: &PanelEntry,
prefer_selection_change: bool, prefer_selection_change: bool,
change_focus: bool, prefer_focus_change: bool,
window: &mut Window, window: &mut Window,
cx: &mut Context<OutlinePanel>, cx: &mut Context<OutlinePanel>,
) { ) {
@ -995,9 +995,13 @@ impl OutlinePanel {
let active_multi_buffer = active_editor.read(cx).buffer().clone(); let active_multi_buffer = active_editor.read(cx).buffer().clone();
let multi_buffer_snapshot = active_multi_buffer.read(cx).snapshot(cx); let multi_buffer_snapshot = active_multi_buffer.read(cx).snapshot(cx);
let mut change_selection = prefer_selection_change; let mut change_selection = prefer_selection_change;
let mut change_focus = prefer_focus_change;
let mut scroll_to_buffer = None; let mut scroll_to_buffer = None;
let scroll_target = match entry { let scroll_target = match entry {
PanelEntry::FoldedDirs(..) | PanelEntry::Fs(FsEntry::Directory(..)) => None, PanelEntry::FoldedDirs(..) | PanelEntry::Fs(FsEntry::Directory(..)) => {
change_focus = false;
None
}
PanelEntry::Fs(FsEntry::ExternalFile(file)) => { PanelEntry::Fs(FsEntry::ExternalFile(file)) => {
change_selection = false; change_selection = false;
scroll_to_buffer = Some(file.buffer_id); scroll_to_buffer = Some(file.buffer_id);
@ -1041,6 +1045,7 @@ impl OutlinePanel {
}), }),
PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => { PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
change_selection = false; change_selection = false;
change_focus = false;
multi_buffer_snapshot.anchor_in_excerpt(excerpt.id, excerpt.range.context.start) multi_buffer_snapshot.anchor_in_excerpt(excerpt.id, excerpt.range.context.start)
} }
PanelEntry::Search(search_entry) => Some(search_entry.match_range.start), PanelEntry::Search(search_entry) => Some(search_entry.match_range.start),