Merge e38a432a00 into ba54b6afe4

helix-core/src/diagnostic.rs

@@ -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),

helix-term/src/ui/statusline.rs

@@ -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());
             }

helix-view/src/gutter.rs

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