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

Use ButtonLike rather than ad-hoc button

Browse source 
Co-Authored-By: Marshall Bowers <marshall@zed.dev>
This commit is contained in:
Julia 2023-12-20 12:15:13 -05:00
parent 5840750b3d
commit 11140a1d34
1 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crates/diagnostics2/src/items.rs
View file

@ -1,16 +1,15 @@
use collections::HashSet; use collections::HashSet;
use editor::{Editor, GoToDiagnostic}; use editor::Editor;
use gpui::{ use gpui::{
rems, Div, EventEmitter, InteractiveElement, IntoElement, ParentElement, Render, Stateful, rems, Div, EventEmitter, IntoElement, ParentElement, Render, Styled, Subscription, View,
StatefulInteractiveElement, Styled, Subscription, View, ViewContext, WeakView, ViewContext, WeakView,
}; };
use language::Diagnostic; use language::Diagnostic;
use lsp::LanguageServerId; use lsp::LanguageServerId;
use theme::ActiveTheme; use ui::{h_stack, prelude::*, Button, ButtonLike, Color, Icon, IconElement, Label, Tooltip};
use ui::{h_stack, Button, Clickable, Color, Icon, IconElement, Label, Tooltip};
use workspace::{item::ItemHandle, StatusItemView, ToolbarItemEvent, Workspace}; use workspace::{item::ItemHandle, StatusItemView, ToolbarItemEvent, Workspace};
use crate::ProjectDiagnosticsEditor; use crate::{Deploy, ProjectDiagnosticsEditor};
pub struct DiagnosticIndicator { pub struct DiagnosticIndicator {
summary: project::DiagnosticSummary, summary: project::DiagnosticSummary,
@ -22,7 +21,7 @@ pub struct DiagnosticIndicator {
} }
impl Render for DiagnosticIndicator { impl Render for DiagnosticIndicator {
type Element = Stateful<Div>; type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element { fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) { let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) {
@ -49,8 +48,11 @@ impl Render for DiagnosticIndicator {
let message = diagnostic.message.split('\n').next().unwrap().to_string(); let message = diagnostic.message.split('\n').next().unwrap().to_string();
Some( Some(
Button::new("diagnostic_message", message) Button::new("diagnostic_message", message)
.tooltip(|cx| {
Tooltip::for_action("Next Diagnostic", &editor::GoToDiagnostic, cx)
})
.on_click(cx.listener(|this, _, cx| { .on_click(cx.listener(|this, _, cx| {
this.go_to_next_diagnostic(&GoToDiagnostic, cx); this.go_to_next_diagnostic(cx);
})) }))
.into_any_element(), .into_any_element(),
) )
@ -59,25 +61,20 @@ impl Render for DiagnosticIndicator {
}; };
h_stack() h_stack()
.id("diagnostic-indicator")
.on_action(cx.listener(Self::go_to_next_diagnostic))
.rounded_md()
.flex_none()
.h(rems(1.375)) .h(rems(1.375))
.px_6() .gap_2()
.cursor_pointer() .child(
.bg(cx.theme().colors().ghost_element_background) ButtonLike::new("diagnostic-indicator")
.hover(|style| style.bg(cx.theme().colors().ghost_element_hover)) .child(diagnostic_indicator)
.active(|style| style.bg(cx.theme().colors().ghost_element_active)) .tooltip(|cx| Tooltip::for_action("Project Diagnostics", &Deploy, cx))
.tooltip(|cx| Tooltip::text("Project Diagnostics", cx)) .on_click(cx.listener(|this, _, cx| {
.on_click(cx.listener(|this, _, cx| { if let Some(workspace) = this.workspace.upgrade() {
if let Some(workspace) = this.workspace.upgrade() { workspace.update(cx, |workspace, cx| {
workspace.update(cx, |workspace, cx| { ProjectDiagnosticsEditor::deploy(workspace, &Default::default(), cx)
ProjectDiagnosticsEditor::deploy(workspace, &Default::default(), cx) })
}) }
} })),
})) )
.child(diagnostic_indicator)
.children(status) .children(status)
} }
} }
@ -120,7 +117,7 @@ impl DiagnosticIndicator {
} }
} }
fn go_to_next_diagnostic(&mut self, _: &GoToDiagnostic, cx: &mut ViewContext<Self>) { fn go_to_next_diagnostic(&mut self, cx: &mut ViewContext<Self>) {
if let Some(editor) = self.active_editor.as_ref().and_then(|e| e.upgrade()) { if let Some(editor) = self.active_editor.as_ref().and_then(|e| e.upgrade()) {
editor.update(cx, |editor, cx| { editor.update(cx, |editor, cx| {
editor.go_to_diagnostic_impl(editor::Direction::Next, cx); editor.go_to_diagnostic_impl(editor::Direction::Next, cx);