feat(semantic): introduce Redeclaraion for symbol_declarations

Author: Dunqing

crates/oxc_linter/src/rules/eslint/no_redeclare.rs

@@ -82,11 +82,11 @@ impl Rule for NoRedeclare {
             ctx.diagnostic(no_redeclare_as_builtin_in_diagnostic(name, decl_span));
         }
 
-        for span in ctx.scoping().symbol_redeclarations(symbol_id) {
+        for rd in ctx.scoping().symbol_redeclarations(symbol_id) {
             if is_builtin {
-                ctx.diagnostic(no_redeclare_as_builtin_in_diagnostic(name, *span));
+                ctx.diagnostic(no_redeclare_as_builtin_in_diagnostic(name, rd.span));
             } else {
-                ctx.diagnostic(no_redeclare_diagnostic(name, decl_span, *span));
+                ctx.diagnostic(no_redeclare_diagnostic(name, decl_span, rd.span));
             }
         }
     }

crates/oxc_linter/src/rules/eslint/no_shadow_restricted_names.rs

@@ -101,8 +101,8 @@ impl Rule for NoShadowRestrictedNames {
         let span = ctx.scoping().symbol_span(symbol_id);
         ctx.diagnostic(no_shadow_restricted_names_diagnostic(name, span));
 
-        for &span in ctx.scoping().symbol_redeclarations(symbol_id) {
-            ctx.diagnostic(no_shadow_restricted_names_diagnostic(name, span));
+        for rd in ctx.scoping().symbol_redeclarations(symbol_id) {
+            ctx.diagnostic(no_shadow_restricted_names_diagnostic(name, rd.span));
         }
     }
 }

crates/oxc_semantic/src/scoping.rs

@@ -15,6 +15,11 @@ use oxc_syntax::{
 pub type Bindings<'a> = ArenaHashMap<'a, &'a str, SymbolId>;
 pub type UnresolvedReferences<'a> = ArenaHashMap<'a, &'a str, ArenaVec<'a, ReferenceId>>;
 
+#[derive(Debug)]
+pub struct Redeclaration {
+    pub span: Span,
+}
+
 /// # Symbol Table and Scope Tree
 ///
 /// ## Symbol Table
@@ -104,7 +109,7 @@ pub struct ScopingInner<'cell> {
     /* Symbol Table Fields */
     symbol_names: ArenaVec<'cell, Atom<'cell>>,
     resolved_references: ArenaVec<'cell, ArenaVec<'cell, ReferenceId>>,
-    symbol_redeclarations: FxHashMap<SymbolId, ArenaVec<'cell, Span>>,
+    symbol_redeclarations: FxHashMap<SymbolId, ArenaVec<'cell, Redeclaration>>,
     /* Scope Tree Fields */
     /// Symbol bindings in a scope.
     ///
@@ -193,13 +198,13 @@ impl Scoping {
     }
 
     #[inline]
-    pub fn symbol_redeclarations(&self, symbol_id: SymbolId) -> &[Span] {
+    pub fn symbol_redeclarations(&self, symbol_id: SymbolId) -> &[Redeclaration] {
         self.cell.borrow_dependent().symbol_redeclarations.get(&symbol_id).map_or_else(
             || {
-                static EMPTY: &[Span] = &[];
+                static EMPTY: &[Redeclaration] = &[];
                 EMPTY
             },
-            |spans| spans.as_slice(),
+            |v| v.as_slice(),
         )
     }
 
@@ -253,12 +258,14 @@ impl Scoping {
 
     pub fn add_symbol_redeclaration(&mut self, symbol_id: SymbolId, span: Span) {
         self.cell.with_dependent_mut(|allocator, cell| {
+            let redeclaration = Redeclaration { span };
             match cell.symbol_redeclarations.entry(symbol_id) {
-                Entry::Occupied(mut entry) => {
-                    entry.get_mut().push(span);
+                Entry::Occupied(occupied) => {
+                    occupied.into_mut().push(redeclaration);
                 }
-                Entry::Vacant(entry) => {
-                    entry.insert(ArenaVec::from_array_in([span], allocator));
+                Entry::Vacant(vacant) => {
+                    let v = ArenaVec::from_array_in([redeclaration], allocator);
+                    vacant.insert(v);
                 }
             }
         });
@@ -790,8 +797,11 @@ impl Scoping {
                     symbol_redeclarations: cell
                         .symbol_redeclarations
                         .iter()
-                        .map(|(k, v)| (*k, v.clone_in_with_semantic_ids(allocator)))
-                        .collect(),
+                        .map(|(k, v)| {
+                            let v = v.iter().map(|r| Redeclaration { span: r.span });
+                            (*k, ArenaVec::from_iter_in(v, allocator))
+                        })
+                        .collect::<FxHashMap<_, _>>(),
                     bindings: cell
                         .bindings
                         .iter()

crates/oxc_transformer/src/typescript/namespace.rs

@@ -468,7 +468,7 @@ impl<'a> TypeScriptNamespace<'a, '_> {
                 // namespace Foo {} // is redeclaration
                 // ```
                 let redeclarations = ctx.scoping().symbol_redeclarations(symbol_id);
-                !redeclarations.is_empty() && redeclarations.contains(&id.span)
+                !redeclarations.is_empty() && redeclarations.iter().any(|rd| rd.span == id.span)
             }
     }
 }

tasks/transform_checker/src/lib.rs

@@ -427,7 +427,11 @@ impl PostTransformChecker<'_, '_> {
 
             // Check redeclarations match
             let redeclaration_spans = self.get_pair(symbol_ids, |scoping, symbol_id| {
-                let mut spans = scoping.symbol_redeclarations(symbol_id).to_vec();
+                let mut spans = scoping
+                    .symbol_redeclarations(symbol_id)
+                    .iter()
+                    .map(|rd| rd.span)
+                    .collect::<Vec<_>>();
                 spans.sort_unstable();
                 spans
             });