fix(51072): ts.preProcessFile finds import in template string after conditional expression with template strings (#51082)

a-tarasyuk · web-flow · commit d0bfd8caed52 · 2022-10-07T10:33:20.000-07:00
diff --git a/src/services/preProcess.ts b/src/services/preProcess.ts
@@ -347,8 +347,8 @@ namespace ts {
 
                 if (scanner.getToken() === SyntaxKind.TemplateHead) {
                     const stack = [scanner.getToken()];
-                    let token = scanner.scan();
                     loop: while (length(stack)) {
+                        const token = scanner.scan();
                         switch (token) {
                             case SyntaxKind.EndOfFileToken:
                                 break loop;
@@ -376,7 +376,6 @@ namespace ts {
                                 }
                                 break;
                         }
-                        token = scanner.scan();
                     }
                     nextToken();
                 }
diff --git a/src/testRunner/unittests/services/preProcessFile.ts b/src/testRunner/unittests/services/preProcessFile.ts
@@ -205,6 +205,22 @@ describe("unittests:: services:: PreProcessFile:", () => {
             /* eslint-enable no-template-curly-in-string */
         });
 
+        it("Ignores imports in template strings", () => {
+            /* eslint-disable no-template-curly-in-string */
+            test("a ? `&${a}` : `#${b}`;\n\n `import(\"${moduleSpecifier}\").${id}`;",
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ true,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                libReferenceDirectives: [],
+                importedFiles: [],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            });
+            /* eslint-enable no-template-curly-in-string */
+        });
+
         it("Correctly returns imports after a template expression", () => {
             /* eslint-disable no-template-curly-in-string */
             test("`${foo}`; import \"./foo\";",

Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,8 @@ namespace ts {`
`347`	`347`
`348`	`348`	`if (scanner.getToken() === SyntaxKind.TemplateHead) {`
`349`	`349`	`const stack = [scanner.getToken()];`
`350`		`- let token = scanner.scan();`
`351`	`350`	`loop: while (length(stack)) {`
	`351`	`+ const token = scanner.scan();`
`352`	`352`	`switch (token) {`
`353`	`353`	`case SyntaxKind.EndOfFileToken:`
`354`	`354`	`break loop;`
`@@ -376,7 +376,6 @@ namespace ts {`
`376`	`376`	`}`
`377`	`377`	`break;`
`378`	`378`	`}`
`379`		`- token = scanner.scan();`
`380`	`379`	`}`
`381`	`380`	`nextToken();`
`382`	`381`	`}`