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 at the start of the file

Browse Source
This commit is contained in:
Andrew Casey
2017-12-15 15:49:27 -08:00
parent 129d1924be
commit adc3234e46
37 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/codefixes/importFixes.ts
+1 -1
View File
@@ -279,7 +279,7 @@ namespace ts.codefix {
changeTracker.insertNodeAfter(sourceFile, lastImportDeclaration, importDecl);
}
else {
changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl);
changeTracker.insertNodeAtTopOfFile(sourceFile, importDecl, /*blankLineBetween*/ true);
}
});
src/services/refactors/extractSymbol.ts
+1 -1
View File
@@ -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);
src/services/textChanges.ts
+2 -2
View File
@@ -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 : ""),
});
}
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
-1
View File
@@ -11,7 +11,6 @@ const f = () => {
};
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
const f = () => {
return /*RENAME*/newLocal;
};
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
-1
View File
@@ -11,7 +11,6 @@ const f = () => {
};
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
const f = () => {
return /*RENAME*/newLocal;
};
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js
-1
View File
@@ -2,5 +2,4 @@
const f = () => /*[#|*/2 + 1/*|]*/;
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
const f = () => /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts
-1
View File
@@ -2,5 +2,4 @@
const f = () => /*[#|*/2 + 1/*|]*/;
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
const f = () => /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_Class.js
-1
View File
@@ -4,7 +4,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_Class.ts
-1
View File
@@ -10,7 +10,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
-1
View File
@@ -21,7 +21,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
a = 1;
b = 2;
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
-1
View File
@@ -33,7 +33,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
a = 1;
b = 2;
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
-1
View File
@@ -21,7 +21,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
a = 1;
M1() { }
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
-1
View File
@@ -33,7 +33,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
a = 1;
M1() { }
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
-1
View File
@@ -21,7 +21,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
M1() { }
a = 1;
tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
-1
View File
@@ -33,7 +33,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
M1() { }
a = 1;
tests/baselines/reference/extractConstant/extractConstant_Function.js
-1
View File
@@ -9,7 +9,6 @@ function F() {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
function F() {
let x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_Function.ts
-1
View File
@@ -9,7 +9,6 @@ function F() {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
function F() {
let x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_Method.js
-1
View File
@@ -13,7 +13,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
M() {
let x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_Method.ts
-1
View File
@@ -21,7 +21,6 @@ class C {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
class C {
M() {
let x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
-1
View File
@@ -9,7 +9,6 @@ namespace N {
}
// ==SCOPE::Extract to constant in global scope==
const newLocal = 1;
namespace N {
let x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
/*! Copyright */
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
/*! Copyright */
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js
-1
View File
@@ -10,7 +10,6 @@ const x = /*[#|*/2 + 1/*|]*/;
/*! Copyright */
const newLocal = 2 + 1;
/* About x */
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts
-1
View File
@@ -10,7 +10,6 @@ const x = /*[#|*/2 + 1/*|]*/;
/*! Copyright */
const newLocal = 2 + 1;
/* About x */
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.js
-1
View File
@@ -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
tests/baselines/reference/extractConstant/extractConstant_PreserveTrivia.ts
-1
View File
@@ -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
tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
-1
View File
@@ -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;
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
-1
View File
@@ -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;
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
-1
View File
@@ -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;
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
-1
View File
@@ -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) {
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts
-1
View File
@@ -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) {
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js
-1
View File
@@ -6,7 +6,6 @@ class C {
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
class C {
x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts
-1
View File
@@ -14,7 +14,6 @@ class C {
// ==SCOPE::Extract to constant in global scope==
const newLocal = 2 + 1;
class C {
x = /*RENAME*/newLocal;
}
tests/baselines/reference/extractConstant/extractConstant_TopLevel.js
-1
View File
@@ -2,5 +2,4 @@
let x = /*[#|*/1/*|]*/;
// ==SCOPE::Extract to constant in enclosing scope==
const newLocal = 1;
let x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts
-1
View File
@@ -2,5 +2,4 @@
let x = /*[#|*/1/*|]*/;
// ==SCOPE::Extract to constant in enclosing scope==
const newLocal = 1;
let x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
/// <reference path="path.js"/>
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;
tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts
-1
View File
@@ -9,6 +9,5 @@ const x = /*[#|*/2 + 1/*|]*/;
/// <reference path="path.js"/>
const newLocal = 2 + 1;
const x = /*RENAME*/newLocal;