Don't insert a blank line after extracted locals

amcasey · amcasey · commit e9ac87c2d6ed · 2017-12-15T15:11:16.000-08:00
Still insert a blank line after extracted properties.
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
@@ -1080,7 +1080,7 @@ namespace ts.refactor.extractSymbol {
                     changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement);
                 }
                 else {
-                    changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ true);
+                    changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                 }
 
                 // Consume
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
@@ -7,7 +7,6 @@ const f = () => {
 
 const f = () => {
     const newLocal = 2 + 1;
-
     return /*RENAME*/newLocal;
 };
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
@@ -7,7 +7,6 @@ const f = () => {
 
 const f = () => {
     const newLocal = 2 + 1;
-
     return /*RENAME*/newLocal;
 };
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js b/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js
@@ -11,7 +11,6 @@ for (let i = 0; i < 10; i++) {
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = i + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts b/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts
@@ -11,7 +11,6 @@ for (let i = 0; i < 10; i++) {
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = i + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js b/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js
@@ -8,7 +8,6 @@ for (let i = 0; i < 10; i++) {
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts b/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts
@@ -8,7 +8,6 @@ for (let i = 0; i < 10; i++) {
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
@@ -16,7 +16,6 @@ class C {
     M2() { }
     M3() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Directive.js b/tests/baselines/reference/extractConstant/extractConstant_Directive.js
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 "strict";
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Directive.ts b/tests/baselines/reference/extractConstant/extractConstant_Directive.ts
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 "strict";
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js
@@ -16,7 +16,6 @@ function F() {
 
 let i = 0;
 const /*RENAME*/newLocal = i++;
-
 function F() {
     
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts
@@ -16,7 +16,6 @@ function F() {
 
 let i = 0;
 const /*RENAME*/newLocal = i++;
-
 function F() {
     
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.js b/tests/baselines/reference/extractConstant/extractConstant_Function.js
@@ -5,7 +5,6 @@ function F() {
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {
     const newLocal = 1;
-
     let x = /*RENAME*/newLocal;
 }
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.ts b/tests/baselines/reference/extractConstant/extractConstant_Function.ts
@@ -5,7 +5,6 @@ function F() {
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {
     const newLocal = 1;
-
     let x = /*RENAME*/newLocal;
 }
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.js b/tests/baselines/reference/extractConstant/extractConstant_Method.js
@@ -8,7 +8,6 @@ class C {
 class C {
     M() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.ts b/tests/baselines/reference/extractConstant/extractConstant_Method.ts
@@ -8,7 +8,6 @@ class C {
 class C {
     M() {
         const newLocal = 1;
-
         let x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js b/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js
@@ -17,6 +17,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 "strict";
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts b/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts
@@ -17,6 +17,5 @@ const x = /*[#|*/2 + 1/*|]*/;
 "strict";
 
 const newLocal = 2 + 1;
-
 const x = /*RENAME*/newLocal;
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts b/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
@@ -5,7 +5,6 @@ namespace N {
 // ==SCOPE::Extract to constant in enclosing scope==
 namespace N {
     const newLocal = 1;
-
     let x = /*RENAME*/newLocal;
 }
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Parameters.js b/tests/baselines/reference/extractConstant/extractConstant_Parameters.js
@@ -7,6 +7,5 @@ function F() {
 function F() {
     let w = 1;
     const newLocal = w + 1;
-
     let x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Parameters.ts b/tests/baselines/reference/extractConstant/extractConstant_Parameters.ts
@@ -7,6 +7,5 @@ function F() {
 function F() {
     let w = 1;
     const newLocal = w + 1;
-
     let x = /*RENAME*/newLocal;
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts b/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
@@ -7,7 +7,6 @@ namespace X {
 namespace X {
     export const j = 10;
     const newLocal = j * j;
-
     export const y = /*RENAME*/newLocal;
 }
 // ==SCOPE::Extract to constant in global scope==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js
@@ -10,7 +10,6 @@ for (let j = 0; j < 10; j++) {
 const i = 0;
 for (let j = 0; j < 10; j++) {
     const newLocal = i + 1;
-
     const x = /*RENAME*/newLocal;
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts
@@ -10,7 +10,6 @@ for (let j = 0; j < 10; j++) {
 const i = 0;
 for (let j = 0; j < 10; j++) {
     const newLocal = i + 1;
-
     const x = /*RENAME*/newLocal;
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js
@@ -13,7 +13,6 @@ const i = 0;
 function F() {
     for (let j = 0; j < 10; j++) {
         const newLocal = i + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
@@ -22,7 +21,6 @@ function F() {
 
 const i = 0;
 const newLocal = i + 1;
-
 function F() {
     for (let j = 0; j < 10; j++) {
         const x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts
@@ -13,7 +13,6 @@ const i = 0;
 function F() {
     for (let j = 0; j < 10; j++) {
         const newLocal = i + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
@@ -22,7 +21,6 @@ function F() {
 
 const i = 0;
 const newLocal = i + 1;
-
 function F() {
     for (let j = 0; j < 10; j++) {
         const x = /*RENAME*/newLocal;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js
@@ -8,7 +8,6 @@ for (let j = 0; j < 10; j++) {
 
 for (let j = 0; j < 10; j++) {
     const newLocal = 2 + 1;
-
     const x = /*RENAME*/newLocal;
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts
@@ -8,7 +8,6 @@ for (let j = 0; j < 10; j++) {
 
 for (let j = 0; j < 10; j++) {
     const newLocal = 2 + 1;
-
     const x = /*RENAME*/newLocal;
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
@@ -11,7 +11,6 @@ function F() {
 function F() {
     for (let j = 0; j < 10; j++) {
         const newLocal = 2 + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
@@ -11,7 +11,6 @@ function F() {
 function F() {
     for (let j = 0; j < 10; j++) {
         const newLocal = 2 + 1;
-
         const x = /*RENAME*/newLocal;
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
@@ -12,7 +12,6 @@ function F0() {
 function F0() {
     function F1() {
         const newLocal = 2 + 1;
-
         function F2(x = /*RENAME*/newLocal) {
         }
     }
@@ -22,7 +21,6 @@ function F0() {
 
 function F0() {
     const newLocal = 2 + 1;
-
     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
@@ -12,7 +12,6 @@ function F0() {
 function F0() {
     function F1() {
         const newLocal = 2 + 1;
-
         function F2(x = /*RENAME*/newLocal) {
         }
     }
@@ -22,7 +21,6 @@ function F0() {
 
 function F0() {
     const newLocal = 2 + 1;
-
     function F1() {
         function F2(x = /*RENAME*/newLocal) {
         }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js
@@ -16,7 +16,6 @@ class C {
     M() {
         for (let j = 0; j < 10; j++) {
             const newLocal = i + 1;
-
             x = /*RENAME*/newLocal;
         }
     }
@@ -26,7 +25,6 @@ class C {
 
 const i = 0;
 const newLocal = i + 1;
-
 class C {
     M() {
         for (let j = 0; j < 10; j++) {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts
@@ -16,7 +16,6 @@ class C {
     M() {
         for (let j = 0; j < 10; j++) {
             const newLocal: any = i + 1;
-
             x = /*RENAME*/newLocal;
         }
     }
@@ -39,7 +38,6 @@ class C {
 
 const i = 0;
 const newLocal: any = i + 1;
-
 class C {
     M() {
         for (let j = 0; j < 10; j++) {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts b/tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts
@@ -5,6 +5,5 @@ function F<T>(t: T) {
 // ==SCOPE::Extract to constant in enclosing scope==
 function F<T>(t: T) {
     const newLocal = t + 1;
-
     let x = /*RENAME*/newLocal;
 }

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,7 @@ namespace ts.refactor.extractSymbol {`
`1080`	`1080`	`changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement);`
`1081`	`1081`	`}`
`1082`	`1082`	`else {`
`1083`		`- changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /blankLineBetween/ true);`
	`1083`	`+ changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /blankLineBetween/ false);`
`1084`	`1084`	`}`
`1085`	`1085`
`1086`	`1086`	`// Consume`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ for (let i = 0; i < 10; i++) {`
`11`	`11`	`for (let i = 0; i < 10; i++) {`
`12`	`12`	`for (let j = 0; j < 10; j++) {`
`13`	`13`	`const newLocal = i + 1;`
`14`		`-`
`15`	`14`	`const x = /RENAME/newLocal;`
`16`	`15`	`}`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ for (let i = 0; i < 10; i++) {`
`8`	`8`	`for (let i = 0; i < 10; i++) {`
`9`	`9`	`for (let j = 0; j < 10; j++) {`
`10`	`10`	`const newLocal = 1;`
`11`		`-`
`12`	`11`	`let x = /RENAME/newLocal;`
`13`	`12`	`}`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class C {`
`16`	`16`	`M2() { }`
`17`	`17`	`M3() {`
`18`	`18`	`const newLocal = 1;`
`19`		`-`
`20`	`19`	`let x = /RENAME/newLocal;`
`21`	`20`	`}`
`22`	`21`	`}`