maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

revert back fix for implicit exports of imports

Browse source
This commit is contained in:
Vladimir Matveev 2016-04-15 11:31:26 -07:00
parent 0f323ea74a
commit 6f3f690a8d
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/binder.ts
View file

@ -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 {

2
tests/baselines/reference/newNamesInGlobalAugmentations1.js
View file

@ -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]

2
tests/baselines/reference/newNamesInGlobalAugmentations1.symbols
View file

@ -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))

2
tests/baselines/reference/newNamesInGlobalAugmentations1.types
View file

@ -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

2
tests/cases/compiler/newNamesInGlobalAugmentations1.ts
View file

@ -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