suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use separate glyphs for hint/info/warning/error diagnostic indicators 

Currently all diagnostics use '●' as an indicator. This can be hard to
distinguish at a glance, especially if you are colorblind and/or the
theme doesn't distinguish much between `warning` and `error` styles
for example. We should split these out into separate simple shapes so
each severity is easy to recognize.
diagnostic-severity-glyphs
Michael Davis 2025-04-08 16:06:33 -04:00
parent ab97585b69
commit e38a432a00
No known key found for this signature in database
3 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helix-core/src/diagnostic.rs
View File

@ -20,6 +20,17 @@ impl Default for Severity {
}
}
impl Severity {
pub const fn indicator(&self) -> &'static str {
match self {
Self::Hint => "○",
Self::Info => "●",
Self::Warning => "▲",
Self::Error => "■",
}
}
}
#[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)]
pub enum NumberOrString {
Number(i32),

40
helix-term/src/ui/statusline.rs
View File

@ -237,24 +237,36 @@ where
for sev in &context.editor.config().statusline.diagnostics {
match sev {
Severity::Hint if hints > 0 => {
write(context, Span::styled("●", context.editor.theme.get("hint")));
write(
context,
Span::styled(Severity::Hint.indicator(), context.editor.theme.get("hint")),
);
write(context, format!(" {} ", hints).into());
}
Severity::Info if info > 0 => {
write(context, Span::styled("●", context.editor.theme.get("info")));
write(
context,
Span::styled(Severity::Info.indicator(), context.editor.theme.get("info")),
);
write(context, format!(" {} ", info).into());
}
Severity::Warning if warnings > 0 => {
write(
context,
Span::styled("●", context.editor.theme.get("warning")),
Span::styled(
Severity::Warning.indicator(),
context.editor.theme.get("warning"),
),
);
write(context, format!(" {} ", warnings).into());
}
Severity::Error if errors > 0 => {
write(
context,
Span::styled("●", context.editor.theme.get("error")),
Span::styled(
Severity::Error.indicator(),
context.editor.theme.get("error"),
),
);
write(context, format!(" {} ", errors).into());
}
@ -304,24 +316,36 @@ where
for sev in sevs_to_show {
match sev {
Severity::Hint if hints > 0 => {
write(context, Span::styled("●", context.editor.theme.get("hint")));
write(
context,
Span::styled(Severity::Hint.indicator(), context.editor.theme.get("hint")),
);
write(context, format!(" {} ", hints).into());
}
Severity::Info if info > 0 => {
write(context, Span::styled("●", context.editor.theme.get("info")));
write(
context,
Span::styled(Severity::Info.indicator(), context.editor.theme.get("info")),
);
write(context, format!(" {} ", info).into());
}
Severity::Warning if warnings > 0 => {
write(
context,
Span::styled("●", context.editor.theme.get("warning")),
Span::styled(
Severity::Warning.indicator(),
context.editor.theme.get("warning"),
),
);
write(context, format!(" {} ", warnings).into());
}
Severity::Error if errors > 0 => {
write(
context,
Span::styled("●", context.editor.theme.get("error")),
Span::styled(
Severity::Error.indicator(),
context.editor.theme.get("error"),
),
);
write(context, format!(" {} ", errors).into());
}

13
helix-view/src/gutter.rs
View File

@ -75,12 +75,13 @@ pub fn diagnostic<'doc>(
})
});
diagnostics_on_line.max_by_key(|d| d.severity).map(|d| {
write!(out, "●").ok();
match d.severity {
Some(Severity::Error) => error,
Some(Severity::Warning) | None => warning,
Some(Severity::Info) => info,
Some(Severity::Hint) => hint,
let severity = d.severity();
out.push_str(severity.indicator());
match severity {
Severity::Error => error,
Severity::Warning => warning,
Severity::Info => info,
Severity::Hint => hint,
}
})
},