mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-25 22:18:14 +03:00
Update diagnostic status bar tool
This commit is contained in:
parent
9969caf513
commit
101fe7fbb5
@ -1,6 +1 @@
|
|||||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-alert-triangle"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg>
|
||||||
<path d="M2.45563 12.3438H11.5444C11.9137 12.3438 12.1556 11.9571 11.994 11.625L10.2346 8.00952C9.77174 7.05841 8.89104 6.37821 7.85383 6.17077C7.29019 6.05804 6.70981 6.05804 6.14617 6.17077C5.10896 6.37821 4.22826 7.05841 3.76542 8.00952L2.00603 11.625C1.84442 11.9571 2.08628 12.3438 2.45563 12.3438Z" fill="#001A33" fill-opacity="0.157"/>
|
|
||||||
<path d="M9.5 6.5L11.994 11.625C12.1556 11.9571 11.9137 12.3438 11.5444 12.3438H2.45563C2.08628 12.3438 1.84442 11.9571 2.00603 11.625L4.5 6.5" stroke="#11181C" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
|
|
||||||
<path d="M7 7L7 2" stroke="#11181C" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
|
|
||||||
<circle cx="7" cy="9.24219" r="0.75" fill="#11181C"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 835 B After Width: | Height: | Size: 351 B |
@ -1,7 +1,7 @@
|
|||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use editor::{Editor, GoToDiagnostic};
|
use editor::{Editor, GoToDiagnostic};
|
||||||
use gpui::{
|
use gpui::{
|
||||||
div, Div, EventEmitter, InteractiveComponent, ParentComponent, Render, Stateful,
|
div, rems, Div, EventEmitter, InteractiveComponent, ParentComponent, Render, Stateful,
|
||||||
StatefulInteractiveComponent, Styled, Subscription, View, ViewContext, WeakView,
|
StatefulInteractiveComponent, Styled, Subscription, View, ViewContext, WeakView,
|
||||||
};
|
};
|
||||||
use language::Diagnostic;
|
use language::Diagnostic;
|
||||||
@ -25,15 +25,35 @@ impl Render for DiagnosticIndicator {
|
|||||||
type Element = Stateful<Self, Div<Self>>;
|
type Element = Stateful<Self, Div<Self>>;
|
||||||
|
|
||||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
||||||
let mut summary_row = h_stack()
|
let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) {
|
||||||
|
(0, 0) => h_stack().child(IconElement::new(Icon::Check).color(TextColor::Success)),
|
||||||
|
(0, warning_count) => h_stack()
|
||||||
|
.gap_1()
|
||||||
|
.child(IconElement::new(Icon::ExclamationTriangle).color(TextColor::Warning))
|
||||||
|
.child(Label::new(warning_count.to_string())),
|
||||||
|
(error_count, 0) => h_stack()
|
||||||
|
.gap_1()
|
||||||
|
.child(IconElement::new(Icon::XCircle).color(TextColor::Error))
|
||||||
|
.child(Label::new(error_count.to_string())),
|
||||||
|
(error_count, warning_count) => h_stack()
|
||||||
|
.gap_1()
|
||||||
|
.child(IconElement::new(Icon::XCircle).color(TextColor::Error))
|
||||||
|
.child(Label::new(error_count.to_string()))
|
||||||
|
.child(IconElement::new(Icon::ExclamationTriangle).color(TextColor::Warning))
|
||||||
|
.child(Label::new(warning_count.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
h_stack()
|
||||||
.id(cx.entity_id())
|
.id(cx.entity_id())
|
||||||
.on_action(Self::go_to_next_diagnostic)
|
.on_action(Self::go_to_next_diagnostic)
|
||||||
.rounded_md()
|
.rounded_md()
|
||||||
.p_1()
|
.flex_none()
|
||||||
|
.h(rems(1.375))
|
||||||
|
.px_1()
|
||||||
.cursor_pointer()
|
.cursor_pointer()
|
||||||
.bg(gpui::green())
|
.bg(cx.theme().colors().ghost_element_background)
|
||||||
.hover(|style| style.bg(cx.theme().colors().element_hover))
|
.hover(|style| style.bg(cx.theme().colors().ghost_element_hover))
|
||||||
.active(|style| style.bg(cx.theme().colors().element_active))
|
.active(|style| style.bg(cx.theme().colors().ghost_element_active))
|
||||||
.tooltip(|_, cx| Tooltip::text("Project Diagnostics", cx))
|
.tooltip(|_, cx| Tooltip::text("Project Diagnostics", cx))
|
||||||
.on_click(|this, _, cx| {
|
.on_click(|this, _, cx| {
|
||||||
if let Some(workspace) = this.workspace.upgrade() {
|
if let Some(workspace) = this.workspace.upgrade() {
|
||||||
@ -41,33 +61,8 @@ impl Render for DiagnosticIndicator {
|
|||||||
ProjectDiagnosticsEditor::deploy(workspace, &Default::default(), cx)
|
ProjectDiagnosticsEditor::deploy(workspace, &Default::default(), cx)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
.child(diagnostic_indicator)
|
||||||
if self.summary.error_count > 0 {
|
|
||||||
summary_row = summary_row.child(
|
|
||||||
div()
|
|
||||||
.child(IconElement::new(Icon::XCircle).color(TextColor::Error))
|
|
||||||
.bg(gpui::red()),
|
|
||||||
);
|
|
||||||
summary_row = summary_row.child(
|
|
||||||
div()
|
|
||||||
.child(Label::new(self.summary.error_count.to_string()))
|
|
||||||
.bg(gpui::yellow()),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.summary.warning_count > 0 {
|
|
||||||
summary_row = summary_row
|
|
||||||
.child(IconElement::new(Icon::ExclamationTriangle).color(TextColor::Warning));
|
|
||||||
summary_row = summary_row.child(Label::new(self.summary.warning_count.to_string()));
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.summary.error_count == 0 && self.summary.warning_count == 0 {
|
|
||||||
summary_row =
|
|
||||||
summary_row.child(IconElement::new(Icon::Check).color(TextColor::Success));
|
|
||||||
}
|
|
||||||
|
|
||||||
summary_row
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ impl StatusBar {
|
|||||||
fn render_left_tools(&self, cx: &mut ViewContext<Self>) -> impl Component<Self> {
|
fn render_left_tools(&self, cx: &mut ViewContext<Self>) -> impl Component<Self> {
|
||||||
h_stack()
|
h_stack()
|
||||||
.items_center()
|
.items_center()
|
||||||
.gap_1()
|
.gap_2()
|
||||||
.children(self.left_items.iter().map(|item| item.to_any()))
|
.children(self.left_items.iter().map(|item| item.to_any()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user