
Follow-up of https://github.com/zed-industries/zed/pull/14515 Fixed certain visual artifacts, related to multi line diagnostics and block toggle rendering. Also enabled diagnostics toolbar controls for the experimental view too. Release Notes: - N/A
138 lines
5.6 KiB
Rust
138 lines
5.6 KiB
Rust
use crate::{grouped_diagnostics::GroupedDiagnosticsEditor, ProjectDiagnosticsEditor};
|
|
use futures::future::Either;
|
|
use gpui::{EventEmitter, ParentElement, Render, View, ViewContext, WeakView};
|
|
use ui::prelude::*;
|
|
use ui::{IconButton, IconName, Tooltip};
|
|
use workspace::{item::ItemHandle, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
|
|
|
|
pub struct ToolbarControls {
|
|
editor: Option<Either<WeakView<ProjectDiagnosticsEditor>, WeakView<GroupedDiagnosticsEditor>>>,
|
|
}
|
|
|
|
impl Render for ToolbarControls {
|
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
|
|
let mut include_warnings = false;
|
|
let mut has_stale_excerpts = false;
|
|
let mut is_updating = false;
|
|
|
|
if let Some(editor) = self.editor() {
|
|
match editor {
|
|
Either::Left(editor) => {
|
|
let editor = editor.read(cx);
|
|
include_warnings = editor.include_warnings;
|
|
has_stale_excerpts = !editor.paths_to_update.is_empty();
|
|
is_updating = editor.update_paths_tx.len() > 0
|
|
|| editor
|
|
.project
|
|
.read(cx)
|
|
.language_servers_running_disk_based_diagnostics()
|
|
.next()
|
|
.is_some();
|
|
}
|
|
Either::Right(editor) => {
|
|
let editor = editor.read(cx);
|
|
include_warnings = editor.include_warnings;
|
|
has_stale_excerpts = !editor.paths_to_update.is_empty();
|
|
is_updating = editor.update_paths_tx.len() > 0
|
|
|| editor
|
|
.project
|
|
.read(cx)
|
|
.language_servers_running_disk_based_diagnostics()
|
|
.next()
|
|
.is_some();
|
|
}
|
|
}
|
|
}
|
|
|
|
let tooltip = if include_warnings {
|
|
"Exclude Warnings"
|
|
} else {
|
|
"Include Warnings"
|
|
};
|
|
|
|
h_flex()
|
|
.when(has_stale_excerpts, |div| {
|
|
div.child(
|
|
IconButton::new("update-excerpts", IconName::Update)
|
|
.icon_color(Color::Info)
|
|
.disabled(is_updating)
|
|
.tooltip(move |cx| Tooltip::text("Update excerpts", cx))
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
if let Some(editor) = this.editor() {
|
|
match editor {
|
|
Either::Left(editor) => {
|
|
editor.update(cx, |editor, _| {
|
|
editor.enqueue_update_stale_excerpts(None);
|
|
});
|
|
}
|
|
Either::Right(editor) => {
|
|
editor.update(cx, |editor, _| {
|
|
editor.enqueue_update_stale_excerpts(None);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
})),
|
|
)
|
|
})
|
|
.child(
|
|
IconButton::new("toggle-warnings", IconName::ExclamationTriangle)
|
|
.tooltip(move |cx| Tooltip::text(tooltip, cx))
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
if let Some(editor) = this.editor() {
|
|
match editor {
|
|
Either::Left(editor) => {
|
|
editor.update(cx, |editor, cx| {
|
|
editor.toggle_warnings(&Default::default(), cx);
|
|
});
|
|
}
|
|
Either::Right(editor) => {
|
|
editor.update(cx, |editor, cx| {
|
|
editor.toggle_warnings(&Default::default(), cx);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
})),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<ToolbarItemEvent> for ToolbarControls {}
|
|
|
|
impl ToolbarItemView for ToolbarControls {
|
|
fn set_active_pane_item(
|
|
&mut self,
|
|
active_pane_item: Option<&dyn ItemHandle>,
|
|
_: &mut ViewContext<Self>,
|
|
) -> ToolbarItemLocation {
|
|
if let Some(pane_item) = active_pane_item.as_ref() {
|
|
if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
|
|
self.editor = Some(Either::Left(editor.downgrade()));
|
|
ToolbarItemLocation::PrimaryRight
|
|
} else if let Some(editor) = pane_item.downcast::<GroupedDiagnosticsEditor>() {
|
|
self.editor = Some(Either::Right(editor.downgrade()));
|
|
ToolbarItemLocation::PrimaryRight
|
|
} else {
|
|
ToolbarItemLocation::Hidden
|
|
}
|
|
} else {
|
|
ToolbarItemLocation::Hidden
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToolbarControls {
|
|
pub fn new() -> Self {
|
|
ToolbarControls { editor: None }
|
|
}
|
|
|
|
fn editor(
|
|
&self,
|
|
) -> Option<Either<View<ProjectDiagnosticsEditor>, View<GroupedDiagnosticsEditor>>> {
|
|
Some(match self.editor.as_ref()? {
|
|
Either::Left(diagnostics) => Either::Left(diagnostics.upgrade()?),
|
|
Either::Right(grouped_diagnostics) => Either::Right(grouped_diagnostics.upgrade()?),
|
|
})
|
|
}
|
|
}
|