Merge pull request microsoft#15258 from Microsoft/mergeSymbol-uses-first-decl-not-valueDecl

sandersn · web-flow · commit a8593996f983 · 2017-04-19T08:47:43.000-07:00
mergeSymbol uses first declaration, not valueDeclaration
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -574,7 +574,7 @@ namespace ts {
                 recordMergedSymbol(target, source);
             }
             else if (target.flags & SymbolFlags.NamespaceModule) {
-                error(source.valueDeclaration.name, Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                error(source.declarations[0].name, Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
             }
             else {
                 const message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
diff --git a/tests/baselines/reference/noSymbolForMergeCrash.errors.txt b/tests/baselines/reference/noSymbolForMergeCrash.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/final.ts(1,6): error TS2649: Cannot augment module 'A' with value exports because it resolves to a non-module entity.
+
+
+==== tests/cases/compiler/initial.ts (0 errors) ====
+    interface A { }
+    namespace A {}
+    
+==== tests/cases/compiler/final.ts (1 errors) ====
+    type A = {}
+         ~
+!!! error TS2649: Cannot augment module 'A' with value exports because it resolves to a non-module entity.
+    
diff --git a/tests/baselines/reference/noSymbolForMergeCrash.js b/tests/baselines/reference/noSymbolForMergeCrash.js
@@ -0,0 +1,12 @@
+//// [tests/cases/compiler/noSymbolForMergeCrash.ts] ////
+
+//// [initial.ts]
+interface A { }
+namespace A {}
+
+//// [final.ts]
+type A = {}
+
+
+//// [initial.js]
+//// [final.js]
diff --git a/tests/cases/compiler/noSymbolForMergeCrash.ts b/tests/cases/compiler/noSymbolForMergeCrash.ts
@@ -0,0 +1,6 @@
+// @Filename: initial.ts
+interface A { }
+namespace A {}
+
+// @Filename: final.ts
+type A = {}

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ namespace ts {`
`574`	`574`	`recordMergedSymbol(target, source);`
`575`	`575`	`}`
`576`	`576`	`else if (target.flags & SymbolFlags.NamespaceModule) {`
`577`		`- error(source.valueDeclaration.name, Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));`
	`577`	`+ error(source.declarations[0].name, Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));`
`578`	`578`	`}`
`579`	`579`	`else {`
`580`	`580`	`const message = target.flags & SymbolFlags.BlockScopedVariable \|\| source.flags & SymbolFlags.BlockScopedVariable`