Skip to content

Commit 318575c

Browse files
committed
Ensure duplicate let/const declarations accross files are reported
1 parent 1dde985 commit 318575c

19 files changed

+187
-0
lines changed

src/compiler/checker.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ module ts {
172172

173173
function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags {
174174
var result: SymbolFlags = 0;
175+
if (flags & SymbolFlags.BlockScoped) result |= SymbolFlags.BlockScopedExcludes;
175176
if (flags & SymbolFlags.Variable) result |= SymbolFlags.VariableExcludes;
176177
if (flags & SymbolFlags.Property) result |= SymbolFlags.PropertyExcludes;
177178
if (flags & SymbolFlags.EnumMember) result |= SymbolFlags.EnumMemberExcludes;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
2+
3+
4+
==== tests/cases/compiler/file1.ts (0 errors) ====
5+
6+
let var1 = 0;
7+
8+
==== tests/cases/compiler/file2.ts (1 errors) ====
9+
let var1 = 0;
10+
~~~~
11+
!!! error TS2300: Duplicate identifier 'var1'.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//// [tests/cases/compiler/letDeclarations-scopes-duplicates2.ts] ////
2+
3+
//// [file1.ts]
4+
5+
let var1 = 0;
6+
7+
//// [file2.ts]
8+
let var1 = 0;
9+
10+
//// [file1.js]
11+
let var1 = 0;
12+
//// [file2.js]
13+
let var1 = 0;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tests/cases/compiler/file2.ts(1,7): error TS2300: Duplicate identifier 'var1'.
2+
3+
4+
==== tests/cases/compiler/file1.ts (0 errors) ====
5+
6+
let var1 = 0;
7+
8+
==== tests/cases/compiler/file2.ts (1 errors) ====
9+
const var1 = 0;
10+
~~~~
11+
!!! error TS2300: Duplicate identifier 'var1'.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//// [tests/cases/compiler/letDeclarations-scopes-duplicates3.ts] ////
2+
3+
//// [file1.ts]
4+
5+
let var1 = 0;
6+
7+
//// [file2.ts]
8+
const var1 = 0;
9+
10+
//// [file1.js]
11+
let var1 = 0;
12+
//// [file2.js]
13+
const var1 = 0;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
2+
3+
4+
==== tests/cases/compiler/file1.ts (0 errors) ====
5+
6+
const var1 = 0;
7+
8+
==== tests/cases/compiler/file2.ts (1 errors) ====
9+
let var1 = 0;
10+
~~~~
11+
!!! error TS2300: Duplicate identifier 'var1'.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//// [tests/cases/compiler/letDeclarations-scopes-duplicates4.ts] ////
2+
3+
//// [file1.ts]
4+
5+
const var1 = 0;
6+
7+
//// [file2.ts]
8+
let var1 = 0;
9+
10+
//// [file1.js]
11+
const var1 = 0;
12+
//// [file2.js]
13+
let var1 = 0;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tests/cases/compiler/file2.ts(1,7): error TS2300: Duplicate identifier 'var1'.
2+
3+
4+
==== tests/cases/compiler/file1.ts (0 errors) ====
5+
6+
const var1 = 0;
7+
8+
==== tests/cases/compiler/file2.ts (1 errors) ====
9+
const var1 = 0;
10+
~~~~
11+
!!! error TS2300: Duplicate identifier 'var1'.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//// [tests/cases/compiler/letDeclarations-scopes-duplicates5.ts] ////
2+
3+
//// [file1.ts]
4+
5+
const var1 = 0;
6+
7+
//// [file2.ts]
8+
const var1 = 0;
9+
10+
//// [file1.js]
11+
const var1 = 0;
12+
//// [file2.js]
13+
const var1 = 0;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
2+
3+
4+
==== tests/cases/compiler/file1.ts (0 errors) ====
5+
6+
var var1 = 0;
7+
8+
==== tests/cases/compiler/file2.ts (1 errors) ====
9+
let var1 = 0;
10+
~~~~
11+
!!! error TS2300: Duplicate identifier 'var1'.

0 commit comments

Comments
 (0)