Fix(54375) : Removing extra new lines from move to file

src/services/refactors/moveToFile.ts

@@ -247,10 +247,10 @@ function getNewStatementsAndRemoveFromOldFile(
             moveStatementsToTargetFile(changes, program, body, targetFile, toMove);
         }
         else {
-            changes.insertNodesAtEndOfFile(targetFile, body, /*blankLineBetween*/ false);
+            changes.insertNodesAtEndOfFile(targetFile, body, /*blankLineSuffix*/ false, !imports || usage.oldImportsNeededByTargetFile.size === 0 ? true : false);
         }
         if (imports.length > 0) {
-            insertImports(changes, targetFile, imports, /*blankLineBetween*/ true, preferences);
+            insertImports(changes, targetFile, imports, usage.oldImportsNeededByTargetFile.size === 0 ? true : false, preferences);
         }
     }
     if (importAdder) {
@@ -1194,7 +1194,9 @@ function moveStatementsToTargetFile(changes: textChanges.ChangeTracker, program:
         changes.insertNodesBefore(targetFile, lastReExport, statements, /*blankLineBetween*/ true);
     }
     else {
-        changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], statements);
+        (isImportDeclaration(targetFile.statements[targetFile.statements.length - 1])) ?
+            changes.insertNodesAtEndOfFile(targetFile, statements, /*blankLineSuffix*/ false, /*blankLinePrefix*/ true) :
+            changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], statements);
     }
 }
 

src/services/textChanges.ts

@@ -620,7 +620,8 @@ export class ChangeTracker {
     private insertAtTopOfFile(sourceFile: SourceFile, insert: Statement | readonly Statement[], blankLineBetween: boolean): void {
         const pos = getInsertionPositionAtSourceFileTop(sourceFile);
         const options = {
-            prefix: pos === 0 ? undefined : this.newLineCharacter,
+            // While inserting import statements in a blank existing file, add a newline as a prefix only if the file is blank, or the import is added as the first statement without using importAdder.
+            prefix: pos === 0 || pos === sourceFile.end && blankLineBetween ? undefined : this.newLineCharacter,
             suffix: (isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
         };
         if (isArray(insert)) {
@@ -634,18 +635,20 @@ export class ChangeTracker {
     public insertNodesAtEndOfFile(
         sourceFile: SourceFile,
         newNodes: readonly Statement[],
-        blankLineBetween: boolean): void {
-        this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+        blankLineSuffix: boolean,
+        blankLinePrefix: boolean): void {
+        this.insertAtEndOfFile(sourceFile, newNodes, blankLineSuffix, blankLinePrefix);
     }
 
     private insertAtEndOfFile(
         sourceFile: SourceFile,
         insert: readonly Statement[],
-        blankLineBetween: boolean): void {
+        blankLineSuffix: boolean,
+        blankLinePrefix: boolean): void {
         const pos = sourceFile.end + 1;
         const options = {
-            prefix: this.newLineCharacter,
-            suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : ""),
+            prefix: blankLinePrefix ? this.newLineCharacter : undefined,
+            suffix: this.newLineCharacter + (blankLineSuffix ? this.newLineCharacter : ""),
         };
         this.insertNodesAt(sourceFile, pos, insert, options);
     }

tests/cases/fourslash/moveToFile_blankExistingFile.ts

@@ -20,11 +20,8 @@ verify.moveToFile({
         "/bar.ts":
 `//
 import { p } from './a';
-
-
 import { b } from './other';
 
-
 const y: Date = p + b;
 `,
     },

tests/cases/fourslash/moveToFile_consistentNewLines.ts

@@ -0,0 +1,33 @@
+
+/// <reference path='fourslash.ts' />
+
+// @Filename: /bar.ts
+////export const tt = 2;
+
+// @Filename: /a.ts
+////import { b } from './other';
+////
+////const a = 1;
+////[|const c = a + b + 2;|]
+
+// @Filename: /other.ts
+////export const b = 1;
+
+
+verify.moveToFile({
+    newFileContents: {
+        "/a.ts":
+`
+export const a = 1;
+`,
+
+        "/bar.ts":
+`import { a } from './a';
+import { b } from './other';
+
+export const tt = 2;
+const c = a + b + 2;
+`,
+    },
+    interactiveRefactorArguments: { targetFile: "/bar.ts" },
+});

tests/cases/fourslash/moveToFile_consistentNewLines2.ts

@@ -0,0 +1,35 @@
+
+/// <reference path='fourslash.ts' />
+
+// @Filename: /bar.ts
+////import { d } from './other2';
+
+// @Filename: /a.ts
+////import { b } from './other';
+////
+////const a = 1;
+////[|const c = a + b + 6;|]
+
+// @Filename: /other.ts
+////export const b = 1;
+
+// @Filename: /other2.ts
+////export const d = 1;
+
+
+verify.moveToFile({
+    newFileContents: {
+        "/a.ts":
+`
+export const a = 1;
+`,
+
+        "/bar.ts":
+`import { a } from './a';
+import { b } from './other';
+import { d } from './other2';
+const c = a + b + 6;
+`,
+    },
+    interactiveRefactorArguments: { targetFile: "/bar.ts" },
+});

tests/cases/fourslash/moveToFile_consistentQuoteStyle.ts

@@ -21,16 +21,11 @@ verify.moveToFile({
 
         "/bar.ts":
 `import { a } from './a';
-
 import { b } from './other';
 
 export const tt = 2;
 const c = a + b;
 `,
     },
     interactiveRefactorArguments: { targetFile: "/bar.ts" },
-
-    preferences: {
-        quotePreference: "single",
-    }
 });

tests/cases/fourslash/moveToFile_differentDirectories2.ts

@@ -24,10 +24,8 @@ y;`,
 
         "/src/dir2/bar.ts":
 `import { a } from '../dir1/a';
-
 import { b } from '../dir1/other';
 
-
 export const y = b + a;
 `,
     },

tests/cases/fourslash/moveToFile_unresolvedImport.ts

@@ -14,7 +14,6 @@ verify.moveToFile({
 
         "/bar.ts":
 `import { a } from "doesnt-exist";
-
 const a = 1;
 a();
 `,