Skip to content

fix: do not match MySymbol.import("mod") #23358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/harness/unittests/services/preProcessFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,32 @@ describe("PreProcessFile:", () => {
});
}),

it("Do not return reference path of non-imports", () => {
test("Quill.import('delta');",
/*readImportFile*/ true,
/*detectJavaScriptImports*/ false,
{
referencedFiles: <ts.FileReference[]>[],
importedFiles: <ts.FileReference[]>[],
typeReferenceDirectives: [],
ambientExternalModules: undefined,
isLibFile: false
});
}),

it("Do not return reference path of nested non-imports", () => {
test("a.b.import('c');",
/*readImportFile*/ true,
/*detectJavaScriptImports*/ false,
{
referencedFiles: <ts.FileReference[]>[],
importedFiles: <ts.FileReference[]>[],
typeReferenceDirectives: [],
ambientExternalModules: undefined,
isLibFile: false
});
}),

it("Correctly return imported files", () => {
test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require (\"r5.ts\");",
/*readImportFile*/ true,
Expand Down
18 changes: 14 additions & 4 deletions src/services/preProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@ namespace ts {
};
const importedFiles: FileReference[] = [];
let ambientExternalModules: { ref: FileReference, depth: number }[];
let lastToken: SyntaxKind;
let currentToken: SyntaxKind;
let braceNesting = 0;
// 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();
if (token === SyntaxKind.OpenBraceToken) {
lastToken = currentToken;
currentToken = scanner.scan();
if (currentToken === SyntaxKind.OpenBraceToken) {
braceNesting++;
}
else if (token === SyntaxKind.CloseBraceToken) {
else if (currentToken === SyntaxKind.CloseBraceToken) {
braceNesting--;
}
return token;
return currentToken;
}

function getFileReference() {
Expand Down Expand Up @@ -77,6 +80,9 @@ namespace ts {
* Returns true if at least one token was consumed from the stream
*/
function tryConsumeImport(): boolean {
if (lastToken === SyntaxKind.DotToken) {
return false;
}
let token = scanner.getToken();
if (token === SyntaxKind.ImportKeyword) {
token = nextToken();
Expand Down Expand Up @@ -293,6 +299,10 @@ namespace ts {
// export import i = require("mod")
// (for JavaScript files) require("mod")

// Do not look for:
// AnySymbol.import("mod")
// AnySymbol.nested.import("mod")

while (true) {
if (scanner.getToken() === SyntaxKind.EndOfFileToken) {
break;
Expand Down