Insert a line break before a function at EOF if needed

This is a pre-existing issue that became more obvious after refining
trivia handling.

src/harness/unittests/tsserverProjectSystem.ts

@@ -4526,7 +4526,7 @@ namespace ts.projectSystem {
                             {
                                 start: { line: 3, offset: 2 },
                                 end: { line: 3, offset: 2 },
-                                newText: "\nfunction newFunction() {\n  1;\n}\n",
+                                newText: "\n\nfunction newFunction() {\n  1;\n}\n",
                             },
                         ]
                     }

src/services/refactors/extractSymbol.ts

@@ -785,7 +785,10 @@ namespace ts.refactor.extractSymbol {
             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newFunction, { suffix: context.newLineCharacter + context.newLineCharacter });
         }
         else {
-            changeTracker.insertNodeBefore(context.file, scope.getLastToken(), newFunction, { prefix: context.newLineCharacter, suffix: context.newLineCharacter });
+            changeTracker.insertNodeBefore(context.file, scope.getLastToken(), newFunction, {
+                prefix: isLineBreak(file.text.charCodeAt(scope.getLastToken().pos)) ? context.newLineCharacter : context.newLineCharacter + context.newLineCharacter,
+                suffix: context.newLineCharacter
+            });
         }
 
         const newNodes: Node[] = [];

tests/baselines/reference/extractFunction/extractFunction1.ts

@@ -89,6 +89,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number, foo: () => void) {
     let y = 5;
     let z = x;

tests/baselines/reference/extractFunction/extractFunction10.ts

@@ -49,6 +49,7 @@ namespace A {
         }
     }
 }
+
 function newFunction() {
     let a1: A.I = { x: 1 };
     return a1.x + 10;

tests/baselines/reference/extractFunction/extractFunction11.ts

@@ -61,6 +61,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(y: number, z: number) {
     let a1 = { x: 1 };
     y = 10;

tests/baselines/reference/extractFunction/extractFunction13.ts

@@ -66,6 +66,7 @@
         }
     }
 }
+
 function newFunction<U1a, T1a, U2a, T2a, U3a>(t1a: T1a, t2a: T2a, u1a: U1a, u2a: U2a, u3a: U3a) {
     t1a.toString();
     t2a.toString();

tests/baselines/reference/extractFunction/extractFunction14.ts

@@ -33,6 +33,7 @@ function F<T>(t1: T) {
         /*RENAME*/newFunction<T, T>(t1, t2);
     }
 }
+
 function newFunction<T, T>(t1: T, t2: T) {
     t1.toString();
     t2.toString();

tests/baselines/reference/extractFunction/extractFunction15.ts

@@ -30,6 +30,7 @@ function F<T>(t1: T) {
         /*RENAME*/newFunction<T, U>(t2);
     }
 }
+
 function newFunction<T, U extends T[]>(t2: U) {
     t2.toString();
 }

tests/baselines/reference/extractFunction/extractFunction16.ts

@@ -14,6 +14,7 @@ function F<T>() {
 function F<T>() {
     const array: T[] = /*RENAME*/newFunction<T>();
 }
+
 function newFunction<T>(): T[] {
     return [];
 }

tests/baselines/reference/extractFunction/extractFunction17.ts

@@ -20,6 +20,7 @@ class C<T1, T2> {
         /*RENAME*/newFunction<T1>(t1);
     }
 }
+
 function newFunction<T1>(t1: T1) {
     t1.toString();
 }

tests/baselines/reference/extractFunction/extractFunction18.ts

@@ -20,6 +20,7 @@ class C {
         /*RENAME*/newFunction<T1>(t1);
     }
 }
+
 function newFunction<T1>(t1: T1) {
     t1.toString();
 }

tests/baselines/reference/extractFunction/extractFunction19.ts

