Merge pull request #19141 from amcasey/MissingNewlineAtEOF

amcasey · web-flow · commit d940cdadfe52 · 2017-10-12T15:28:37.000-07:00
Insert a line break before a function at EOF if needed
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/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",
                             },
                         ]
                     }
diff --git a/src/services/refactors/extractSymbol.ts b/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[] = [];
diff --git a/tests/baselines/reference/extractFunction/extractFunction1.ts b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction10.ts b/tests/baselines/reference/extractFunction/extractFunction10.ts
@@ -49,6 +49,7 @@ namespace A {
         }
     }
 }
+
 function newFunction() {
     let a1: A.I = { x: 1 };
     return a1.x + 10;
diff --git a/tests/baselines/reference/extractFunction/extractFunction11.ts b/tests/baselines/reference/extractFunction/extractFunction11.ts
@@ -61,6 +61,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(y: number, z: number) {
     let a1 = { x: 1 };
     y = 10;
diff --git a/tests/baselines/reference/extractFunction/extractFunction13.ts b/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();
diff --git a/tests/baselines/reference/extractFunction/extractFunction14.ts b/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();
diff --git a/tests/baselines/reference/extractFunction/extractFunction15.ts b/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();
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction16.ts b/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 [];
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction17.ts b/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();
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction18.ts b/tests/baselines/reference/extractFunction/extractFunction18.ts
@@ -20,6 +20,7 @@ class C {
         /*RENAME*/newFunction<T1>(t1);
     }
 }
+
 function newFunction<T1>(t1: T1) {
     t1.toString();
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction19.ts b/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();
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction2.ts b/tests/baselines/reference/extractFunction/extractFunction2.ts
@@ -78,6 +78,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, foo: () => void) {
     let y = 5;
     let z = x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction20.js b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction20.ts b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction21.js b/tests/baselines/reference/extractFunction/extractFunction21.js
@@ -20,6 +20,7 @@ function foo() {
     x = /*RENAME*/newFunction(x);
     return;
 }
+
 function newFunction(x) {
     x++;
     return x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction21.ts b/tests/baselines/reference/extractFunction/extractFunction21.ts
@@ -20,6 +20,7 @@ function foo() {
     x = /*RENAME*/newFunction(x);
     return;
 }
+
 function newFunction(x: number) {
     x++;
     return x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction22.js b/tests/baselines/reference/extractFunction/extractFunction22.js
@@ -26,6 +26,7 @@ function test() {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction22.ts b/tests/baselines/reference/extractFunction/extractFunction22.ts
@@ -26,6 +26,7 @@ function test() {
         return /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction23.ts b/tests/baselines/reference/extractFunction/extractFunction23.ts
@@ -38,6 +38,7 @@ namespace NS {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction24.js b/tests/baselines/reference/extractFunction/extractFunction24.js
@@ -38,6 +38,7 @@ function Outer() {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction24.ts b/tests/baselines/reference/extractFunction/extractFunction24.ts
@@ -38,6 +38,7 @@ function Outer() {
     }
     function M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction26.js b/tests/baselines/reference/extractFunction/extractFunction26.js
@@ -26,6 +26,7 @@ class C {
     }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction26.ts b/tests/baselines/reference/extractFunction/extractFunction26.ts
@@ -26,6 +26,7 @@ class C {
     }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction27.js b/tests/baselines/reference/extractFunction/extractFunction27.js
@@ -29,6 +29,7 @@ class C {
     constructor() { }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction27.ts b/tests/baselines/reference/extractFunction/extractFunction27.ts
@@ -29,6 +29,7 @@ class C {
     constructor() { }
     M3() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction28.js b/tests/baselines/reference/extractFunction/extractFunction28.js
@@ -29,6 +29,7 @@ class C {
     M3() { }
     constructor() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction28.ts b/tests/baselines/reference/extractFunction/extractFunction28.ts
@@ -29,6 +29,7 @@ class C {
     M3() { }
     constructor() { }
 }
+
 function newFunction() {
     return 1;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction3.ts b/tests/baselines/reference/extractFunction/extractFunction3.ts
@@ -73,6 +73,7 @@ namespace A {
         }
     }
 }
+
 function* newFunction(z: number, foo: () => void) {
     let y = 5;
     yield z;
diff --git a/tests/baselines/reference/extractFunction/extractFunction30.ts b/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;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction31.ts b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction32.ts b/tests/baselines/reference/extractFunction/extractFunction32.ts
@@ -37,6 +37,7 @@ namespace N {
         /*RENAME*/newFunction();
     }
 }
+
 function newFunction() {
     var c = class {
         M() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction33.js b/tests/baselines/reference/extractFunction/extractFunction33.js
@@ -14,6 +14,7 @@ function F() {
 function F() {
     /*RENAME*/newFunction();
 }
+
 function newFunction() {
     function G() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction33.ts b/tests/baselines/reference/extractFunction/extractFunction33.ts
@@ -14,6 +14,7 @@ function F() {
 function F() {
     /*RENAME*/newFunction();
 }
+
 function newFunction() {
     function G() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction4.ts b/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) {
diff --git a/tests/baselines/reference/extractFunction/extractFunction5.ts b/tests/baselines/reference/extractFunction/extractFunction5.ts
@@ -89,6 +89,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction6.ts b/tests/baselines/reference/extractFunction/extractFunction6.ts
@@ -93,6 +93,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction7.ts b/tests/baselines/reference/extractFunction/extractFunction7.ts
@@ -103,6 +103,7 @@ namespace A {
         }
     }
 }
+
 function newFunction(x: number, a: number) {
     let y = 5;
     let z = x;
diff --git a/tests/baselines/reference/extractFunction/extractFunction9.ts b/tests/baselines/reference/extractFunction/extractFunction9.ts
@@ -59,6 +59,7 @@ namespace A {
         }
     }
 }
+
 function newFunction() {
     let a1: A.I = { x: 1 };
     return a1.x + 10;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_PreserveTrivia.js b/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
diff --git a/tests/baselines/reference/extractFunction/extractFunction_PreserveTrivia.ts b/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
diff --git a/tests/baselines/reference/extractFunction/extractFunction_RepeatedSubstitution.ts b/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;
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_ShorthandProperty.js b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_ShorthandProperty.ts b/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;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_NoType.js b/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++;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_NoType.ts b/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++;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Const_Type.ts b/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++;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_LiteralType1.ts b/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++;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_LiteralType2.ts b/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++;
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.js b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.js
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_NoType.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_Type.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_Type.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_TypeWithComments.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Let_TypeWithComments.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.js b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.js
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed1.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.js b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.js
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed2.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed3.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Mixed3.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_UnionUndefined.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_UnionUndefined.ts
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.js b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.js
diff --git a/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.ts b/tests/baselines/reference/extractFunction/extractFunction_VariableDeclaration_Writes_Var.ts
diff --git a/tests/cases/fourslash/extract-method-empty-namespace.ts b/tests/cases/fourslash/extract-method-empty-namespace.ts
diff --git a/tests/cases/fourslash/extract-method-formatting.ts b/tests/cases/fourslash/extract-method-formatting.ts
diff --git a/tests/cases/fourslash/extract-method-uniqueName.ts b/tests/cases/fourslash/extract-method-uniqueName.ts
diff --git a/tests/cases/fourslash/extract-method10.ts b/tests/cases/fourslash/extract-method10.ts
diff --git a/tests/cases/fourslash/extract-method14.ts b/tests/cases/fourslash/extract-method14.ts
diff --git a/tests/cases/fourslash/extract-method15.ts b/tests/cases/fourslash/extract-method15.ts
diff --git a/tests/cases/fourslash/extract-method18.ts b/tests/cases/fourslash/extract-method18.ts
diff --git a/tests/cases/fourslash/extract-method2.ts b/tests/cases/fourslash/extract-method2.ts
diff --git a/tests/cases/fourslash/extract-method24.ts b/tests/cases/fourslash/extract-method24.ts
diff --git a/tests/cases/fourslash/extract-method7.ts b/tests/cases/fourslash/extract-method7.ts

Original file line number	Diff line number	Diff line change
`@@ -4526,7 +4526,7 @@ namespace ts.projectSystem {`
`4526`	`4526`	`{`
`4527`	`4527`	`start: { line: 3, offset: 2 },`
`4528`	`4528`	`end: { line: 3, offset: 2 },`
`4529`		`- newText: "\nfunction newFunction() {\n 1;\n}\n",`
	`4529`	`+ newText: "\n\nfunction newFunction() {\n 1;\n}\n",`
`4530`	`4530`	`},`
`4531`	`4531`	`]`
`4532`	`4532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,10 @@ namespace ts.refactor.extractSymbol {`
`785`	`785`	`changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newFunction, { suffix: context.newLineCharacter + context.newLineCharacter });`
`786`	`786`	`}`
`787`	`787`	`else {`
`788`		`- changeTracker.insertNodeBefore(context.file, scope.getLastToken(), newFunction, { prefix: context.newLineCharacter, suffix: context.newLineCharacter });`
	`788`	`+ changeTracker.insertNodeBefore(context.file, scope.getLastToken(), newFunction, {`
	`789`	`+ prefix: isLineBreak(file.text.charCodeAt(scope.getLastToken().pos)) ? context.newLineCharacter : context.newLineCharacter + context.newLineCharacter,`
	`790`	`+ suffix: context.newLineCharacter`
	`791`	`+ });`
`789`	`792`	`}`
`790`	`793`
`791`	`794`	`const newNodes: Node[] = [];`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ namespace A {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
	`92`	`+`
`92`	`93`	`function newFunction(x: number, a: number, foo: () => void) {`
`93`	`94`	`let y = 5;`
`94`	`95`	`let z = x;`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ namespace A {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`
	`52`	`+`
`52`	`53`	`function newFunction() {`
`53`	`54`	`let a1: A.I = { x: 1 };`
`54`	`55`	`return a1.x + 10;`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ namespace A {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
	`64`	`+`
`64`	`65`	`function newFunction(y: number, z: number) {`
`65`	`66`	`let a1 = { x: 1 };`
`66`	`67`	`y = 10;`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
`69`	`70`	`function newFunction<U1a, T1a, U2a, T2a, U3a>(t1a: T1a, t2a: T2a, u1a: U1a, u2a: U2a, u3a: U3a) {`
`70`	`71`	`t1a.toString();`
`71`	`72`	`t2a.toString();`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ function F<T>(t1: T) {`
`33`	`33`	`/RENAME/newFunction<T, T>(t1, t2);`
`34`	`34`	`}`
`35`	`35`	`}`
	`36`	`+`
`36`	`37`	`function newFunction<T, T>(t1: T, t2: T) {`
`37`	`38`	`t1.toString();`
`38`	`39`	`t2.toString();`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ function F<T>(t1: T) {`
`30`	`30`	`/RENAME/newFunction<T, U>(t2);`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+`
`33`	`34`	`function newFunction<T, U extends T[]>(t2: U) {`
`34`	`35`	`t2.toString();`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ function F<T>() {`
`14`	`14`	`function F<T>() {`
`15`	`15`	`const array: T[] = /RENAME/newFunction<T>();`
`16`	`16`	`}`
	`17`	`+`
`17`	`18`	`function newFunction<T>(): T[] {`
`18`	`19`	`return [];`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class C<T1, T2> {`
`20`	`20`	`/RENAME/newFunction<T1>(t1);`
`21`	`21`	`}`
`22`	`22`	`}`
	`23`	`+`
`23`	`24`	`function newFunction<T1>(t1: T1) {`
`24`	`25`	`t1.toString();`
`25`	`26`	`}`