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

Improve styling of diagnostic status bar item

Browse source
This commit is contained in:
Max Brunsfeld 2021-11-03 14:15:22 -07:00
parent baf636a4a4
commit 1ec31738e6
4 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/workspace/src/items.rs
View file

@ -7,7 +7,7 @@ use gpui::{
elements::*, fonts::TextStyle, AppContext, Entity, ModelHandle, RenderContext, Subscription,
Task, View, ViewContext, ViewHandle,
};
use language::{Buffer, Diagnostic, DiagnosticSeverity, File as _};
use language::{Buffer, Diagnostic, File as _};
use postage::watch;
use project::{ProjectPath, Worktree};
use std::fmt::Write;
@ -288,14 +288,24 @@ impl View for DiagnosticMessage {
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
if let Some(diagnostic) = &self.diagnostic {
let theme = &self.settings.borrow().theme.workspace.status_bar;
let style = match diagnostic.severity {
DiagnosticSeverity::ERROR => theme.diagnostic_error.clone(),
DiagnosticSeverity::WARNING => theme.diagnostic_warning.clone(),
DiagnosticSeverity::INFORMATION => theme.diagnostic_information.clone(),
DiagnosticSeverity::HINT => theme.diagnostic_hint.clone(),
_ => Default::default(),
};
Label::new(diagnostic.message.replace('\n', " "), style).boxed()
Flex::row()
.with_child(
Svg::new("icons/warning.svg")
.with_color(theme.diagnostic_icon_color)
.constrained()
.with_height(theme.diagnostic_icon_size)
.contained()
.with_margin_right(theme.diagnostic_icon_spacing)
.boxed(),
)
.with_child(
Label::new(
diagnostic.message.replace('\n', " "),
theme.diagnostic_message.clone(),
)
.boxed(),
)
.boxed()
} else {
Empty::new().boxed()
}