Report duplicate identifier errors on all locations for merged declarations to align with local declarations

mhegazy · mhegazy · commit cffc62aa1bc9 · 2014-10-14T15:18:44.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -226,6 +226,9 @@ module ts {
                 forEach(source.declarations, node => {
                     error(node.name ? node.name : node, Diagnostics.Duplicate_identifier_0, symbolToString(source));
                 });
+                forEach(target.declarations, node => {
+                    error(node.name ? node.name : node, Diagnostics.Duplicate_identifier_0, symbolToString(source));
+                });
             }
         }
 
diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.errors.txt b/tests/baselines/reference/functionTypeArgumentArrayAssignment.errors.txt
diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.js b/tests/baselines/reference/functionTypeArgumentArrayAssignment.js
@@ -1,15 +1,20 @@
 //// [functionTypeArgumentArrayAssignment.ts]
-interface Array<T> {
-	foo: T;
-	length: number;
-}
+module test {
+    interface Array<T> {
+        foo: T;
+        length: number;
+    }
 
-function map<U>() {
-var ys: U[] = [];
+    function map<U>() {
+        var ys: U[] = [];
+    }
 }
 
 
 //// [functionTypeArgumentArrayAssignment.js]
-function map() {
-    var ys = [];
-}
+var test;
+(function (test) {
+    function map() {
+        var ys = [];
+    }
+})(test || (test = {}));
diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.types b/tests/baselines/reference/functionTypeArgumentArrayAssignment.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/functionTypeArgumentArrayAssignment.ts ===
+module test {
+>test : typeof test
+
+    interface Array<T> {
+>Array : Array<T>
+>T : T
+
+        foo: T;
+>foo : T
+>T : T
+
+        length: number;
+>length : number
+    }
+
+    function map<U>() {
+>map : <U>() => void
+>U : U
+
+        var ys: U[] = [];
+>ys : U[]
+>U : U
+>[] : U[]
+    }
+}
+
diff --git a/tests/baselines/reference/instanceofOperator.errors.txt b/tests/baselines/reference/instanceofOperator.errors.txt
@@ -1,43 +1,42 @@
-tests/cases/compiler/instanceofOperator.ts(6,7): error TS2300: Duplicate identifier 'Object'.
-tests/cases/compiler/instanceofOperator.ts(11,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/instanceofOperator.ts(14,16): error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
-tests/cases/compiler/instanceofOperator.ts(15,19): error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
-tests/cases/compiler/instanceofOperator.ts(18,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/instanceofOperator.ts(20,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+tests/cases/compiler/instanceofOperator.ts(12,5): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+tests/cases/compiler/instanceofOperator.ts(15,20): error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
+tests/cases/compiler/instanceofOperator.ts(16,23): error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
+tests/cases/compiler/instanceofOperator.ts(19,5): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+tests/cases/compiler/instanceofOperator.ts(21,5): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/compiler/instanceofOperator.ts (6 errors) ====
+==== tests/cases/compiler/instanceofOperator.ts (5 errors) ====
     // Spec:
     // The instanceof operator requires the left operand to be of type Any or an object type, and the right 
     // operand to be of type Any or a subtype of the ‘Function’ interface type. The result is always of the 
     // Boolean primitive type.
     
-    class Object { }
-          ~~~~~~
-!!! error TS2300: Duplicate identifier 'Object'.
-    var obj: Object;
+    module test {
+        class Object { }
+        var obj: Object;
     
     
     
-    4 instanceof null; 
-    ~
+        4 instanceof null;
+        ~
 !!! error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
     
-    // Error and should be error
-    obj instanceof 4;
-                   ~
+        // Error and should be error
+        obj instanceof 4;
+                       ~
 !!! error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
-    Object instanceof obj;
-                      ~~~
+        Object instanceof obj;
+                          ~~~
 !!! error TS2359: The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
     
-    // Error on left hand side
-    null instanceof null;
-    ~~~~
+        // Error on left hand side
+        null instanceof null;
+        ~~~~
 !!! error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-    obj instanceof Object;
-    undefined instanceof undefined;
-    ~~~~~~~~~
+        obj instanceof Object;
+        undefined instanceof undefined;
+        ~~~~~~~~~
 !!! error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+    }
     
     
diff --git a/tests/baselines/reference/instanceofOperator.js b/tests/baselines/reference/instanceofOperator.js
@@ -4,21 +4,23 @@
 // operand to be of type Any or a subtype of the ‘Function’ interface type. The result is always of the 
 // Boolean primitive type.
 
-class Object { }
-var obj: Object;
+module test {
+    class Object { }
+    var obj: Object;
 
 
 
-4 instanceof null; 
+    4 instanceof null;
 
-// Error and should be error
-obj instanceof 4;
-Object instanceof obj;
+    // Error and should be error
+    obj instanceof 4;
+    Object instanceof obj;
 
-// Error on left hand side
-null instanceof null;
-obj instanceof Object;
-undefined instanceof undefined;
+    // Error on left hand side
+    null instanceof null;
+    obj instanceof Object;
+    undefined instanceof undefined;
+}
 
 
 
@@ -27,17 +29,20 @@ undefined instanceof undefined;
 // The instanceof operator requires the left operand to be of type Any or an object type, and the right 
 // operand to be of type Any or a subtype of the ‘Function’ interface type. The result is always of the 
 // Boolean primitive type.
-var Object = (function () {
-    function Object() {
-    }
-    return Object;
-})();
-var obj;
-4 instanceof null;
-// Error and should be error
-obj instanceof 4;
-Object instanceof obj;
-// Error on left hand side
-null instanceof null;
-obj instanceof Object;
-undefined instanceof undefined;
+var test;
+(function (test) {
+    var Object = (function () {
+        function Object() {
+        }
+        return Object;
+    })();
+    var obj;
+    4 instanceof null;
+    // Error and should be error
+    obj instanceof 4;
+    Object instanceof obj;
+    // Error on left hand side
+    null instanceof null;
+    obj instanceof Object;
+    undefined instanceof undefined;
+})(test || (test = {}));
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates2.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates2.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,5): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     let var1 = 0;
+        ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     let var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates3.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates3.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,5): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,7): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     let var1 = 0;
+        ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     const var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates4.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates4.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,7): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     const var1 = 0;
+          ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     let var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates5.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates5.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,7): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,7): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     const var1 = 0;
+          ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     const var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates6.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates6.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,5): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     var var1 = 0;
+        ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     let var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations-scopes-duplicates7.errors.txt b/tests/baselines/reference/letDeclarations-scopes-duplicates7.errors.txt
@@ -1,9 +1,12 @@
+tests/cases/compiler/file1.ts(2,5): error TS2300: Duplicate identifier 'var1'.
 tests/cases/compiler/file2.ts(1,5): error TS2300: Duplicate identifier 'var1'.
 
 
