Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(es/lint): Ignore ambient context binding #8368

Merged
merged 3 commits into from
Dec 3, 2023
+23 −135
Merged

fix(es/lint): Ignore ambient context binding #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05261e8
fix(es/lint): ignore ambient context binding
magic-akari Dec 2, 2023
27442e6
chore: update test cases
magic-akari Dec 2, 2023
d903733
Merge branch 'main' into fix/issue-8367
swc-bot Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8367/input/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare class Foo { }

function Foo() { }
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-8xxx/8367/output/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
function Foo() {}
32 changes: 0 additions & 32 deletions crates/swc/tests/tsc-references/classAbstractMergedDeclaration.1.normal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,3 @@
//! 19 | declare abstract class DCI {}
//! 20 | interface DCI {}
//! `----
//!
//! x the name `DCC1` is defined multiple times
//! ,-[22:1]
//! 22 | interface DIC {}
//! 23 | declare abstract class DIC {}
//! 24 |
//! 25 | declare abstract class DCC1 {}
//! : ^^|^
//! : `-- previous definition of `DCC1` here
//! 26 | declare class DCC1 {}
//! : ^^|^
//! : `-- `DCC1` redefined here
//! 27 |
//! 28 | declare class DCC2 {}
//! 29 | declare abstract class DCC2 {}
//! `----
//!
//! x the name `DCC2` is defined multiple times
//! ,-[25:1]
//! 25 | declare abstract class DCC1 {}
//! 26 | declare class DCC1 {}
//! 27 |
//! 28 | declare class DCC2 {}
//! : ^^|^
//! : `-- previous definition of `DCC2` here
//! 29 | declare abstract class DCC2 {}
//! : ^^|^
//! : `-- `DCC2` redefined here
//! 30 |
//! 31 | new CM;
//! 32 | new MC;
//! `----
32 changes: 0 additions & 32 deletions crates/swc/tests/tsc-references/classAbstractMergedDeclaration.2.minified.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,3 @@
//! 19 | declare abstract class DCI {}
//! 20 | interface DCI {}
//! `----
//!
//! x the name `DCC1` is defined multiple times
//! ,-[22:1]
//! 22 | interface DIC {}
//! 23 | declare abstract class DIC {}
//! 24 |
//! 25 | declare abstract class DCC1 {}
//! : ^^|^
//! : `-- previous definition of `DCC1` here
//! 26 | declare class DCC1 {}
//! : ^^|^
//! : `-- `DCC1` redefined here
//! 27 |
//! 28 | declare class DCC2 {}
//! 29 | declare abstract class DCC2 {}
//! `----
//!
//! x the name `DCC2` is defined multiple times
//! ,-[25:1]
//! 25 | declare abstract class DCC1 {}
//! 26 | declare class DCC1 {}
//! 27 |
//! 28 | declare class DCC2 {}
//! : ^^|^
//! : `-- previous definition of `DCC2` here
//! 29 | declare abstract class DCC2 {}
//! : ^^|^
//! : `-- `DCC2` redefined here
//! 30 |
//! 31 | new CM;
//! 32 | new MC;
//! `----
31 changes: 0 additions & 31 deletions crates/swc/tests/tsc-references/declaredClassMergedwithSelf.1.normal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,4 @@
//// [declaredClassMergedwithSelf.ts]
//// [file1.ts]
//!
//! x the name `C1` is defined multiple times
//! ,-[1:1]
//! 1 |
//! 2 | declare class C1 {}
//! : ^|
//! : `-- previous definition of `C1` here
//! 3 |
//! 4 | declare class C1 {}
//! : ^|
//! : `-- `C1` redefined here
//! 5 |
//! 6 | declare class C2 {}
//! `----
//!
//! x the name `C2` is defined multiple times
//! ,-[3:1]
//! 3 |
//! 4 | declare class C1 {}
//! 5 |
//! 6 | declare class C2 {}
//! : ^|
//! : `-- previous definition of `C2` here
//! 7 |
//! 8 | interface C2 {}
//! 9 |
//! 10 | declare class C2 {}
//! : ^|
//! : `-- `C2` redefined here
//! 11 |
//! `----
//// [file2.ts]
//// [file3.ts]
31 changes: 0 additions & 31 deletions crates/swc/tests/tsc-references/declaredClassMergedwithSelf.2.minified.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,4 @@
//// [declaredClassMergedwithSelf.ts]
//// [file1.ts]
//!
//! x the name `C1` is defined multiple times
//! ,-[1:1]
//! 1 |
//! 2 | declare class C1 {}
//! : ^|
//! : `-- previous definition of `C1` here
//! 3 |
//! 4 | declare class C1 {}
//! : ^|
//! : `-- `C1` redefined here
//! 5 |
//! 6 | declare class C2 {}
//! `----
//!
//! x the name `C2` is defined multiple times
//! ,-[3:1]
//! 3 |
//! 4 | declare class C1 {}
//! 5 |
//! 6 | declare class C2 {}
//! : ^|
//! : `-- previous definition of `C2` here
//! 7 |
//! 8 | interface C2 {}
//! 9 |
//! 10 | declare class C2 {}
//! : ^|
//! : `-- `C2` redefined here
//! 11 |
//! `----
//// [file2.ts]
//// [file3.ts]
28 changes: 19 additions & 9 deletions crates/swc_ecma_lints/src/rules/duplicate_bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ impl Visit for DuplicateBindings {
}

fn visit_class_decl(&mut self, d: &ClassDecl) {
if d.declare {
return;
}

self.add(
d.ident.sym.clone(),
BindingInfo {
Expand All @@ -211,17 +215,19 @@ impl Visit for DuplicateBindings {
}

fn visit_fn_decl(&mut self, d: &FnDecl) {
if d.function.body.is_some() {
self.add(
d.ident.sym.clone(),
BindingInfo {
span: d.ident.span,
unique: self.lexical_function,
is_function: true,
},
);
if d.function.body.is_none() || d.declare {
return;
}

self.add(
d.ident.sym.clone(),
BindingInfo {
span: d.ident.span,
unique: self.lexical_function,
is_function: true,
},
);

d.visit_children_with(self);
}

Expand Down Expand Up @@ -351,6 +357,10 @@ impl Visit for DuplicateBindings {
}

fn visit_var_decl(&mut self, d: &VarDecl) {
if d.declare {
return;
}

self.visit_with_kind(d, Some(d.kind))
}

Expand Down
Loading