fix(51072): skip imports in template strings

microsoft · Oct 6, 2022 · b8f479c · b8f479c
1 parent c18791c
commit b8f479c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/services/preProcess.ts b/src/services/preProcess.ts
@@ -346,8 +346,8 @@ namespace ts {
                 }
 
                 if (scanner.getToken() === SyntaxKind.TemplateHead) {
-                    const stack = [scanner.getToken()];
-                    let token = scanner.scan();
+                    let token = scanner.getToken();
+                    const stack = [token];
                     loop: while (length(stack)) {
                         switch (token) {
                             case SyntaxKind.EndOfFileToken:

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\";",