Skip to content

Stop requiring that the full range of a declaration fall within the selection #18563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amcasey merged 1 commit into from
Sep 19, 2017
Merged

Stop requiring that the full range of a declaration fall within the selection #18563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/harness/unittests/extractMethods.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,11 @@ function parsePrimaryExpression(): any {
}
}|]
}
}`);
// Selection excludes leading trivia of declaration
testExtractMethod("extractMethod33",
`function F() {
[#|function G() { }|]
}`);
});

Expand Down
2 changes: 1 addition & 1 deletion src/services/refactors/extractMethod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ namespace ts.refactor.extractMethod {
if (!declInFile) {
return undefined;
}
if (rangeContainsRange(enclosingTextRange, declInFile)) {
if (rangeContainsStartEnd(enclosingTextRange, declInFile.getStart(), declInFile.end)) {
// declaration is located in range to be extracted - do nothing
return undefined;
}
Expand Down
19 changes: 19 additions & 0 deletions tests/baselines/reference/extractMethod/extractMethod33.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// ==ORIGINAL==
function F() {
function G() { }
}
// ==SCOPE::inner function in function 'F'==
function F() {
/*RENAME*/newFunction();

function newFunction() {
function G() { }
}
}
// ==SCOPE::function in global scope==
function F() {
/*RENAME*/newFunction();
}
function newFunction() {
function G() { }
}
7 changes: 2 additions & 5 deletions tests/cases/fourslash/extract-method-empty-namespace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/// <reference path='fourslash.ts' />

// TODO: GH#18546
// For now this tests that at least we don't crash.

////function f() {
//// /*start*/namespace N {}/*end*/
////}
Expand All @@ -13,9 +10,9 @@ edit.applyRefactor({
actionName: "scope_1",
actionDescription: "Extract to function in global scope",
newContent: `function f() {
/*RENAME*/newFunction(N);
/*RENAME*/newFunction();
}
function newFunction(N: any) {
function newFunction() {
namespace N { }
}
`
Expand Down