Don't insert a blank line after extracted locals at the start of the file

amcasey · amcasey · commit adc3234e460e · 2017-12-15T15:49:27.000-08:00
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -279,7 +279,7 @@ namespace ts.codefix {
                 changeTracker.insertNodeAfter(sourceFile, lastImportDeclaration, importDecl);
             }
             else {
-                changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl);
+                changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl, /*blankLineBetween*/ true);
             }
         });
 
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
@@ -1077,7 +1077,7 @@ namespace ts.refactor.extractSymbol {
                 // Declare
                 const nodeToInsertBefore = getNodeToInsertConstantBefore(node, scope);
                 if (nodeToInsertBefore.pos === 0) {
-                    changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement);
+                    changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement, /*blankLineBetween*/ false);
                 }
                 else {
                     changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -332,11 +332,11 @@ namespace ts.textChanges {
             return this;
         }
 
-        public insertNodeAtTopOfFile(sourceFile: SourceFile, newNode: Statement): void {
+        public insertNodeAtTopOfFile(sourceFile: SourceFile, newNode: Statement, blankLineBetween: boolean): void {
             const pos = getInsertionPositionAtSourceFileTop(sourceFile);
             this.insertNodeAt(sourceFile, pos, newNode, {
                 prefix: pos === 0 ? undefined : this.newLineCharacter,
-                suffix: isLineBreak(sourceFile.text.charCodeAt(pos)) ? this.newLineCharacter : this.newLineCharacter + this.newLineCharacter,
+                suffix: (isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
             });
         }
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
@@ -11,7 +11,6 @@ const f = () => {
 };
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 const f = () => {
     return /*RENAME*/newLocal;
 };
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
@@ -11,7 +11,6 @@ const f = () => {
 };
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 const f = () => {
     return /*RENAME*/newLocal;
 };
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js
@@ -2,5 +2,4 @@
 const f = () => /*[#|*/2 + 1/*|]*/;
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 const f = () => /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts
@@ -2,5 +2,4 @@
 const f = () => /*[#|*/2 + 1/*|]*/;
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 const f = () => /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Class.js b/tests/baselines/reference/extractConstant/extractConstant_Class.js
@@ -4,7 +4,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Class.ts b/tests/baselines/reference/extractConstant/extractConstant_Class.ts
@@ -10,7 +10,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
@@ -21,7 +21,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     a = 1;
     b = 2;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
@@ -33,7 +33,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     a = 1;
     b = 2;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
@@ -21,7 +21,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     a = 1;
     M1() { }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
@@ -33,7 +33,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     a = 1;
     M1() { }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
@@ -21,7 +21,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     M1() { }
     a = 1;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
@@ -33,7 +33,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     M1() { }
     a = 1;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.js b/tests/baselines/reference/extractConstant/extractConstant_Function.js
@@ -9,7 +9,6 @@ function F() {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 function F() {
     let x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.ts b/tests/baselines/reference/extractConstant/extractConstant_Function.ts
@@ -9,7 +9,6 @@ function F() {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 function F() {
     let x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.js b/tests/baselines/reference/extractConstant/extractConstant_Method.js
@@ -13,7 +13,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     M() {
         let x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.ts b/tests/baselines/reference/extractConstant/extractConstant_Method.ts
@@ -21,7 +21,6 @@ class C {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 class C {
     M() {
         let x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts b/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
@@ -9,7 +9,6 @@ namespace N {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;
-
 namespace N {
     let x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js b/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 /*! Copyright */
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts b/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 /*! Copyright */
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js b/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js
@@ -10,7 +10,6 @@ const x = /*[#|*/2 + 1/*|]*/;
 /*! Copyright */
 
 const newLocal = 2 + 1;
-
 /* About x */
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts b/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts
@@ -10,7 +10,6 @@ const x = /*[#|*/2 + 1/*|]*/;
 /*! Copyright */
 
 const newLocal = 2 + 1;
-
 /* About x */
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.js b/tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.js
@@ -10,7 +10,6 @@ var q = /*b*/ //c
 const newLocal = 1 /*e*/ //f
     /*g*/ + /*h*/ //i
         /*j*/ 2;
-
 // a
 var q = /*b*/ //c
     /*d*/ /*RENAME*/newLocal /*k*/ //l
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.ts b/tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.ts
@@ -10,7 +10,6 @@ var q = /*b*/ //c
 const newLocal = 1 /*e*/ //f
     /*g*/ + /*h*/ //i
         /*j*/ 2;
-
 // a
 var q = /*b*/ //c
     /*d*/ /*RENAME*/newLocal /*k*/ //l
diff --git a/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts b/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
@@ -11,7 +11,6 @@ namespace X {
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = X.j * X.j;
-
 namespace X {
     export const j = 10;
     export const y = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
@@ -17,7 +17,6 @@ function F() {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 function F() {
     for (let j = 0; j < 10; j++) {
         const x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
@@ -17,7 +17,6 @@ function F() {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 function F() {
     for (let j = 0; j < 10; j++) {
         const x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
@@ -29,7 +29,6 @@ function F0() {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 function F0() {
     function F1() {
         function F2(x = /*RENAME*/newLocal) {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts
@@ -29,7 +29,6 @@ function F0() {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 function F0() {
     function F1() {
         function F2(x = /*RENAME*/newLocal) {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js
@@ -6,7 +6,6 @@ class C {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 class C {
     x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts
@@ -14,7 +14,6 @@ class C {
         
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
-
 class C {
     x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.js b/tests/baselines/reference/extractConstant/extractConstant_TopLevel.js
@@ -2,5 +2,4 @@
 let x = /*[#|*/1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const newLocal = 1;
-
 let x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts b/tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts
@@ -2,5 +2,4 @@
 let x = /*[#|*/1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const newLocal = 1;
-
 let x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js b/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 /// <reference path="path.js"/>
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts b/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 /// <reference path="path.js"/>
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ namespace ts.codefix {`
`279`	`279`	`changeTracker.insertNodeAfter(sourceFile, lastImportDeclaration, importDecl);`
`280`	`280`	`}`
`281`	`281`	`else {`
`282`		`- changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl);`
	`282`	`+ changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl, /blankLineBetween/ true);`
`283`	`283`	`}`
`284`	`284`	`});`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ namespace ts.refactor.extractSymbol {`
`1077`	`1077`	`// Declare`
`1078`	`1078`	`const nodeToInsertBefore = getNodeToInsertConstantBefore(node, scope);`
`1079`	`1079`	`if (nodeToInsertBefore.pos === 0) {`
`1080`		`- changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement);`
	`1080`	`+ changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement, /blankLineBetween/ false);`
`1081`	`1081`	`}`
`1082`	`1082`	`else {`
`1083`	`1083`	`changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /blankLineBetween/ false);`
Original file line number	Diff line number	Diff line change
`@@ -332,11 +332,11 @@ namespace ts.textChanges {`
`332`	`332`	`return this;`
`333`	`333`	`}`
`334`	`334`
`335`		`- public insertNodeAtTopOfFile(sourceFile: SourceFile, newNode: Statement): void {`
	`335`	`+ public insertNodeAtTopOfFile(sourceFile: SourceFile, newNode: Statement, blankLineBetween: boolean): void {`
`336`	`336`	`const pos = getInsertionPositionAtSourceFileTop(sourceFile);`
`337`	`337`	`this.insertNodeAt(sourceFile, pos, newNode, {`
`338`	`338`	`prefix: pos === 0 ? undefined : this.newLineCharacter,`
`339`		`- suffix: isLineBreak(sourceFile.text.charCodeAt(pos)) ? this.newLineCharacter : this.newLineCharacter + this.newLineCharacter,`
	`339`	`+ suffix: (isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),`
`340`	`340`	`});`
`341`	`341`	`}`
`342`	`342`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ class C {`
`4`	`4`	`}`
`5`	`5`	`// ==SCOPE::Extract to constant in global scope==`
`6`	`6`	`const newLocal = 1;`
`7`		`-`
`8`	`7`	`class C {`
`9`	`8`	`x = /RENAME/newLocal;`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ class C {`
`10`	`10`	`}`
`11`	`11`	`// ==SCOPE::Extract to constant in global scope==`
`12`	`12`	`const newLocal = 1;`
`13`		`-`
`14`	`13`	`class C {`
`15`	`14`	`x = /RENAME/newLocal;`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ class C {`
`21`	`21`	`}`
`22`	`22`	`// ==SCOPE::Extract to constant in global scope==`
`23`	`23`	`const newLocal = 1;`
`24`		`-`
`25`	`24`	`class C {`
`26`	`25`	`a = 1;`
`27`	`26`	`b = 2;`