fix quote behavior

iisaduan · Oct 12, 2024 · 0f55561 · 0f55561
1 parent f918071
commit 0f55561
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -494,8 +494,8 @@ function createImportAdderWorker(sourceFile: SourceFile | FutureSourceFile, prog
 
     function writeFixes(changeTracker: textChanges.ChangeTracker, oldFileQuotePreference?: QuotePreference) {
         let quotePreference: QuotePreference;
-        if (isFullSourceFile(sourceFile) && sourceFile.imports.length === 0 && oldFileQuotePreference !== undefined) {
-            // If the target file has no imports, we must use the same quote preference as the file we are importing from.
+        if (sourceFile.imports !== undefined && sourceFile.imports.length === 0 && oldFileQuotePreference !== undefined) {
+            // If the target file (including future files) has no imports, we must use the same quote preference as the file we are importing from.
             quotePreference = oldFileQuotePreference;
         }
         else {

diff --git a/tests/cases/fourslash/moveToNewFile_inferQuoteStyle2.ts b/tests/cases/fourslash/moveToNewFile_inferQuoteStyle2.ts
@@ -12,8 +12,8 @@
 
 verify.moveToNewFile({
     newFileContents: {
-        "/newFile.ts":
-`import { x } from "./a";
+        "/newFile.ts": // module specifier should have the same quotes as import in the original file 
+`import { x } from './a';
 
 x;
 `,

diff --git a/...ourslash/moveToNewFile_moveNamedImport.ts → ...urslash/moveToNewFile_moveNamedImport1.ts b/...ourslash/moveToNewFile_moveNamedImport.ts → ...urslash/moveToNewFile_moveNamedImport1.ts
diff --git a/tests/cases/fourslash/moveToNewFile_moveNamedImport2.ts b/tests/cases/fourslash/moveToNewFile_moveNamedImport2.ts
@@ -14,7 +14,7 @@ verify.moveToNewFile({
 `export const a = 0;`,
 
 "/x.ts":
-`import { foo as oFoo } from "./other";
+`import { foo as oFoo } from './other';
 
 export const x = oFoo();
 `