Fixing error reporting issue in checkExternalModuleExports

ahejlsberg · ahejlsberg · commit bb33c150dc4d · 2015-03-04T06:52:18.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9953,7 +9953,7 @@ module ts {
                 var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
                 if (defaultSymbol) {
                     if (hasExportedMembers(moduleSymbol)) {
-                        var declaration = getDeclarationOfImportSymbol(defaultSymbol);
+                        var declaration = getDeclarationOfImportSymbol(defaultSymbol) || defaultSymbol.valueDeclaration;
                         error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -9953,7 +9953,7 @@ module ts {`
`9953`	`9953`	`var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);`
`9954`	`9954`	`if (defaultSymbol) {`
`9955`	`9955`	`if (hasExportedMembers(moduleSymbol)) {`
`9956`		`- var declaration = getDeclarationOfImportSymbol(defaultSymbol);`
	`9956`	`+ var declaration = getDeclarationOfImportSymbol(defaultSymbol) \|\| defaultSymbol.valueDeclaration;`
`9957`	`9957`	`error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);`
`9958`	`9958`	`}`
`9959`	`9959`	`}`