@@ -14,6 +14,7 @@ function F<T, U extends T[], V extends U[]>(v: V) {
 function F<T, U extends T[], V extends U[]>(v: V) {
     /*RENAME*/newFunction<T, U, V>(v);
 }
+
 function newFunction<T, U extends T[], V extends U[]>(v: V) {
     v.toString();
 }

tests/baselines/reference/extractFunction/extractFunction2.ts

@@ -78,6 +78,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, foo: () => void) {
     let y = 5;
     let z = x;

tests/baselines/reference/extractFunction/extractFunction20.js

@@ -22,6 +22,7 @@ const _ = class {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     let a1 = { x: 1 };
     return a1.x + 10;

tests/baselines/reference/extractFunction/extractFunction20.ts

@@ -22,6 +22,7 @@ const _ = class {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     let a1 = { x: 1 };
     return a1.x + 10;

tests/baselines/reference/extractFunction/extractFunction21.js

@@ -20,6 +20,7 @@ function foo() {
     x = /*RENAME*/newFunction(x);
     return;
 }
+
 function newFunction(x) {
     x++;
     return x;

tests/baselines/reference/extractFunction/extractFunction21.ts

@@ -20,6 +20,7 @@ function foo() {
     x = /*RENAME*/newFunction(x);
     return;
 }
+
 function newFunction(x: number) {
     x++;
     return x;

tests/baselines/reference/extractFunction/extractFunction22.js

@@ -26,6 +26,7 @@ function test() {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction22.ts

@@ -26,6 +26,7 @@ function test() {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction23.ts

@@ -38,6 +38,7 @@ namespace NS {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction24.js

@@ -38,6 +38,7 @@ function Outer() {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction24.ts

@@ -38,6 +38,7 @@ function Outer() {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction26.js

@@ -26,6 +26,7 @@ class C {
     }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction26.ts

@@ -26,6 +26,7 @@ class C {
     }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction27.js

@@ -29,6 +29,7 @@ class C {
     constructor() { }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction27.ts

@@ -29,6 +29,7 @@ class C {
     constructor() { }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction28.js

@@ -29,6 +29,7 @@ class C {
     M3() { }
     constructor() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction28.ts

@@ -29,6 +29,7 @@ class C {
     M3() { }
     constructor() { }
 }
+
 function newFunction() {
     return 1;
 }

tests/baselines/reference/extractFunction/extractFunction3.ts

@@ -73,6 +73,7 @@ namespace A {
         }
     }
 }
+
 function* newFunction(z: number, foo: () => void) {
     let y = 5;
     yield z;

tests/baselines/reference/extractFunction/extractFunction30.ts

@@ -14,6 +14,7 @@ function F<T>() {
 function F<T>() {
     /*RENAME*/newFunction<T>();
 }
+
 function newFunction<T>() {
     let t: T;
 }

tests/baselines/reference/extractFunction/extractFunction31.ts

@@ -37,6 +37,7 @@ namespace N {
         f = /*RENAME*/newFunction(f);
     }
 }
+
 function newFunction(f: () => number) {
     f = function(): number {
         return N.value;

tests/baselines/reference/extractFunction/extractFunction32.ts

@@ -37,6 +37,7 @@ namespace N {
         /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     var c = class {
         M() {

tests/baselines/reference/extractFunction/extractFunction33.js

@@ -14,6 +14,7 @@ function F() {
 function F() {
     /*RENAME*/newFunction();
 }
+
 function newFunction() {
     function G() { }
 }

tests/baselines/reference/extractFunction/extractFunction33.ts

@@ -14,6 +14,7 @@ function F() {
 function F() {
     /*RENAME*/newFunction();
 }
+
 function newFunction() {
     function G() { }
 }

tests/baselines/reference/extractFunction/extractFunction4.ts

@@ -81,6 +81,7 @@ namespace A {
         }
     }
 }
+
 async function newFunction(z: number, z1: any, foo: () => void) {
     let y = 5;
     if (z) {

tests/baselines/reference/extractFunction/extractFunction5.ts

@@ -89,6 +89,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;

tests/baselines/reference/extractFunction/extractFunction6.ts

@@ -93,6 +93,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;

tests/baselines/reference/extractFunction/extractFunction7.ts

@@ -103,6 +103,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;

tests/baselines/reference/extractFunction/extractFunction9.ts

@@ -59,6 +59,7 @@ namespace A {
         }
     }
 }
+
 function newFunction() {
     let a1: A.I = { x: 1 };
     return a1.x + 10;

tests/baselines/reference/extractFunction/extractFunction_PreserveTrivia.js

@@ -12,6 +12,7 @@ var q = /*b*/ //c
 var q = /*b*/ //c
     /*d*/ /*RENAME*/newFunction() /*k*/ //l
     /*m*/; /*n*/ //o
+
 function newFunction() {
     return 1 /*e*/ //f
         /*g*/ + /*h*/ //i

tests/baselines/reference/extractFunction/extractFunction_PreserveTrivia.ts

@@ -12,6 +12,7 @@ var q = /*b*/ //c
 var q = /*b*/ //c
     /*d*/ /*RENAME*/newFunction() /*k*/ //l
     /*m*/; /*n*/ //o
+
 function newFunction() {
     return 1 /*e*/ //f
         /*g*/ + /*h*/ //i

tests/baselines/reference/extractFunction/extractFunction_RepeatedSubstitution.ts

@@ -17,6 +17,7 @@ namespace X {
     export const j = 10;
     export const y = /*RENAME*/newFunction();
 }
+
 function newFunction() {
     return X.j * X.j;
 }

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_ShorthandProperty.js

@@ -21,6 +21,7 @@ function f() {
     let x = /*RENAME*/newFunction();
     return { x };
 }
+
 function newFunction() {
     let x;
     return x;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_ShorthandProperty.ts

@@ -21,6 +21,7 @@ function f() {
     let x = /*RENAME*/newFunction();
     return { x };
 }
+
 function newFunction() {
     let x;
     return x;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_NoType.js

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a) {
     const x = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_NoType.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     const x = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_Type.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     const x: number = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_LiteralType1.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     let x: 0o10 | 10 | 0b10 = 10;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_LiteralType2.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     let x: "a" | 'b' = 'a';
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.js

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a) {
     let x = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     let x = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_Type.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     let x: number = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_TypeWithComments.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     let x: /*A*/ "a" /*B*/ | /*C*/ 'b' /*D*/ = 'a';
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.js

@@ -30,6 +30,7 @@ function f() {
     ({ x, y, a } = /*RENAME*/newFunction(a));
     a; x; y;
 }
+
 function newFunction(a) {
     const x = 1;
     let y = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.ts

@@ -30,6 +30,7 @@ function f() {
     ({ x, y, a } = /*RENAME*/newFunction(a));
     a; x; y;
 }
+
 function newFunction(a: number) {
     const x = 1;
     let y = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.js

@@ -30,6 +30,7 @@ function f() {
     ({ x, y, a } = /*RENAME*/newFunction(a));
     a; x; y;
 }
+
 function newFunction(a) {
     var x = 1;
     let y = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.ts

@@ -30,6 +30,7 @@ function f() {
     ({ x, y, a } = /*RENAME*/newFunction(a));
     a; x; y;
 }
+
 function newFunction(a: number) {
     var x = 1;
     let y = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed3.ts

@@ -30,6 +30,7 @@ function f() {
     ({ x, y, a } = /*RENAME*/newFunction(a));
     a; x; y;
 }
+
 function newFunction(a: number) {
     let x: number = 1;
     let y = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_UnionUndefined.ts

@@ -33,6 +33,7 @@ function f() {
     ({ x, y, z, a } = /*RENAME*/newFunction(a));
     a; x; y; z;
 }
+
 function newFunction(a: number) {
     let x: number | undefined = 1;
     let y: undefined | number = 2;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.js

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a) {
     var x = 1;
     a++;

tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.ts

@@ -27,6 +27,7 @@ function f() {
     ({ x, a } = /*RENAME*/newFunction(a));
     a; x;
 }
+
 function newFunction(a: number) {
     var x = 1;
     a++;

tests/cases/fourslash/extract-method-empty-namespace.ts

@@ -12,6 +12,7 @@ edit.applyRefactor({
     newContent: `function f() {
     /*RENAME*/newFunction();
 }
+
 function newFunction() {
     namespace N { }
 }

tests/cases/fourslash/extract-method-formatting.ts

@@ -13,6 +13,7 @@ edit.applyRefactor({
     newContent: `function f(x: number): number {
     return /*RENAME*/newFunction(x);
 }
+
 function newFunction(x: number) {
     switch (x) {
         case 0:

tests/cases/fourslash/extract-method-uniqueName.ts

@@ -13,6 +13,7 @@ edit.applyRefactor({
     newContent:
 `// newFunction
 /*RENAME*/newFunction_1();
+
 function newFunction_1() {
     1 + 1;
 }

tests/cases/fourslash/extract-method10.ts

@@ -11,6 +11,7 @@ edit.applyRefactor({
     newContent:
 `export {}; // Make this a module
 (x => x)(/*RENAME*/newFunction())(1);
+
 function newFunction(): (x: any) => any {
     return x => x;
 }

tests/cases/fourslash/extract-method14.ts

@@ -22,6 +22,7 @@ edit.applyRefactor({
     ({ __return, i } = /*RENAME*/newFunction(i));
     return __return;
 }
+
 function newFunction(i) {
     return { __return: i++, i };
 }

tests/cases/fourslash/extract-method15.ts

@@ -18,6 +18,7 @@ edit.applyRefactor({
     var i = 10;
     i = /*RENAME*/newFunction(i);
 }
+
 function newFunction(i: number) {
     i++;
     return i;

tests/cases/fourslash/extract-method18.ts

@@ -18,6 +18,7 @@ edit.applyRefactor({
     const x = { m: 1 };
     /*RENAME*/newFunction(x);
 }
+
 function newFunction(x: { m: number; }) {
     x.m = 3;
 }

tests/cases/fourslash/extract-method2.ts

@@ -24,6 +24,7 @@ edit.applyRefactor({
         }
     }
 }
+
 function newFunction(m: number, j: string, k: { x: string; }) {
     return m + j + k;
 }

tests/cases/fourslash/extract-method24.ts

@@ -17,6 +17,7 @@ edit.applyRefactor({
     let x = 0;
     console.log(/*RENAME*/newFunction(a, x));
 }
+
 function newFunction(a: number[], x: number): any {
     return a[x];
 }

tests/cases/fourslash/extract-method7.ts

@@ -14,6 +14,7 @@ edit.applyRefactor({
     newContent:
 `function fn(x = /*RENAME*/newFunction()) {
 }
+
 function newFunction() {
     return 3;
 }