revert back fix for implicit exports of imports

vladima · vladima · commit 6f3f690a8d74 · 2016-04-15T11:31:26.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -355,7 +355,7 @@ namespace ts {
         function declareModuleMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): Symbol {
             const hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
             if (symbolFlags & SymbolFlags.Alias) {
-                if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && (hasExportModifier || container.flags & NodeFlags.ExportContext))) {
+                if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.js b/tests/baselines/reference/newNamesInGlobalAugmentations1.js
@@ -13,7 +13,7 @@ declare global {
     }
     class Cls {x}
     let [a, b]: number[];
-    import X = M.M1.x;
+    export import X = M.M1.x;
 }
 
 //// [main.ts]
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.symbols b/tests/baselines/reference/newNamesInGlobalAugmentations1.symbols
@@ -26,7 +26,7 @@ declare global {
 >a : Symbol(a, Decl(f1.d.ts, 11, 9))
 >b : Symbol(b, Decl(f1.d.ts, 11, 11))
 
-    import X = M.M1.x;
+    export import X = M.M1.x;
 >X : Symbol(X, Decl(f1.d.ts, 11, 25))
 >M : Symbol(M, Decl(f1.d.ts, 1, 10))
 >M1 : Symbol(M.M1, Decl(f1.d.ts, 3, 17))
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.types b/tests/baselines/reference/newNamesInGlobalAugmentations1.types
@@ -26,7 +26,7 @@ declare global {
 >a : number
 >b : number
 
-    import X = M.M1.x;
+    export import X = M.M1.x;
 >X : number
 >M : typeof M
 >M1 : typeof M.M1
diff --git a/tests/cases/compiler/newNamesInGlobalAugmentations1.ts b/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
@@ -12,7 +12,7 @@ declare global {
     }
     class Cls {x}
     let [a, b]: number[];
-    import X = M.M1.x;
+    export import X = M.M1.x;
 }
 
 // @filename: main.ts

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ namespace ts {`
`355`	`355`	`function declareModuleMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): Symbol {`
`356`	`356`	`const hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;`
`357`	`357`	`if (symbolFlags & SymbolFlags.Alias) {`
`358`		`- if (node.kind === SyntaxKind.ExportSpecifier \|\| (node.kind === SyntaxKind.ImportEqualsDeclaration && (hasExportModifier \|\| container.flags & NodeFlags.ExportContext))) {`
	`358`	`+ if (node.kind === SyntaxKind.ExportSpecifier \|\| (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) {`
`359`	`359`	`return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);`
`360`	`360`	`}`
`361`	`361`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ declare global {`
`13`	`13`	`}`
`14`	`14`	`class Cls {x}`
`15`	`15`	`let [a, b]: number[];`
`16`		`- import X = M.M1.x;`
	`16`	`+ export import X = M.M1.x;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`//// [main.ts]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ declare global {`
`12`	`12`	`}`
`13`	`13`	`class Cls {x}`
`14`	`14`	`let [a, b]: number[];`
`15`		`- import X = M.M1.x;`
	`15`	`+ export import X = M.M1.x;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// @filename: main.ts`