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

Allow buffer search in project search (#23819)

Browse source 
Closes #13437
Closes #19993

Release Notes:

- Allow searching within the results of a project search
- vim: Fix `/`/`?`, `n`/`N`, `gn`/`gN`,`*`/`#` in project search results

---------

Co-authored-by: Nico <nico.lehmann@gmail.com>
This commit is contained in:
Conrad Irwin 2025-01-31 00:13:46 -07:00 • committed by GitHub
parent e1af35aa15
commit f2b3f3a9ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 191 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/workspace/src/toolbar.rs
View file

@ -82,7 +82,7 @@ impl Toolbar {
}
fn secondary_items(&self) -> impl Iterator<Item = &dyn ToolbarItemViewHandle> {
self.items.iter().filter_map(|(item, location)| {
self.items.iter().rev().filter_map(|(item, location)| {
if *location == ToolbarItemLocation::Secondary {
Some(item.as_ref())
} else {
@ -98,7 +98,7 @@ impl Render for Toolbar {
return div();
}
let secondary_item = self.secondary_items().next().map(|item| item.to_any());
let secondary_items = self.secondary_items().map(|item| item.to_any());
let has_left_items = self.left_items().count() > 0;
let has_right_items = self.right_items().count() > 0;
@ -145,7 +145,7 @@ impl Render for Toolbar {
}),
)
})
.children(secondary_item)
.children(secondary_items)
}
}