Breadcrumb visual reorchestration which makes a couple of key changes: - Breadcrumbs are now displayed in file headers for multibuffer views. Singleton buffers are unchanged. - Multibuffer views now have collapse/expand all buttons available in the toolbar - Search in multibuffer views now takes up less space, by occupying the primary toolbar location erstwhile taken up by breadcrumbs <img width="1721" height="823" alt="Screenshot 2025-12-22 at 4 15 41 PM" src="https://github.com/user-attachments/assets/38e924f7-fe9e-4c83-84fb-2eee98137f43" /> <img width="1722" height="762" alt="Screenshot 2025-12-22 at 4 15 51 PM" src="https://github.com/user-attachments/assets/ccc98ca3-75ce-4aca-bceb-890817b0f04d" /> Release Notes: - Moved breadcrumbs to file headers in multibuffer views - Added collapse/expand all options for multibuffer views - Improved use of space for multibuffer search by taking the place of the former breadcrumb toolbar location --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
168 lines
6.4 KiB
Rust
168 lines
6.4 KiB
Rust
use crate::{BufferDiagnosticsEditor, ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
|
|
use gpui::{Context, EventEmitter, ParentElement, Render, Window};
|
|
use language::DiagnosticEntry;
|
|
use search::buffer_search;
|
|
use text::{Anchor, BufferId};
|
|
use ui::{Tooltip, prelude::*};
|
|
use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, item::ItemHandle};
|
|
use zed_actions::assistant::InlineAssist;
|
|
|
|
pub struct ToolbarControls {
|
|
editor: Option<Box<dyn DiagnosticsToolbarEditor>>,
|
|
}
|
|
|
|
pub(crate) trait DiagnosticsToolbarEditor: Send + Sync {
|
|
/// Informs the toolbar whether warnings are included in the diagnostics.
|
|
fn include_warnings(&self, cx: &App) -> bool;
|
|
/// Toggles whether warning diagnostics should be displayed by the
|
|
/// diagnostics editor.
|
|
fn toggle_warnings(&self, window: &mut Window, cx: &mut App);
|
|
/// Indicates whether the diagnostics editor is currently updating the
|
|
/// diagnostics.
|
|
fn is_updating(&self, cx: &App) -> bool;
|
|
/// Requests that the diagnostics editor stop updating the diagnostics.
|
|
fn stop_updating(&self, cx: &mut App);
|
|
/// Requests that the diagnostics editor updates the displayed diagnostics
|
|
/// with the latest information.
|
|
fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App);
|
|
/// Returns a list of diagnostics for the provided buffer id.
|
|
fn get_diagnostics_for_buffer(
|
|
&self,
|
|
buffer_id: BufferId,
|
|
cx: &App,
|
|
) -> Vec<DiagnosticEntry<Anchor>>;
|
|
}
|
|
|
|
impl Render for ToolbarControls {
|
|
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let mut include_warnings = false;
|
|
let mut is_updating = false;
|
|
|
|
match &self.editor {
|
|
Some(editor) => {
|
|
include_warnings = editor.include_warnings(cx);
|
|
is_updating = editor.is_updating(cx);
|
|
}
|
|
None => {}
|
|
}
|
|
|
|
let (warning_tooltip, warning_color) = if include_warnings {
|
|
("Exclude Warnings", Color::Warning)
|
|
} else {
|
|
("Include Warnings", Color::Disabled)
|
|
};
|
|
|
|
h_flex()
|
|
.gap_1()
|
|
.child({
|
|
IconButton::new("toggle_search", IconName::MagnifyingGlass)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(Tooltip::for_action_title(
|
|
"Buffer Search",
|
|
&buffer_search::Deploy::find(),
|
|
))
|
|
.on_click(|_, window, cx| {
|
|
window.dispatch_action(Box::new(buffer_search::Deploy::find()), cx);
|
|
})
|
|
})
|
|
.child({
|
|
IconButton::new("inline_assist", IconName::ZedAssistant)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(Tooltip::for_action_title(
|
|
"Inline Assist",
|
|
&InlineAssist::default(),
|
|
))
|
|
.on_click(|_, window, cx| {
|
|
window.dispatch_action(Box::new(InlineAssist::default()), cx);
|
|
})
|
|
})
|
|
.map(|div| {
|
|
if is_updating {
|
|
div.child(
|
|
IconButton::new("stop-updating", IconName::Stop)
|
|
.icon_color(Color::Error)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(Tooltip::for_action_title(
|
|
"Stop Siagnostics Update",
|
|
&ToggleDiagnosticsRefresh,
|
|
))
|
|
.on_click(cx.listener(move |toolbar_controls, _, _, cx| {
|
|
if let Some(editor) = toolbar_controls.editor() {
|
|
editor.stop_updating(cx);
|
|
cx.notify();
|
|
}
|
|
})),
|
|
)
|
|
} else {
|
|
div.child(
|
|
IconButton::new("refresh-diagnostics", IconName::ArrowCircle)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(Tooltip::for_action_title(
|
|
"Refresh Diagnostics",
|
|
&ToggleDiagnosticsRefresh,
|
|
))
|
|
.on_click(cx.listener({
|
|
move |toolbar_controls, _, window, cx| {
|
|
if let Some(editor) = toolbar_controls.editor() {
|
|
editor.refresh_diagnostics(window, cx)
|
|
}
|
|
}
|
|
})),
|
|
)
|
|
}
|
|
})
|
|
.child(
|
|
IconButton::new("toggle-warnings", IconName::Warning)
|
|
.icon_color(warning_color)
|
|
.icon_size(IconSize::Small)
|
|
.tooltip(Tooltip::text(warning_tooltip))
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
if let Some(editor) = &this.editor {
|
|
editor.toggle_warnings(window, cx)
|
|
}
|
|
})),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<ToolbarItemEvent> for ToolbarControls {}
|
|
|
|
impl ToolbarItemView for ToolbarControls {
|
|
fn set_active_pane_item(
|
|
&mut self,
|
|
active_pane_item: Option<&dyn ItemHandle>,
|
|
_window: &mut Window,
|
|
_: &mut Context<Self>,
|
|
) -> ToolbarItemLocation {
|
|
if let Some(pane_item) = active_pane_item.as_ref() {
|
|
if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
|
|
self.editor = Some(Box::new(editor.downgrade()));
|
|
ToolbarItemLocation::PrimaryRight
|
|
} else if let Some(editor) = pane_item.downcast::<BufferDiagnosticsEditor>() {
|
|
self.editor = Some(Box::new(editor.downgrade()));
|
|
ToolbarItemLocation::PrimaryRight
|
|
} else {
|
|
ToolbarItemLocation::Hidden
|
|
}
|
|
} else {
|
|
ToolbarItemLocation::Hidden
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Default for ToolbarControls {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl ToolbarControls {
|
|
pub fn new() -> Self {
|
|
ToolbarControls { editor: None }
|
|
}
|
|
|
|
fn editor(&self) -> Option<&dyn DiagnosticsToolbarEditor> {
|
|
self.editor.as_deref()
|
|
}
|
|
}
|