feat(Automattic#306): harper-ls supporting default and specific lint …

…severities
grantlemons · Dec 12, 2024 · c7c4ccc · c7c4ccc
1 parent eaf7a9f
commit c7c4ccc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rs
@@ -286,7 +286,7 @@ impl Backend {
         lints_to_diagnostics(
             doc_state.document.get_full_content(),
             &lints,
-            config.diagnostic_severity,
+            config.default_diagnostic_severity,
         )
     }
 

diff --git a/harper-ls/src/config.rs b/harper-ls/src/config.rs
@@ -52,7 +52,7 @@ pub struct Config {
     pub user_dict_path: PathBuf,
     pub file_dict_path: PathBuf,
     pub lint_config: LintGroupConfig,
-    pub diagnostic_severity: LintSeverity,
+    pub default_diagnostic_severity: LintSeverity,
     pub code_action_config: CodeActionConfig,
     pub isolate_english: bool,
 }
@@ -87,12 +87,12 @@ impl Config {
             }
         }
 
-        if let Some(v) = value.get("linters") {
-            base.lint_config = serde_json::from_value(v.clone())?;
+        if let Some(v) = value.get("diagnosticSeverity") {
+            base.default_diagnostic_severity = serde_json::from_value(v.clone())?;
         }
 
-        if let Some(v) = value.get("diagnosticSeverity") {
-            base.diagnostic_severity = serde_json::from_value(v.clone())?;
+        if let Some(v) = value.get("linters") {
+            base.lint_config = serde_json::from_value(v.clone())?;
         }
 
         if let Some(v) = value.get("codeActions") {
@@ -121,7 +121,7 @@ impl Default for Config {
                 .unwrap()
                 .join("harper-ls/file_dictionaries/"),
             lint_config: LintGroupConfig::default(),
-            diagnostic_severity: LintSeverity::Hint,
+            default_diagnostic_severity: LintSeverity::Hint,
             code_action_config: CodeActionConfig::default(),
             isolate_english: false,
         }

diff --git a/harper-ls/src/diagnostics.rs b/harper-ls/src/diagnostics.rs
@@ -12,11 +12,11 @@ use crate::pos_conv::span_to_range;
 pub fn lints_to_diagnostics(
     source: &[char],
     lints: &[Lint],
-    severity: LintSeverity,
+    default_severity: LintSeverity,
 ) -> Vec<Diagnostic> {
     lints
         .iter()
-        .map(|lint| lint_to_diagnostic(lint, source, severity))
+        .map(|lint| lint_to_diagnostic(lint, source, default_severity))
         .collect()
 }
 
@@ -86,12 +86,15 @@ pub fn lint_to_code_actions<'a>(
     results
 }
 
-fn lint_to_diagnostic(lint: &Lint, source: &[char], severity: LintSeverity) -> Diagnostic {
+fn lint_to_diagnostic(lint: &Lint, source: &[char], default_severity: LintSeverity) -> Diagnostic {
     let range = span_to_range(source, lint.span);
 
     Diagnostic {
         range,
-        severity: Some(severity_to_lsp(severity)),
+        severity: lint
+            .severity
+            .or_else(|| Some(default_severity))
+            .map(|s| severity_to_lsp(s)),
         code: None,
         code_description: None,
         source: Some("Harper".to_string()),