fix(linter/no-unsafe-declaration-merging): always mark class span as primary

Author: camc314

apps/oxlint/fixtures/disable_directive_issue_13311/.oxlintrc.json

@@ -0,0 +1,10 @@
+{
+  "plugins": ["eslint", "typescript", "react"],
+  "categories": {
+    "correctness": "off"
+  },
+  "rules": {
+    "react/exhaustive-deps": "warn",
+    "typescript/no-unsafe-declaration-merging": "error"
+  }
+}

apps/oxlint/fixtures/exhaustive_deps_disable_directive_issue_13311/test.jsx renamed to apps/oxlint/fixtures/disable_directive_issue_13311/test.jsx

@@ -10,4 +10,5 @@ function Component() {
   }, []);
 
   return null;
-}
+}
+

apps/oxlint/fixtures/disable_directive_issue_13311/test2.d.ts

@@ -0,0 +1,4 @@
+export interface Component<P = {}, S = {}> {}
+
+// oxlint-disable-next-line typescript/no-unsafe-declaration-merging
+export abstract class Component<P, S> {}

apps/oxlint/fixtures/exhaustive_deps_disable_directive_issue_13311/.oxlintrc.json

@@ -1252,13 +1252,13 @@ mod test {
     }
 
     #[test]
-    fn test_exhaustive_deps_disable_directive_issue_13311() {
+    fn test_disable_directive_issue_13311() {
         // Test that exhaustive-deps diagnostics are reported at the dependency array
         // so that disable directives work correctly
         // Issue: https://github.com/oxc-project/oxc/issues/13311
-        let args = &["test.jsx"];
+        let args = &["test.jsx", "test2.d.ts"];
         Tester::new()
-            .with_cwd("fixtures/exhaustive_deps_disable_directive_issue_13311".into())
+            .with_cwd("fixtures/disable_directive_issue_13311".into())
             .test_and_snapshot(args);
     }
 

apps/oxlint/src/lint.rs

@@ -0,0 +1,12 @@
+---
+source: apps/oxlint/src/tester.rs
+---
+########## 
+arguments: test.jsx test2.d.ts
+working directory: fixtures/disable_directive_issue_13311
+----------
+Found 0 warnings and 0 errors.
+Finished in <variable>ms on 2 files using 1 threads.
+----------
+CLI result: LintSucceeded
+----------

apps/oxlint/src/snapshots/fixtures__disable_directive_issue_13311_test.jsx test2.d.ts@oxlint.snap

@@ -10,10 +10,13 @@ use crate::{
     rule::Rule,
 };
 
-fn no_unsafe_declaration_merging_diagnostic(span: Span, span1: Span) -> OxcDiagnostic {
+fn no_unsafe_declaration_merging_diagnostic(
+    class_span: Span,
+    interface_span: Span,
+) -> OxcDiagnostic {
     OxcDiagnostic::warn("Unsafe declaration merging between classes and interfaces.")
         .with_help("The TypeScript compiler doesn't check whether properties are initialized, which can lead to TypeScript not detecting code that will cause runtime errors.")
-        .with_labels([span, span1])
+        .with_labels([class_span.primary(), interface_span.into()])
 }
 
 #[derive(Debug, Default, Clone)]
@@ -65,7 +68,7 @@ impl Rule for NoUnsafeDeclarationMerging {
                 for symbol_id in ctx.scoping().get_bindings(node.scope_id()).values() {
                     if let AstKind::Class(scope_class) = get_symbol_kind(*symbol_id, ctx) {
                         if let Some(scope_class_ident) = scope_class.id.as_ref() {
-                            check_and_diagnostic(&decl.id, scope_class_ident, ctx);
+                            check_and_diagnostic(scope_class_ident, &decl.id, ctx);
                         }
                     }
                 }
@@ -80,12 +83,15 @@ impl Rule for NoUnsafeDeclarationMerging {
 }
 
 fn check_and_diagnostic(
-    ident: &BindingIdentifier,
-    scope_ident: &BindingIdentifier,
+    class_binding_ident: &BindingIdentifier,
+    interface_binding_ident: &BindingIdentifier,
     ctx: &LintContext<'_>,
 ) {
-    if scope_ident.name.as_str() == ident.name.as_str() {
-        ctx.diagnostic(no_unsafe_declaration_merging_diagnostic(ident.span, scope_ident.span));
+    if interface_binding_ident.name.as_str() == class_binding_ident.name.as_str() {
+        ctx.diagnostic(no_unsafe_declaration_merging_diagnostic(
+            class_binding_ident.span,
+            interface_binding_ident.span,
+        ));
     }
 }