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

Render project search query editor in toolbar

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-29 17:04:39 +02:00
parent a6bdb6dc5d
commit a11665ecc7
5 changed files with 307 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/search/src/buffer_search.rs
View file

@ -19,26 +19,30 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_bindings([ cx.add_bindings([
Binding::new("cmd-f", Deploy(true), Some("Editor && mode == full")), Binding::new("cmd-f", Deploy(true), Some("Editor && mode == full")),
Binding::new("cmd-e", Deploy(false), Some("Editor && mode == full")), Binding::new("cmd-e", Deploy(false), Some("Editor && mode == full")),
Binding::new("escape", Dismiss, Some("SearchBar")), Binding::new("escape", Dismiss, Some("BufferSearchBar")),
Binding::new("cmd-f", FocusEditor, Some("SearchBar")), Binding::new("cmd-f", FocusEditor, Some("BufferSearchBar")),
Binding::new("enter", SelectMatch(Direction::Next), Some("SearchBar")), Binding::new(
"enter",
SelectMatch(Direction::Next),
Some("BufferSearchBar"),
),
Binding::new( Binding::new(
"shift-enter", "shift-enter",
SelectMatch(Direction::Prev), SelectMatch(Direction::Prev),
Some("SearchBar"), Some("BufferSearchBar"),
), ),
Binding::new("cmd-g", SelectMatch(Direction::Next), Some("Pane")), Binding::new("cmd-g", SelectMatch(Direction::Next), Some("Pane")),
Binding::new("cmd-shift-G", SelectMatch(Direction::Prev), Some("Pane")), Binding::new("cmd-shift-G", SelectMatch(Direction::Prev), Some("Pane")),
]); ]);
cx.add_action(SearchBar::deploy); cx.add_action(BufferSearchBar::deploy);
cx.add_action(SearchBar::dismiss); cx.add_action(BufferSearchBar::dismiss);
cx.add_action(SearchBar::focus_editor); cx.add_action(BufferSearchBar::focus_editor);
cx.add_action(SearchBar::toggle_search_option); cx.add_action(BufferSearchBar::toggle_search_option);
cx.add_action(SearchBar::select_match); cx.add_action(BufferSearchBar::select_match);
cx.add_action(SearchBar::select_match_on_pane); cx.add_action(BufferSearchBar::select_match_on_pane);
} }
pub struct SearchBar { pub struct BufferSearchBar {
query_editor: ViewHandle<Editor>, query_editor: ViewHandle<Editor>,
active_editor: Option<ViewHandle<Editor>>, active_editor: Option<ViewHandle<Editor>>,
active_match_index: Option<usize>, active_match_index: Option<usize>,
@ -52,13 +56,13 @@ pub struct SearchBar {
dismissed: bool, dismissed: bool,
} }
impl Entity for SearchBar { impl Entity for BufferSearchBar {
type Event = (); type Event = ();
} }
impl View for SearchBar { impl View for BufferSearchBar {
fn ui_name() -> &'static str { fn ui_name() -> &'static str {
"SearchBar" "BufferSearchBar"
} }
fn on_focus(&mut self, cx: &mut ViewContext<Self>) { fn on_focus(&mut self, cx: &mut ViewContext<Self>) {
@ -132,7 +136,7 @@ impl View for SearchBar {
} }
} }
impl ToolbarItemView for SearchBar { impl ToolbarItemView for BufferSearchBar {
fn set_active_pane_item(&mut self, item: Option<&dyn ItemHandle>, cx: &mut ViewContext<Self>) { fn set_active_pane_item(&mut self, item: Option<&dyn ItemHandle>, cx: &mut ViewContext<Self>) {
cx.notify(); cx.notify();
self.active_editor_subscription.take(); self.active_editor_subscription.take();
@ -151,7 +155,7 @@ impl ToolbarItemView for SearchBar {
} }
} }
impl SearchBar { impl BufferSearchBar {
pub fn new(cx: &mut ViewContext<Self>) -> Self { pub fn new(cx: &mut ViewContext<Self>) -> Self {
let query_editor = let query_editor =
cx.add_view(|cx| Editor::auto_height(2, Some(|theme| theme.search.editor.clone()), cx)); cx.add_view(|cx| Editor::auto_height(2, Some(|theme| theme.search.editor.clone()), cx));
@ -295,7 +299,7 @@ impl SearchBar {
} }
fn deploy(pane: &mut Pane, Deploy(focus): &Deploy, cx: &mut ViewContext<Pane>) { fn deploy(pane: &mut Pane, Deploy(focus): &Deploy, cx: &mut ViewContext<Pane>) {
if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<SearchBar>() { if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
if search_bar.update(cx, |search_bar, cx| search_bar.show(*focus, cx)) { if search_bar.update(cx, |search_bar, cx| search_bar.show(*focus, cx)) {
return; return;
} }
@ -354,7 +358,7 @@ impl SearchBar {
} }
fn select_match_on_pane(pane: &mut Pane, action: &SelectMatch, cx: &mut ViewContext<Pane>) { fn select_match_on_pane(pane: &mut Pane, action: &SelectMatch, cx: &mut ViewContext<Pane>) {
if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<SearchBar>() { if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
search_bar.update(cx, |search_bar, cx| search_bar.select_match(action, cx)); search_bar.update(cx, |search_bar, cx| search_bar.select_match(action, cx));
} }
} }
@ -548,7 +552,7 @@ mod tests {
}); });
let search_bar = cx.add_view(Default::default(), |cx| { let search_bar = cx.add_view(Default::default(), |cx| {
let mut search_bar = SearchBar::new(cx); let mut search_bar = BufferSearchBar::new(cx);
search_bar.set_active_pane_item(Some(&editor), cx); search_bar.set_active_pane_item(Some(&editor), cx);
search_bar search_bar
}); });

465
crates/search/src/project_search.rs
View file

@ -6,8 +6,8 @@ use collections::HashMap;
use editor::{Anchor, Autoscroll, Editor, MultiBuffer, SelectAll}; use editor::{Anchor, Autoscroll, Editor, MultiBuffer, SelectAll};
use gpui::{ use gpui::{
action, elements::*, keymap::Binding, platform::CursorStyle, AppContext, ElementBox, Entity, action, elements::*, keymap::Binding, platform::CursorStyle, AppContext, ElementBox, Entity,
ModelContext, ModelHandle, MutableAppContext, RenderContext, Task, View, ViewContext, ModelContext, ModelHandle, MutableAppContext, RenderContext, Subscription, Task, View,
ViewHandle, WeakModelHandle, WeakViewHandle, ViewContext, ViewHandle, WeakModelHandle, WeakViewHandle,
}; };
use project::{search::SearchQuery, Project}; use project::{search::SearchQuery, Project};
use std::{ use std::{
@ -16,7 +16,7 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use util::ResultExt as _; use util::ResultExt as _;
use workspace::{Item, ItemNavHistory, Settings, Workspace}; use workspace::{Item, ItemNavHistory, Pane, Settings, ToolbarItemView, Workspace};
action!(Deploy); action!(Deploy);
action!(Search); action!(Search);
@ -31,29 +31,21 @@ struct ActiveSearches(HashMap<WeakModelHandle<Project>, WeakViewHandle<ProjectSe
pub fn init(cx: &mut MutableAppContext) { pub fn init(cx: &mut MutableAppContext) {
cx.set_global(ActiveSearches::default()); cx.set_global(ActiveSearches::default());
cx.add_bindings([ cx.add_bindings([
Binding::new("cmd-shift-F", ToggleFocus, Some("ProjectSearchView")), Binding::new("cmd-shift-F", ToggleFocus, Some("Pane")),
Binding::new("cmd-f", ToggleFocus, Some("ProjectSearchView")), Binding::new("cmd-f", ToggleFocus, Some("Pane")),
Binding::new("cmd-shift-F", Deploy, Some("Workspace")), Binding::new("cmd-shift-F", Deploy, Some("Workspace")),
Binding::new("enter", Search, Some("ProjectSearchView")), Binding::new("enter", Search, Some("ProjectSearchBar")),
Binding::new("cmd-enter", SearchInNew, Some("ProjectSearchView")), Binding::new("cmd-enter", SearchInNew, Some("ProjectSearchBar")),
Binding::new( Binding::new("cmd-g", SelectMatch(Direction::Next), Some("Pane")),
"cmd-g", Binding::new("cmd-shift-G", SelectMatch(Direction::Prev), Some("Pane")),
SelectMatch(Direction::Next),
Some("ProjectSearchView"),
),
Binding::new(
"cmd-shift-G",
SelectMatch(Direction::Prev),
Some("ProjectSearchView"),
),
]); ]);
cx.add_action(ProjectSearchView::deploy); cx.add_action(ProjectSearchView::deploy);
cx.add_action(ProjectSearchView::search); cx.add_action(ProjectSearchBar::search);
cx.add_action(ProjectSearchView::search_in_new); cx.add_action(ProjectSearchBar::search_in_new);
cx.add_action(ProjectSearchView::toggle_search_option); cx.add_action(ProjectSearchBar::toggle_search_option);
cx.add_action(ProjectSearchView::select_match); cx.add_action(ProjectSearchBar::select_match);
cx.add_action(ProjectSearchView::toggle_focus); cx.add_action(ProjectSearchBar::toggle_focus);
cx.capture_action(ProjectSearchView::tab); cx.capture_action(ProjectSearchBar::tab);
} }
struct ProjectSearch { struct ProjectSearch {
@ -75,6 +67,11 @@ struct ProjectSearchView {
active_match_index: Option<usize>, active_match_index: Option<usize>,
} }
pub struct ProjectSearchBar {
active_project_search: Option<ViewHandle<ProjectSearchView>>,
subscription: Option<Subscription>,
}
impl Entity for ProjectSearch { impl Entity for ProjectSearch {
type Event = (); type Event = ();
} }
@ -154,7 +151,7 @@ impl View for ProjectSearchView {
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
let model = &self.model.read(cx); let model = &self.model.read(cx);
let results = if model.match_ranges.is_empty() { if model.match_ranges.is_empty() {
let theme = &cx.global::<Settings>().theme; let theme = &cx.global::<Settings>().theme;
let text = if self.query_editor.read(cx).text(cx).is_empty() { let text = if self.query_editor.read(cx).text(cx).is_empty() {
"" ""
@ -173,12 +170,7 @@ impl View for ProjectSearchView {
ChildView::new(&self.results_editor) ChildView::new(&self.results_editor)
.flexible(1., true) .flexible(1., true)
.boxed() .boxed()
}; }
Flex::column()
.with_child(self.render_query_editor(cx))
.with_child(results)
.boxed()
} }
fn on_focus(&mut self, cx: &mut ViewContext<Self>) { fn on_focus(&mut self, cx: &mut ViewContext<Self>) {
@ -401,45 +393,12 @@ impl ProjectSearchView {
} }
} }
fn search(&mut self, _: &Search, cx: &mut ViewContext<Self>) { fn search(&mut self, cx: &mut ViewContext<Self>) {
if let Some(query) = self.build_search_query(cx) { if let Some(query) = self.build_search_query(cx) {
self.model.update(cx, |model, cx| model.search(query, cx)); self.model.update(cx, |model, cx| model.search(query, cx));
} }
} }
fn search_in_new(workspace: &mut Workspace, _: &SearchInNew, cx: &mut ViewContext<Workspace>) {
if let Some(search_view) = workspace
.active_item(cx)
.and_then(|item| item.downcast::<ProjectSearchView>())
{
let new_query = search_view.update(cx, |search_view, cx| {
let new_query = search_view.build_search_query(cx);
if new_query.is_some() {
if let Some(old_query) = search_view.model.read(cx).active_query.clone() {
search_view.query_editor.update(cx, |editor, cx| {
editor.set_text(old_query.as_str(), cx);
});
search_view.regex = old_query.is_regex();
search_view.whole_word = old_query.whole_word();
search_view.case_sensitive = old_query.case_sensitive();
}
}
new_query
});
if let Some(new_query) = new_query {
let model = cx.add_model(|cx| {
let mut model = ProjectSearch::new(workspace.project().clone(), cx);
model.search(new_query, cx);
model
});
workspace.add_item(
Box::new(cx.add_view(|cx| ProjectSearchView::new(model, cx))),
cx,
);
}
}
}
fn build_search_query(&mut self, cx: &mut ViewContext<Self>) -> Option<SearchQuery> { fn build_search_query(&mut self, cx: &mut ViewContext<Self>) -> Option<SearchQuery> {
let text = self.query_editor.read(cx).text(cx); let text = self.query_editor.read(cx).text(cx);
if self.regex { if self.regex {
@ -460,22 +419,7 @@ impl ProjectSearchView {
} }
} }
fn toggle_search_option( fn select_match(&mut self, direction: Direction, cx: &mut ViewContext<Self>) {
&mut self,
ToggleSearchOption(option): &ToggleSearchOption,
cx: &mut ViewContext<Self>,
) {
let value = match option {
SearchOption::WholeWord => &mut self.whole_word,
SearchOption::CaseSensitive => &mut self.case_sensitive,
SearchOption::Regex => &mut self.regex,
};
*value = !*value;
self.search(&Search, cx);
cx.notify();
}
fn select_match(&mut self, &SelectMatch(direction): &SelectMatch, cx: &mut ViewContext<Self>) {
if let Some(index) = self.active_match_index { if let Some(index) = self.active_match_index {
let model = self.model.read(cx); let model = self.model.read(cx);
let results_editor = self.results_editor.read(cx); let results_editor = self.results_editor.read(cx);
@ -494,26 +438,6 @@ impl ProjectSearchView {
} }
} }
fn toggle_focus(&mut self, _: &ToggleFocus, cx: &mut ViewContext<Self>) {
if self.query_editor.is_focused(cx) {
if !self.model.read(cx).match_ranges.is_empty() {
self.focus_results_editor(cx);
}
} else {
self.focus_query_editor(cx);
}
}
fn tab(&mut self, _: &editor::Tab, cx: &mut ViewContext<Self>) {
if self.query_editor.is_focused(cx) {
if !self.model.read(cx).match_ranges.is_empty() {
self.focus_results_editor(cx);
}
} else {
cx.propagate_action()
}
}
fn focus_query_editor(&self, cx: &mut ViewContext<Self>) { fn focus_query_editor(&self, cx: &mut ViewContext<Self>) {
self.query_editor.update(cx, |query_editor, cx| { self.query_editor.update(cx, |query_editor, cx| {
query_editor.select_all(&SelectAll, cx); query_editor.select_all(&SelectAll, cx);
@ -562,97 +486,123 @@ impl ProjectSearchView {
cx.notify(); cx.notify();
} }
} }
}
fn render_query_editor(&self, cx: &mut RenderContext<Self>) -> ElementBox { impl ProjectSearchBar {
let theme = cx.global::<Settings>().theme.clone(); pub fn new() -> Self {
let editor_container = if self.query_contains_error { Self {
theme.search.invalid_editor active_project_search: Default::default(),
subscription: Default::default(),
}
}
fn search(&mut self, _: &Search, cx: &mut ViewContext<Self>) {
if let Some(search_view) = self.active_project_search.as_ref() {
search_view.update(cx, |search_view, cx| search_view.search(cx));
}
}
fn search_in_new(workspace: &mut Workspace, _: &SearchInNew, cx: &mut ViewContext<Workspace>) {
if let Some(search_view) = workspace
.active_item(cx)
.and_then(|item| item.downcast::<ProjectSearchView>())
{
let new_query = search_view.update(cx, |search_view, cx| {
let new_query = search_view.build_search_query(cx);
if new_query.is_some() {
if let Some(old_query) = search_view.model.read(cx).active_query.clone() {
search_view.query_editor.update(cx, |editor, cx| {
editor.set_text(old_query.as_str(), cx);
});
search_view.regex = old_query.is_regex();
search_view.whole_word = old_query.whole_word();
search_view.case_sensitive = old_query.case_sensitive();
}
}
new_query
});
if let Some(new_query) = new_query {
let model = cx.add_model(|cx| {
let mut model = ProjectSearch::new(workspace.project().clone(), cx);
model.search(new_query, cx);
model
});
workspace.add_item(
Box::new(cx.add_view(|cx| ProjectSearchView::new(model, cx))),
cx,
);
}
}
}
fn select_match(
pane: &mut Pane,
&SelectMatch(direction): &SelectMatch,
cx: &mut ViewContext<Pane>,
) {
if let Some(search_view) = pane
.active_item()
.and_then(|item| item.downcast::<ProjectSearchView>())
{
search_view.update(cx, |search_view, cx| {
search_view.select_match(direction, cx);
});
} else { } else {
theme.search.editor.container cx.propagate_action();
}; }
Flex::row()
.with_child(
Flex::row()
.with_child(
ChildView::new(&self.query_editor)
.flexible(1., true)
.boxed(),
)
.with_children(self.active_match_index.map(|match_ix| {
Label::new(
format!(
"{}/{}",
match_ix + 1,
self.model.read(cx).match_ranges.len()
),
theme.search.match_index.text.clone(),
)
.contained()
.with_style(theme.search.match_index.container)
.aligned()
.boxed()
}))
.contained()
.with_style(editor_container)
.aligned()
.constrained()
.with_max_width(theme.search.max_editor_width)
.boxed(),
)
.with_child(
Flex::row()
.with_child(self.render_nav_button("<", Direction::Prev, cx))
.with_child(self.render_nav_button(">", Direction::Next, cx))
.aligned()
.boxed(),
)
.with_child(
Flex::row()
.with_child(self.render_option_button("Case", SearchOption::CaseSensitive, cx))
.with_child(self.render_option_button("Word", SearchOption::WholeWord, cx))
.with_child(self.render_option_button("Regex", SearchOption::Regex, cx))
.contained()
.with_style(theme.search.option_button_group)
.aligned()
.boxed(),
)
.contained()
.with_style(theme.workspace.toolbar.container)
.constrained()
.with_height(theme.workspace.toolbar.height)
.named("project search")
} }
fn render_option_button( fn toggle_focus(pane: &mut Pane, _: &ToggleFocus, cx: &mut ViewContext<Pane>) {
&self, if let Some(search_view) = pane
icon: &str, .active_item()
option: SearchOption, .and_then(|item| item.downcast::<ProjectSearchView>())
cx: &mut RenderContext<Self>, {
) -> ElementBox { search_view.update(cx, |search_view, cx| {
let is_active = self.is_option_enabled(option); if search_view.query_editor.is_focused(cx) {
MouseEventHandler::new::<Self, _, _>(option as usize, cx, |state, cx| { if !search_view.model.read(cx).match_ranges.is_empty() {
let theme = &cx.global::<Settings>().theme.search; search_view.focus_results_editor(cx);
let style = match (is_active, state.hovered) { }
(false, false) => &theme.option_button, } else {
(false, true) => &theme.hovered_option_button, search_view.focus_query_editor(cx);
(true, false) => &theme.active_option_button, }
(true, true) => &theme.active_hovered_option_button, });
}; } else {
Label::new(icon.to_string(), style.text.clone()) cx.propagate_action();
.contained() }
.with_style(style.container)
.boxed()
})
.on_click(move |cx| cx.dispatch_action(ToggleSearchOption(option)))
.with_cursor_style(CursorStyle::PointingHand)
.boxed()
} }
fn is_option_enabled(&self, option: SearchOption) -> bool { fn tab(&mut self, _: &editor::Tab, cx: &mut ViewContext<Self>) {
match option { if let Some(search_view) = self.active_project_search.as_ref() {
SearchOption::WholeWord => self.whole_word, search_view.update(cx, |search_view, cx| {
SearchOption::CaseSensitive => self.case_sensitive, if search_view.query_editor.is_focused(cx) {
SearchOption::Regex => self.regex, if !search_view.model.read(cx).match_ranges.is_empty() {
search_view.focus_results_editor(cx);
}
} else {
cx.propagate_action();
}
});
} else {
cx.propagate_action();
}
}
fn toggle_search_option(
&mut self,
ToggleSearchOption(option): &ToggleSearchOption,
cx: &mut ViewContext<Self>,
) {
if let Some(search_view) = self.active_project_search.as_ref() {
search_view.update(cx, |search_view, cx| {
let value = match option {
SearchOption::WholeWord => &mut search_view.whole_word,
SearchOption::CaseSensitive => &mut search_view.case_sensitive,
SearchOption::Regex => &mut search_view.regex,
};
*value = !*value;
search_view.search(cx);
});
cx.notify();
} }
} }
@ -679,6 +629,139 @@ impl ProjectSearchView {
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.boxed() .boxed()
} }
fn render_option_button(
&self,
icon: &str,
option: SearchOption,
cx: &mut RenderContext<Self>,
) -> ElementBox {
let is_active = self.is_option_enabled(option, cx);
MouseEventHandler::new::<ProjectSearchBar, _, _>(option as usize, cx, |state, cx| {
let theme = &cx.global::<Settings>().theme.search;
let style = match (is_active, state.hovered) {
(false, false) => &theme.option_button,
(false, true) => &theme.hovered_option_button,
(true, false) => &theme.active_option_button,
(true, true) => &theme.active_hovered_option_button,
};
Label::new(icon.to_string(), style.text.clone())
.contained()
.with_style(style.container)
.boxed()
})
.on_click(move |cx| cx.dispatch_action(ToggleSearchOption(option)))
.with_cursor_style(CursorStyle::PointingHand)
.boxed()
}
fn is_option_enabled(&self, option: SearchOption, cx: &AppContext) -> bool {
if let Some(search) = self.active_project_search.as_ref() {
let search = search.read(cx);
match option {
SearchOption::WholeWord => search.whole_word,
SearchOption::CaseSensitive => search.case_sensitive,
SearchOption::Regex => search.regex,
}
} else {
false
}
}
}
impl Entity for ProjectSearchBar {
type Event = ();
}
impl View for ProjectSearchBar {
fn ui_name() -> &'static str {
"ProjectSearchBar"
}
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
if let Some(search) = self.active_project_search.as_ref() {
let search = search.read(cx);
let theme = cx.global::<Settings>().theme.clone();
let editor_container = if search.query_contains_error {
theme.search.invalid_editor
} else {
theme.search.editor.container
};
Flex::row()
.with_child(
Flex::row()
.with_child(
ChildView::new(&search.query_editor)
.flexible(1., true)
.boxed(),
)
.with_children(search.active_match_index.map(|match_ix| {
Label::new(
format!(
"{}/{}",
match_ix + 1,
search.model.read(cx).match_ranges.len()
),
theme.search.match_index.text.clone(),
)
.contained()
.with_style(theme.search.match_index.container)
.aligned()
.boxed()
}))
.contained()
.with_style(editor_container)
.aligned()
.constrained()
.with_max_width(theme.search.max_editor_width)
.boxed(),
)
.with_child(
Flex::row()
.with_child(self.render_nav_button("<", Direction::Prev, cx))
.with_child(self.render_nav_button(">", Direction::Next, cx))
.aligned()
.boxed(),
)
.with_child(
Flex::row()
.with_child(self.render_option_button(
"Case",
SearchOption::CaseSensitive,
cx,
))
.with_child(self.render_option_button("Word", SearchOption::WholeWord, cx))
.with_child(self.render_option_button("Regex", SearchOption::Regex, cx))
.contained()
.with_style(theme.search.option_button_group)
.aligned()
.boxed(),
)
.contained()
.with_style(theme.workspace.toolbar.container)
.constrained()
.with_height(theme.workspace.toolbar.height)
.named("project search")
} else {
Empty::new().boxed()
}
}
}
impl ToolbarItemView for ProjectSearchBar {
fn set_active_pane_item(
&mut self,
active_pane_item: Option<&dyn workspace::ItemHandle>,
cx: &mut ViewContext<Self>,
) {
self.subscription = None;
self.active_project_search = None;
if let Some(search) = active_pane_item.and_then(|i| i.downcast::<ProjectSearchView>()) {
self.subscription = Some(cx.observe(&search, |_, _, cx| cx.notify()));
self.active_project_search = Some(search);
}
cx.notify();
}
} }
#[cfg(test)] #[cfg(test)]
@ -728,7 +811,7 @@ mod tests {
search_view search_view
.query_editor .query_editor
.update(cx, |query_editor, cx| query_editor.set_text("TWO", cx)); .update(cx, |query_editor, cx| query_editor.set_text("TWO", cx));
search_view.search(&Search, cx); search_view.search(cx);
}); });
search_view.next_notification(&cx).await; search_view.next_notification(&cx).await;
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
@ -765,7 +848,7 @@ mod tests {
[DisplayPoint::new(2, 32)..DisplayPoint::new(2, 35)] [DisplayPoint::new(2, 32)..DisplayPoint::new(2, 35)]
); );
search_view.select_match(&SelectMatch(Direction::Next), cx); search_view.select_match(Direction::Next, cx);
}); });
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
@ -776,7 +859,7 @@ mod tests {
.update(cx, |editor, cx| editor.selected_display_ranges(cx)), .update(cx, |editor, cx| editor.selected_display_ranges(cx)),
[DisplayPoint::new(2, 37)..DisplayPoint::new(2, 40)] [DisplayPoint::new(2, 37)..DisplayPoint::new(2, 40)]
); );
search_view.select_match(&SelectMatch(Direction::Next), cx); search_view.select_match(Direction::Next, cx);
}); });
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
@ -787,7 +870,7 @@ mod tests {
.update(cx, |editor, cx| editor.selected_display_ranges(cx)), .update(cx, |editor, cx| editor.selected_display_ranges(cx)),
[DisplayPoint::new(5, 6)..DisplayPoint::new(5, 9)] [DisplayPoint::new(5, 6)..DisplayPoint::new(5, 9)]
); );
search_view.select_match(&SelectMatch(Direction::Next), cx); search_view.select_match(Direction::Next, cx);
}); });
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
@ -798,7 +881,7 @@ mod tests {
.update(cx, |editor, cx| editor.selected_display_ranges(cx)), .update(cx, |editor, cx| editor.selected_display_ranges(cx)),
[DisplayPoint::new(2, 32)..DisplayPoint::new(2, 35)] [DisplayPoint::new(2, 32)..DisplayPoint::new(2, 35)]
); );
search_view.select_match(&SelectMatch(Direction::Prev), cx); search_view.select_match(Direction::Prev, cx);
}); });
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
@ -809,7 +892,7 @@ mod tests {
.update(cx, |editor, cx| editor.selected_display_ranges(cx)), .update(cx, |editor, cx| editor.selected_display_ranges(cx)),
[DisplayPoint::new(5, 6)..DisplayPoint::new(5, 9)] [DisplayPoint::new(5, 6)..DisplayPoint::new(5, 9)]
); );
search_view.select_match(&SelectMatch(Direction::Prev), cx); search_view.select_match(Direction::Prev, cx);
}); });
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {

7
crates/search/src/search.rs
View file

@ -1,13 +1,14 @@
pub use buffer_search::SearchBar; pub use buffer_search::BufferSearchBar;
use editor::{Anchor, MultiBufferSnapshot}; use editor::{Anchor, MultiBufferSnapshot};
use gpui::{action, MutableAppContext}; use gpui::{action, MutableAppContext};
pub use project_search::ProjectSearchBar;
use std::{ use std::{
cmp::{self, Ordering}, cmp::{self, Ordering},
ops::Range, ops::Range,
}; };
mod buffer_search; pub mod buffer_search;
mod project_search; pub mod project_search;
pub fn init(cx: &mut MutableAppContext) { pub fn init(cx: &mut MutableAppContext) {
buffer_search::init(cx); buffer_search::init(cx);

2
crates/zed/assets/themes/_base.toml
View file

@ -361,7 +361,7 @@ tab_icon_spacing = 4
tab_summary_spacing = 10 tab_summary_spacing = 10
[search] [search]
max_editor_width = 400 max_editor_width = 250
match_background = "$state.highlighted_line" match_background = "$state.highlighted_line"
results_status = { extends = "$text.0", size = 18 } results_status = { extends = "$text.0", size = 18 }
tab_icon_width = 14 tab_icon_width = 14

8
crates/zed/src/zed.rs
View file

@ -22,7 +22,7 @@ pub use lsp;
use project::Project; use project::Project;
pub use project::{self, fs}; pub use project::{self, fs};
use project_panel::ProjectPanel; use project_panel::ProjectPanel;
use search::SearchBar; use search::{BufferSearchBar, ProjectSearchBar};
use std::{path::PathBuf, sync::Arc}; use std::{path::PathBuf, sync::Arc};
pub use workspace; pub use workspace;
use workspace::{AppState, Settings, Workspace, WorkspaceParams}; use workspace::{AppState, Settings, Workspace, WorkspaceParams};
@ -113,8 +113,10 @@ pub fn build_workspace(
let breadcrumbs = cx.add_view(|_| Breadcrumbs::new()); let breadcrumbs = cx.add_view(|_| Breadcrumbs::new());
toolbar.add_left_item(breadcrumbs, cx); toolbar.add_left_item(breadcrumbs, cx);
let search_bar = cx.add_view(|cx| SearchBar::new(cx)); let buffer_search_bar = cx.add_view(|cx| BufferSearchBar::new(cx));
toolbar.add_right_item(search_bar, cx); toolbar.add_right_item(buffer_search_bar, cx);
let project_search_bar = cx.add_view(|_| ProjectSearchBar::new());
toolbar.add_right_item(project_search_bar, cx);
}) })
}); });
}) })