Re-add logic to report diagnostics as Severity::Disabled

Summary:
Basically a revert of D84170122, clarified in comments.

When using `--include-tests`, diagnostics for non-opted-in test suites will be output as `Severity::Disabled`, so as to be registered in contlint but to not appear in CI.

Reviewed By: michalmuskala, jcpetruzza

Differential Revision: D84914421

fbshipit-source-id: e428de9b0e55c8dda2040f4e030cac32a3201fcd

Author: VLanvin

crates/elp/src/bin/reporting.rs

@@ -227,6 +227,9 @@ impl Reporter for JsonReporter<'_> {
         diagnostics: &[EqwalizerDiagnostic],
     ) -> Result<()> {
         let line_index = self.analysis.line_index(file_id)?;
+        // Pass include_Tests = false so that errors for tests files that are not opted-in are tagged as
+        // arc_types::Severity::Disabled and don't break CI.
+        let eqwalizer_enabled = self.analysis.is_eqwalizer_enabled(file_id, false).unwrap();
         let file_path = &self.loaded.vfs.file_path(file_id);
         let root_path = &self
             .analysis
@@ -235,8 +238,12 @@ impl Reporter for JsonReporter<'_> {
             .root_dir;
         let relative_path = get_relative_path(root_path, file_path);
         for diagnostic in diagnostics {
-            let diagnostic =
-                convert::eqwalizer_to_arc_diagnostic(diagnostic, &line_index, relative_path);
+            let diagnostic = convert::eqwalizer_to_arc_diagnostic(
+                diagnostic,
+                &line_index,
+                relative_path,
+                eqwalizer_enabled,
+            );
             let diagnostic = serde_json::to_string(&diagnostic)?;
             writeln!(self.cli, "{diagnostic}")?;
         }

crates/elp/src/convert.rs

@@ -122,11 +122,18 @@ pub fn eqwalizer_to_arc_diagnostic(
     d: &EqwalizerDiagnostic,
     line_index: &LineIndex,
     relative_path: &Path,
+    eqwalizer_enabled: bool,
 ) -> arc_types::Diagnostic {
     let pos = position(line_index, d.range.start());
     let line_num = pos.line + 1;
     let character = Some(pos.character + 1);
-    let severity = arc_types::Severity::Error;
+    let severity = if eqwalizer_enabled {
+        arc_types::Severity::Error
+    } else {
+        // We use Severity::Disabled so that diagnostics are reported in cont lint
+        // but not in CI.
+        arc_types::Severity::Disabled
+    };
     // formatting: https://fburl.com/max_wiki_link_to_phabricator_rich_text
     let explanation = match &d.explanation {
         Some(s) => format!("```\n{s}\n```"),