microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 15:45:27 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'release-1.6'

Browse Source 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/program.ts
	tests/baselines/reference/emptyObjectBindingPatternParameter04.symbols
	tests/baselines/reference/emptyObjectBindingPatternParameter04.types
	tests/baselines/reference/nodeResolution5.errors.txt
	tests/baselines/reference/nodeResolution7.errors.txt
This commit is contained in:
Daniel Rosenwasser
2015-09-15 13:36:08 -07:00
parent 89718cf5a5 a44d8e76c6
commit 38b605ea7d
87 changed files with 2280 additions and 814 deletions
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();
}