Support disable all when not code list

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/analyzer/doc/diagnostic_tags.rs

@@ -41,27 +41,32 @@ fn analyze_diagnostic_disable(
     };
 
     let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
-    let diagnostic_code_list = diagnostic.get_code_list()?;
-    for code in diagnostic_code_list.get_codes() {
-        let name = code.get_name_text();
-        let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
-            code
-        } else {
-            continue;
-        };
-
-        if is_file_disable {
-            diagnostic_index.add_file_diagnostic_disabled(analyzer.file_id, diagnostic_code);
-        } else {
-            diagnostic_index.add_diagnostic_action(
-                analyzer.file_id,
-                DiagnosticAction::new(
-                    owner_block_range,
-                    DiagnosticActionKind::Disable,
-                    diagnostic_code,
-                ),
-            );
+    if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
+        for code in diagnostic_code_list.get_codes() {
+            let name = code.get_name_text();
+            let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
+                code
+            } else {
+                continue;
+            };
+
+            if is_file_disable {
+                diagnostic_index.add_file_diagnostic_disabled(analyzer.file_id, diagnostic_code);
+            } else {
+                diagnostic_index.add_diagnostic_action(
+                    analyzer.file_id,
+                    DiagnosticAction::new(
+                        owner_block_range,
+                        DiagnosticActionKind::Disable(diagnostic_code),
+                    ),
+                );
+            }
         }
+    } else {
+        diagnostic_index.add_diagnostic_action(
+            analyzer.file_id,
+            DiagnosticAction::new(owner_block_range, DiagnosticActionKind::DisableAll),
+        );
     }
 
     Some(())
@@ -79,18 +84,24 @@ fn analyze_diagnostic_disable_next_line(
     let valid_range = TextRange::new(comment_range.start(), line_range.end());
 
     let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
-    let diagnostic_code_list = diagnostic.get_code_list()?;
-    for code in diagnostic_code_list.get_codes() {
-        let name = code.get_name_text();
-        let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
-            code
-        } else {
-            continue;
-        };
+    if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
+        for code in diagnostic_code_list.get_codes() {
+            let name = code.get_name_text();
+            let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
+                code
+            } else {
+                continue;
+            };
 
+            diagnostic_index.add_diagnostic_action(
+                analyzer.file_id,
+                DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable(diagnostic_code)),
+            );
+        }
+    } else {
         diagnostic_index.add_diagnostic_action(
             analyzer.file_id,
-            DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable, diagnostic_code),
+            DiagnosticAction::new(valid_range, DiagnosticActionKind::DisableAll),
         );
     }
 
@@ -108,18 +119,24 @@ fn analyze_diagnostic_disable_line(
     let valid_range = document.get_line_range(comment_end_line)?;
 
     let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
-    let diagnostic_code_list = diagnostic.get_code_list()?;
-    for code in diagnostic_code_list.get_codes() {
-        let name = code.get_name_text();
-        let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
-            code
-        } else {
-            continue;
-        };
+    if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
+        for code in diagnostic_code_list.get_codes() {
+            let name = code.get_name_text();
+            let diagnostic_code = if let Some(code) = DiagnosticCode::from_str(name).ok() {
+                code
+            } else {
+                continue;
+            };
 
+            diagnostic_index.add_diagnostic_action(
+                analyzer.file_id,
+                DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable(diagnostic_code)),
+            );
+        }
+    } else {
         diagnostic_index.add_diagnostic_action(
             analyzer.file_id,
-            DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable, diagnostic_code),
+            DiagnosticAction::new(valid_range, DiagnosticActionKind::DisableAll),
         );
     }
 

crates/emmylua_code_analysis/src/db_index/diagnostic/diagnostic_action.rs

@@ -6,33 +6,53 @@ use crate::DiagnosticCode;
 pub struct DiagnosticAction {
     range: TextRange,
     kind: DiagnosticActionKind,
-    code: DiagnosticCode,
 }
 
 impl DiagnosticAction {
-    pub fn new(range: TextRange, kind: DiagnosticActionKind, code: DiagnosticCode) -> Self {
-        Self { range, kind, code }
+    pub fn new(range: TextRange, kind: DiagnosticActionKind) -> Self {
+        Self { range, kind }
     }
 
     pub fn get_range(&self) -> TextRange {
         self.range
     }
 
     pub fn is_enable(&self) -> bool {
-        matches!(self.kind, DiagnosticActionKind::Enable)
+        matches!(self.kind, DiagnosticActionKind::Enable(_))
     }
 
     pub fn is_disable(&self) -> bool {
-        matches!(self.kind, DiagnosticActionKind::Disable)
+        matches!(
+            self.kind,
+            DiagnosticActionKind::Disable(_) | DiagnosticActionKind::DisableAll
+        )
     }
 
-    pub fn get_code(&self) -> DiagnosticCode {
-        self.code
+    pub fn get_code(&self) -> Option<DiagnosticCode> {
+        match &self.kind {
+            DiagnosticActionKind::Disable(code) => Some(*code),
+            DiagnosticActionKind::Enable(code) => Some(*code),
+            DiagnosticActionKind::DisableAll => None,
+        }
+    }
+
+    pub fn is_match(&self, is_disable: bool, range: &TextRange, code: &DiagnosticCode) -> bool {
+        if self.range.intersect(*range).is_none() {
+            return false;
+        }
+
+        match (&self.kind, is_disable) {
+            (DiagnosticActionKind::Disable(disable_code), true) => disable_code == code,
+            (DiagnosticActionKind::Enable(enable_code), false) => enable_code == code,
+            (DiagnosticActionKind::DisableAll, true) => true,
+            _ => false,
+        }
     }
 }
 
 #[derive(Debug)]
 pub enum DiagnosticActionKind {
-    Disable,
-    Enable, // donot use this
+    Disable(DiagnosticCode),
+    Enable(DiagnosticCode), // donot use this
+    DisableAll,
 }

crates/emmylua_code_analysis/src/db_index/diagnostic/mod.rs

@@ -73,10 +73,7 @@ impl DiagnosticIndex {
     ) -> bool {
         if let Some(disabled) = self.diagnostic_actions.get(file_id) {
             for action in disabled {
-                if action.get_code() == *code
-                    && action.is_disable()
-                    && action.get_range().intersect(*range).is_some()
-                {
+                if action.is_match(true, range, code) {
                     return true;
                 }
             }