mergeSymbol error uses first decl not valueDecl

sandersn · sandersn · commit effa032d5dcd · 2017-04-18T16:18:27.000-07:00
Previously it assumed valueDeclaration was present, which is not true
for type aliases.
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

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`