diagnostics struct for all diagnostic options

Author: Axlefublr

helix-term/src/ui/editor.rs

@@ -185,19 +185,19 @@ impl EditorView {
         }
         let config = doc.config.load();
 
-        if config.enable_diagnostics {
+        if config.diagnostics.enable {
             let width = view.inner_width(doc);
             let enable_cursor_line = view
                 .diagnostics_handler
                 .show_cursorline_diagnostics(doc, view.id);
             let inline_diagnostic_config =
-                config.inline_diagnostics.prepare(width, enable_cursor_line);
+                config.diagnostics.inline.prepare(width, enable_cursor_line);
             decorations.add_decoration(InlineDiagnostics::new(
                 doc,
                 theme,
                 primary_cursor,
                 inline_diagnostic_config,
-                config.end_of_line_diagnostics,
+                config.diagnostics.end_of_line,
             ));
         }
 
@@ -225,9 +225,9 @@ impl EditorView {
             }
         }
 
-        if config.enable_diagnostics
-            && config.inline_diagnostics.disabled()
-            && config.end_of_line_diagnostics == DiagnosticFilter::Disable
+        if config.diagnostics.enable
+            && config.diagnostics.inline.disabled()
+            && config.diagnostics.end_of_line == DiagnosticFilter::Disable
         {
             Self::render_diagnostics(doc, view, inner, surface, theme);
         }

helix-view/src/annotations/diagnostics.rs

@@ -6,13 +6,37 @@ use serde::{Deserialize, Serialize};
 
 use crate::Document;
 
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
+pub struct DiagnosticsConfig {
+    pub enable: bool,
+    pub inline: InlineDiagnosticsConfig,
+    pub end_of_line: DiagnosticFilter,
+}
+
+impl Default for DiagnosticsConfig {
+    fn default() -> Self {
+        Self {
+            enable: true,
+            inline: InlineDiagnosticsConfig::default(),
+            end_of_line: DiagnosticFilter::default(),
+        }
+    }
+}
+
 /// Describes the severity level of a [`Diagnostic`].
 #[derive(Debug, Clone, Copy, Eq, PartialEq, PartialOrd, Ord)]
 pub enum DiagnosticFilter {
     Disable,
     Enable(Severity),
 }
 
+impl Default for DiagnosticFilter {
+    fn default() -> Self {
+        Self::Enable(Severity::Hint)
+    }
+}
+
 impl<'de> Deserialize<'de> for DiagnosticFilter {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

helix-view/src/editor.rs

@@ -1,5 +1,5 @@
 use crate::{
-    annotations::diagnostics::{DiagnosticFilter, InlineDiagnosticsConfig},
+    annotations::diagnostics::DiagnosticsConfig,
     clipboard::ClipboardProvider,
     document::{
         DocumentOpenError, DocumentSavedEventFuture, DocumentSavedEventResult, Mode, SavePoint,
@@ -415,10 +415,7 @@ pub struct Config {
         deserialize_with = "deserialize_alphabet"
     )]
     pub jump_label_alphabet: Vec<char>,
-    pub enable_diagnostics: bool,
-    /// Display diagnostic below the line they occur.
-    pub inline_diagnostics: InlineDiagnosticsConfig,
-    pub end_of_line_diagnostics: DiagnosticFilter,
+    pub diagnostics: DiagnosticsConfig,
     // Set to override the default clipboard provider
     pub clipboard_provider: ClipboardProvider,
     /// Whether to read settings from [EditorConfig](https://editorconfig.org) files. Defaults to
@@ -1140,9 +1137,7 @@ impl Default for Config {
             popup_border: PopupBorderConfig::None,
             indent_heuristic: IndentationHeuristic::default(),
             jump_label_alphabet: ('a'..='z').collect(),
-            enable_diagnostics: true,
-            inline_diagnostics: InlineDiagnosticsConfig::default(),
-            end_of_line_diagnostics: DiagnosticFilter::Enable(Severity::Hint),
+            diagnostics: DiagnosticsConfig::default(),
             clipboard_provider: ClipboardProvider::default(),
             editor_config: true,
             rainbow_brackets: false,

helix-view/src/handlers/diagnostics.rs

@@ -105,7 +105,7 @@ impl DiagnosticsHandler {
             .store(self.generation.get(), atomic::Ordering::Relaxed);
     }
     pub fn show_cursorline_diagnostics(&self, doc: &Document, view: ViewId) -> bool {
-        if !self.active || !doc.config.load().enable_diagnostics {
+        if !self.active || !doc.config.load().diagnostics.enable {
             return false;
         }
         let cursor_line = doc

helix-view/src/view.rs

@@ -495,9 +495,9 @@ impl View {
         let enable_cursor_line = self
             .diagnostics_handler
             .show_cursorline_diagnostics(doc, self.id);
-        let enable_diagnostics = config.enable_diagnostics;
+        let enable_diagnostics = config.diagnostics.enable;
         let inline_diagnotstics_config =
-            config.inline_diagnostics.prepare(width, enable_cursor_line);
+            config.diagnostics.inline.prepare(width, enable_cursor_line);
         if !inline_diagnotstics_config.disabled() && enable_diagnostics {
             let cursor = doc
                 .selection(self.id)