Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't insert a blank line after extracted locals

Browse Source 
Still insert a blank line after extracted properties.
This commit is contained in:
Andrew Casey
2017-12-15 15:11:16 -08:00
parent a3ab1ffcff
commit e9ac87c2d6
40 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/extractSymbol.ts
+1 -1
View File
@@ -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
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
-1
View File
@@ -7,7 +7,6 @@ const f = () => {
const f = () => {
const newLocal = 2 + 1;
return /*RENAME*/newLocal;
};
// ==SCOPE::Extract to constant in global scope==
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
-1
View File
@@ -7,7 +7,6 @@ const f = () => {
const f = () => {
const newLocal = 2 + 1;
return /*RENAME*/newLocal;
};
// ==SCOPE::Extract to constant in global scope==
tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js
-1
View File
@@ -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;
}
}
tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts
-1
View File
@@ -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;
}
}
tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js
-1
View File
@@ -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;
}
}
tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts
-1
View File
@@ -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;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
-1
View File
@@ -16,7 +16,6 @@ class C {
M2() { }
M3() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_Directive.js
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
"strict";
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_Directive.ts
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
"strict";
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js
-1
View File
@@ -16,7 +16,6 @@ function F() {
let i = 0;
const /*RENAME*/newLocal = i++;
function F() {
}
tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts
-1
View File
@@ -16,7 +16,6 @@ function F() {
let i = 0;
const /*RENAME*/newLocal = i++;
function F() {
}
tests/baselines/reference/extractConstant/extractConstant_Function.js
-1
View File
@@ -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==
tests/baselines/reference/extractConstant/extractConstant_Function.ts
-1
View File
@@ -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==
tests/baselines/reference/extractConstant/extractConstant_Method.js
-1
View File
@@ -8,7 +8,6 @@ class C {
class C {
M() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_Method.ts
-1
View File
@@ -8,7 +8,6 @@ class C {
class C {
M() {
const newLocal = 1;
let x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js
-1
View File
@@ -17,6 +17,5 @@ const x = /*[#|*/2 + 1/*|]*/;
"strict";
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts
-1
View File
@@ -17,6 +17,5 @@ const x = /*[#|*/2 + 1/*|]*/;
"strict";
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
-1
View File
@@ -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==
tests/baselines/reference/extractConstant/extractConstant_Parameters.js
-1
View File
@@ -7,6 +7,5 @@ function F() {
function F() {
let w = 1;
const newLocal = w + 1;
let x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_Parameters.ts
-1
View File
@@ -7,6 +7,5 @@ function F() {
function F() {
let w = 1;
const newLocal = w + 1;
let x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
-1
View File
@@ -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==
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js
-1
View File
@@ -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;
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts
-1
View File
@@ -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;
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js
-2
View File
@@ -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;
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts
-2
View File
@@ -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;
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js
-1
View File
@@ -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;
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts
-1
View File
@@ -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;
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
-1
View File
@@ -11,7 +11,6 @@ function F() {
function F() {
for (let j = 0; j < 10; j++) {
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
-1
View File
@@ -11,7 +11,6 @@ function F() {
function F() {
for (let j = 0; j < 10; j++) {
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
}
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
-2
View File
@@ -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) {
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts
-2
View File
@@ -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) {
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js
-2
View File
@@ -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++) {
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts
-2
View File
@@ -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++) {
tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts
-1
View File
@@ -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;
}