microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #18831 from amcasey/AdditionSpecialCase

Browse Source 
Eliminate special case for extracting from a binary operator chain
This commit is contained in:
Andrew Casey
2017-09-29 13:10:28 -07:00
committed by GitHub
parent f71930c473 41676248e5
commit 7aee3a102c
4 changed files with 17 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/harness/unittests/extractFunctions.ts
View File

@@ -109,16 +109,6 @@ namespace ts {
return C.foo();|]
}
}
}`);
testExtractFunction("extractFunction8",
`namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return 1 + [#|a1 + x|] + 100;
}
}
}`);
testExtractFunction("extractFunction9",
`namespace A {

25
src/harness/unittests/extractRanges.ts
View File

@@ -152,18 +152,6 @@ namespace ts {
}
}
`);
testExtractRange(`
function f() {
return [$|1 + [#|2 + 3|]|];
}
}
`);
testExtractRange(`
function f() {
return [$|1 + 2 + [#|3 + 4|]|];
}
}
`);
});
testExtractRangeFailed("extractRangeFailed1",
@@ -311,7 +299,18 @@ switch (x) {
testExtractRangeFailed("extractRangeFailed9",
`var x = ([#||]1 + 2);`,
[
"Cannot extract empty range."
refactor.extractSymbol.Messages.CannotExtractEmpty.message
]);
testExtractRangeFailed("extractRangeFailed10",
`
function f() {
return 1 + [#|2 + 3|];
}
}
`,
[
refactor.extractSymbol.Messages.CannotExtractRange.message
]);
testExtractRangeFailed("extract-method-not-for-token-expression-statement", `[#|a|]`, [refactor.extractSymbol.Messages.CannotExtractIdentifier.message]);

31
src/services/refactors/extractSymbol.ts
View File

@@ -201,9 +201,9 @@ namespace ts.refactor.extractSymbol {
// Walk up starting from the the start position until we find a non-SourceFile node that subsumes the selected span.
// This may fail (e.g. you select two statements in the root of a source file)
let start = getParentNodeInSpan(getTokenAtPosition(sourceFile, span.start, /*includeJsDocComment*/ false), sourceFile, span);
const start = getParentNodeInSpan(getTokenAtPosition(sourceFile, span.start, /*includeJsDocComment*/ false), sourceFile, span);
// Do the same for the ending position
let end = getParentNodeInSpan(findTokenOnLeftOfPosition(sourceFile, textSpanEnd(span)), sourceFile, span);
const end = getParentNodeInSpan(findTokenOnLeftOfPosition(sourceFile, textSpanEnd(span)), sourceFile, span);
const declarations: Symbol[] = [];
@@ -217,31 +217,10 @@ namespace ts.refactor.extractSymbol {
}
if (start.parent !== end.parent) {
// handle cases like 1 + [2 + 3] + 4
// user selection is marked with [].
// in this case 2 + 3 does not belong to the same tree node
// instead the shape of the tree looks like this:
// +
// / \
// + 4
// / \
// + 3
// / \
// 1 2
// in this case there is no such one node that covers ends of selection and is located inside the selection
// to handle this we check if both start and end of the selection belong to some binary operation
// and start node is parented by the parent of the end node
// if this is the case - expand the selection to the entire parent of end node (in this case it will be [1 + 2 + 3] + 4)
const startParent = skipParentheses(start.parent);
const endParent = skipParentheses(end.parent);
if (isBinaryExpression(startParent) && isBinaryExpression(endParent) && isNodeDescendantOf(startParent, endParent)) {
start = end = endParent;
}
else {
// start and end nodes belong to different subtrees
return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.CannotExtractRange)] };
}
// start and end nodes belong to different subtrees
return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.CannotExtractRange)] };
}
if (start !== end) {
// start and end should be statements and parent should be either block or a source file
if (!isBlockLike(start.parent)) {

65
tests/baselines/reference/extractFunction/extractFunction8.ts
View File

@@ -1,65 +0,0 @@
// ==ORIGINAL==
namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return 1 + a1 + x + 100;
}
}
}
// ==SCOPE::Extract to inner function in function 'a'==
namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return /*RENAME*/newFunction() + 100;
function newFunction() {
return 1 + a1 + x;
}
}
}
}
// ==SCOPE::Extract to function in namespace 'B'==
namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return /*RENAME*/newFunction(a1) + 100;
}
function newFunction(a1: number) {
return 1 + a1 + x;
}
}
}
// ==SCOPE::Extract to function in namespace 'A'==
namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return /*RENAME*/newFunction(a1) + 100;
}
}
function newFunction(a1: number) {
return 1 + a1 + x;
}
}
// ==SCOPE::Extract to function in global scope==
namespace A {
let x = 1;
namespace B {
function a() {
let a1 = 1;
return /*RENAME*/newFunction(a1, x) + 100;
}
}
}
function newFunction(a1: number, x: number) {
return 1 + a1 + x;
}