Consistently error on more than one 'export default'

ahejlsberg · ahejlsberg · commit 6074b3ea2407 · 2015-03-23T11:05:03.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -531,11 +531,11 @@ module ts {
                 case SyntaxKind.ExportAssignment:
                     if ((<ExportAssignment>node).expression.kind === SyntaxKind.Identifier) {
                         // An export default clause with an identifier exports all meanings of that identifier
-                        declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
+                        declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Alias, SymbolFlags.PropertyExcludes | SymbolFlags.AliasExcludes);
                     }
                     else {
                         // An export default clause with an expression exports a value
-                        declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
+                        declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes | SymbolFlags.AliasExcludes);
                     }
                     bindChildren(node, 0, /*isBlockScopeContainer*/ false);
                     break;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -613,7 +613,7 @@ module ts {
             return resolveEntityName(<Identifier>node.expression, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace);
         }
 
-        function getTargetOfImportDeclaration(node: Declaration): Symbol {
+        function getTargetOfAliasDeclaration(node: Declaration): Symbol {
             switch (node.kind) {
                 case SyntaxKind.ImportEqualsDeclaration:
                     return getTargetOfImportEqualsDeclaration(<ImportEqualsDeclaration>node);
@@ -640,7 +640,7 @@ module ts {
             if (!links.target) {
                 links.target = resolvingSymbol;
                 let node = getDeclarationOfAliasSymbol(symbol);
-                let target = getTargetOfImportDeclaration(node);
+                let target = getTargetOfAliasDeclaration(node);
                 if (links.target === resolvingSymbol) {
                     links.target = target || unknownSymbol;
                 }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -848,7 +848,7 @@ module ts {
             node.kind === SyntaxKind.NamespaceImport ||
             node.kind === SyntaxKind.ImportSpecifier ||
             node.kind === SyntaxKind.ExportSpecifier ||
-            node.kind === SyntaxKind.ExportAssignment;
+            node.kind === SyntaxKind.ExportAssignment && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier;
     }
 
     export function getClassBaseTypeNode(node: ClassDeclaration) {

Original file line number	Diff line number	Diff line change
`@@ -531,11 +531,11 @@ module ts {`
`531`	`531`	`case SyntaxKind.ExportAssignment:`
`532`	`532`	`if ((<ExportAssignment>node).expression.kind === SyntaxKind.Identifier) {`
`533`	`533`	`// An export default clause with an identifier exports all meanings of that identifier`
`534`		`- declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);`
	`534`	`+ declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Alias, SymbolFlags.PropertyExcludes \| SymbolFlags.AliasExcludes);`
`535`	`535`	`}`
`536`	`536`	`else {`
`537`	`537`	`// An export default clause with an expression exports a value`
`538`		`- declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);`
	`538`	`+ declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes \| SymbolFlags.AliasExcludes);`
`539`	`539`	`}`
`540`	`540`	`bindChildren(node, 0, /isBlockScopeContainer/ false);`
`541`	`541`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ module ts {`
`848`	`848`	`node.kind === SyntaxKind.NamespaceImport \|\|`
`849`	`849`	`node.kind === SyntaxKind.ImportSpecifier \|\|`
`850`	`850`	`node.kind === SyntaxKind.ExportSpecifier \|\|`
`851`		`- node.kind === SyntaxKind.ExportAssignment;`
	`851`	`+ node.kind === SyntaxKind.ExportAssignment && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier;`
`852`	`852`	`}`
`853`	`853`
`854`	`854`	`export function getClassBaseTypeNode(node: ClassDeclaration) {`