Merge pull request #7591 from Microsoft/allow-merge-for-types-namespaces

Allow aliases to be merged with exported types\namespaces
This commit is contained in:
Vladimir Matveev committed 2016-03-21 15:16:10 -07:00
commit cc8277c4db
9 files changed
+121 -2

No files matched your search

+2 -2
View File
@@ -15085,8 +15085,8 @@ namespace ts {
// in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
const excludedMeanings =
(symbol.flags & (SymbolFlags.Value | SymbolFlags.ExportValue) ? SymbolFlags.Value : 0) |
(symbol.flags & (SymbolFlags.Type | SymbolFlags.ExportType) ? SymbolFlags.Type : 0) |
(symbol.flags & (SymbolFlags.Namespace | SymbolFlags.ExportNamespace) ? SymbolFlags.Namespace : 0);
(symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
(symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
if (target.flags & excludedMeanings) {
const message = node.kind === SyntaxKind.ExportSpecifier ?
Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :