microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-07-02 06:35:09 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix up

Browse Source
This commit is contained in:
Joscha Feth
2018-04-15 03:30:47 +10:00
parent f4fa2eb28e
commit c64c1c9395
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/preProcess.ts
View File

@@ -13,14 +13,12 @@ namespace ts {
const importedFiles: FileReference[] = [];
let ambientExternalModules: { ref: FileReference, depth: number }[];
let braceNesting = 0;
let lastToken: SyntaxKind;
// assume that text represent an external module if it contains at least one top level import/export
// ambient modules that are found inside external modules are interpreted as module augmentations
let externalModule = false;
function nextToken() {
const token = scanner.scan();
lastToken = token;
if (token === SyntaxKind.OpenBraceToken) {
braceNesting++;
}
@@ -79,9 +77,8 @@ namespace ts {
* Returns true if at least one token was consumed from the stream
*/
function tryConsumeImport(): boolean {
const lastTokenWasDot = lastToken === SyntaxKind.DotToken;
let token = scanner.getToken();
if (token === SyntaxKind.ImportKeyword && !lastTokenWasDot) {
if (token === SyntaxKind.ImportKeyword) {
token = nextToken();
if (token === SyntaxKind.OpenParenToken) {
token = nextToken();
@@ -300,9 +297,14 @@ namespace ts {
// AnySymbol.import("mod")
while (true) {
if (scanner.getToken() === SyntaxKind.EndOfFileToken) {
const token = scanner.getToken();
if (token === SyntaxKind.EndOfFileToken) {
break;
}
if (token === SyntaxKind.DotToken) {
nextToken(); // jump over anything directly following the dot
nextToken();
}
// check if at least one of alternative have moved scanner forward
if (tryConsumeDeclare() ||