Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Allow aliases to be merged with exported types\namespaces
This commit is contained in:
Vladimir Matveev
2016-03-21 15:16:10 -07:00
parent 8514d0d5eb 3691261db4
commit cc8277c4db
9 changed files with 121 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+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 :