Improved non-namespace overriding

sandersn · sandersn · commit ec2eac53bf15 · 2015-10-11T15:33:17.000-07:00
Per @ahejlsberg's suggestion, only overwrite a namespace `valueDeclaration` if the new declaration is not a namespace itself. This means that if there are multiple namespace declarations, and nothing else, `valueDeclaration` will be the first namespace declaration, not the last.
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -131,7 +131,8 @@ namespace ts {
             }
 
             if (symbolFlags & SymbolFlags.Value &&
-                (!symbol.valueDeclaration || symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {
+                (!symbol.valueDeclaration ||
+                 (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && node.kind !== SyntaxKind.ModuleDeclaration))) {
                 // other kinds of value declarations take precedence over modules
                 symbol.valueDeclaration = node;
             }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -294,7 +294,8 @@ namespace ts {
                 }
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
-                    (!target.valueDeclaration || target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {
+                    (!target.valueDeclaration ||
+                     (target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && source.valueDeclaration.kind !== SyntaxKind.ModuleDeclaration))) {
                     // other kinds of value declarations take precedence over modules
                     target.valueDeclaration = source.valueDeclaration;
                 }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ namespace ts {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if (symbolFlags & SymbolFlags.Value &&`
`134`		`- (!symbol.valueDeclaration \|\| symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {`
	`134`	`+ (!symbol.valueDeclaration \|\|`
	`135`	`+ (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && node.kind !== SyntaxKind.ModuleDeclaration))) {`
`135`	`136`	`// other kinds of value declarations take precedence over modules`
`136`	`137`	`symbol.valueDeclaration = node;`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,8 @@ namespace ts {`
`294`	`294`	`}`
`295`	`295`	`target.flags \|= source.flags;`
`296`	`296`	`if (source.valueDeclaration &&`
`297`		`- (!target.valueDeclaration \|\| target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {`
	`297`	`+ (!target.valueDeclaration \|\|`
	`298`	`+ (target.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && source.valueDeclaration.kind !== SyntaxKind.ModuleDeclaration))) {`
`298`	`299`	`// other kinds of value declarations take precedence over modules`
`299`	`300`	`target.valueDeclaration = source.valueDeclaration;`
`300`	`301`	`}`