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

Merge pull request #4730 from Microsoft/fix4727

Browse source 
prerocess `export import` declarations correctly
This commit is contained in:
Mohamed Hegazy 2015-09-10 14:19:30 -07:00
parent 2816fdefd0 7e1739604a
commit 828c37e72b
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/services/services.ts
View file

@ -2152,6 +2152,7 @@ namespace ts {
//
// export * from "mod"
// export {a as b} from "mod"
// export import i = require("mod")
while (token !== SyntaxKind.EndOfFileToken) {
if (token === SyntaxKind.DeclareKeyword) {
@ -2276,6 +2277,25 @@ namespace ts {
}
}
}
else if (token === SyntaxKind.ImportKeyword) {
token = scanner.scan();
if (token === SyntaxKind.Identifier || isKeyword(token)) {
token = scanner.scan();
if (token === SyntaxKind.EqualsToken) {
token = scanner.scan();
if (token === SyntaxKind.RequireKeyword) {
token = scanner.scan();
if (token === SyntaxKind.OpenParenToken) {
token = scanner.scan();
if (token === SyntaxKind.StringLiteral) {
// export import i = require("mod");
recordModuleName();
}
}
}
}
}
}
}
token = scanner.scan();
}

14
tests/cases/unittests/services/preProcessFile.ts
View file

@ -173,6 +173,20 @@ describe('PreProcessFile:', function () {
isLibFile: false
})
});
it("Correctly handeles export import declarations", function () {
test("export import a = require(\"m1\");",
true,
{
referencedFiles: [],
importedFiles: [
{ fileName: "m1", pos: 26, end: 28 }
],
ambientExternalModules: undefined,
isLibFile: false
})
});
});
});