zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Merge branch 'main' into search2

Browse Source
This commit is contained in:
Piotr Osiewicz 2023-11-20 18:42:15 +01:00
parent 07cc5904f8
commit fa8cd843ca
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/diagnostics2/src/diagnostics.rs
View File

@ -742,7 +742,7 @@ impl Item for ProjectDiagnosticsEditor {
}
fn breadcrumb_location(&self) -> ToolbarItemLocation {
ToolbarItemLocation::PrimaryLeft { flex: None }
ToolbarItemLocation::PrimaryLeft
}
fn breadcrumbs(&self, theme: &theme::Theme, cx: &AppContext) -> Option<Vec<BreadcrumbText>> {

2
crates/diagnostics2/src/toolbar_controls.rs
View File

@ -49,7 +49,7 @@ impl ToolbarItemView for ToolbarControls {
if let Some(pane_item) = active_pane_item.as_ref() {
if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
self.editor = Some(editor.downgrade());
ToolbarItemLocation::PrimaryRight { flex: None }
ToolbarItemLocation::PrimaryRight
} else {
ToolbarItemLocation::Hidden
}

6
crates/search2/src/buffer_search.rs
View File

@ -629,10 +629,10 @@ impl BufferSearchBar {
fn on_query_editor_event(
&mut self,
_: View<Editor>,
event: &editor::Event,
event: &editor::EditorEvent,
cx: &mut ViewContext<Self>,
) {
if let editor::Event::Edited { .. } = event {
if let editor::EditorEvent::Edited { .. } = event {
self.query_contains_error = false;
self.clear_matches(cx);
let search = self.update_matches(cx);
@ -694,6 +694,7 @@ impl BufferSearchBar {
query,
self.search_options.contains(SearchOptions::WHOLE_WORD),
self.search_options.contains(SearchOptions::CASE_SENSITIVE),
false,
Vec::new(),
Vec::new(),
) {
@ -709,6 +710,7 @@ impl BufferSearchBar {
query,
self.search_options.contains(SearchOptions::WHOLE_WORD),
self.search_options.contains(SearchOptions::CASE_SENSITIVE),
false,
Vec::new(),
Vec::new(),
) {

7
crates/ui2/src/components/icon.rs
View File

@ -127,13 +127,6 @@ impl Icon {
Icon::SplitMessage => "icons/split_message.svg",
Icon::Terminal => "icons/terminal.svg",
Icon::XCircle => "icons/error.svg",
Icon::Copilot => "icons/copilot.svg",
Icon::Envelope => "icons/feedback.svg",
Icon::Bell => "icons/bell.svg",
Icon::BellOff => "icons/bell-off.svg",
Icon::BellRing => "icons/bell-ring.svg",
Icon::MailOpen => "icons/mail-open.svg",
Icon::AtSign => "icons/at-sign.svg",
Icon::WholeWord => "icons/word_search.svg",
Icon::CaseSensitive => "icons/case_insensitive.svg",
}