-==== tests/cases/compiler/file1.ts (0 errors) ====
+==== tests/cases/compiler/file1.ts (1 errors) ====
     
     let var1 = 0;
+        ~~~~
+!!! error TS2300: Duplicate identifier 'var1'.
     
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     var var1 = 0;
diff --git a/tests/baselines/reference/letDeclarations3.errors.txt b/tests/baselines/reference/letDeclarations3.errors.txt
diff --git a/tests/baselines/reference/parserOptionalTypeMembers1.errors.txt b/tests/baselines/reference/parserOptionalTypeMembers1.errors.txt
diff --git a/tests/baselines/reference/parserOptionalTypeMembers1.js b/tests/baselines/reference/parserOptionalTypeMembers1.js
@@ -1,5 +1,5 @@
 //// [parserOptionalTypeMembers1.ts]
-interface PropertyDescriptor {
+interface PropertyDescriptor2 {
     configurable?: boolean;
     enumerable?: boolean;
     value?: any;
diff --git a/tests/baselines/reference/parserOptionalTypeMembers1.types b/tests/baselines/reference/parserOptionalTypeMembers1.types
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/parser/ecmascript5/parserOptionalTypeMembers1.ts ===
+interface PropertyDescriptor2 {
+>PropertyDescriptor2 : PropertyDescriptor2
+
+    configurable?: boolean;
+>configurable : boolean
+
+    enumerable?: boolean;
+>enumerable : boolean
+
+    value?: any;
+>value : any
+
+    writable?: boolean;
+>writable : boolean
+
+    get?(): any;
+>get : () => any
+
+    set?(v: any): void;
+>set : (v: any) => void
+>v : any
+}
diff --git a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
@@ -1,3 +1,4 @@
+in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 
 
@@ -14,8 +15,10 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
             class MyClass{ }
         }
     }
-==== in1.d.ts (0 errors) ====
+==== in1.d.ts (1 errors) ====
     import a = A;
+           ~
+!!! error TS2300: Duplicate identifier 'a'.
 ==== in2.d.ts (1 errors) ====
     import a = A;
            ~
diff --git a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
diff --git a/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts b/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts
diff --git a/tests/cases/compiler/instanceofOperator.ts b/tests/cases/compiler/instanceofOperator.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/parserOptionalTypeMembers1.ts b/tests/cases/conformance/parser/ecmascript5/parserOptionalTypeMembers1.ts

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,9 @@ module ts {`
`226`	`226`	`forEach(source.declarations, node => {`
`227`	`227`	`error(node.name ? node.name : node, Diagnostics.Duplicate_identifier_0, symbolToString(source));`
`228`	`228`	`});`
	`229`	`+ forEach(target.declarations, node => {`
	`230`	`+ error(node.name ? node.name : node, Diagnostics.Duplicate_identifier_0, symbolToString(source));`
	`231`	`+ });`
`229`	`232`	`}`
`230`	`233`	`}`
`231`	`234`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.`
`1`	`2`	`in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.`
`2`	`3`
`3`	`4`
`@@ -14,8 +15,10 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.`
`14`	`15`	`class MyClass{ }`
`15`	`16`	`}`
`16`	`17`	`}`
`17`		`-==== in1.d.ts (0 errors) ====`
	`18`	`+==== in1.d.ts (1 errors) ====`
`18`	`19`	`import a = A;`
	`20`	`+ ~`
	`21`	`+!!! error TS2300: Duplicate identifier 'a'.`
`19`	`22`	`==== in2.d.ts (1 errors) ====`
`20`	`23`	`import a = A;`
`21`	`24`	`~`