3eea1a9e9a
Major changes: 1) Instead of skipping undesirable scopes, include them and mark them with errors. Constants can be extracted into more scopes. 2) Update the tests to call through the "public" API. This caused some baseline changes. 3) Rename refactoring to "Extract Symbol" for generality. 4) Return a second ApplicableRefactorInfo for constants. Distinguish the two by splitting the action name.
59 lines
1.3 KiB
TypeScript
59 lines
1.3 KiB
TypeScript
/// <reference path='fourslash.ts' />
|
|
|
|
// Extracting from a static context should make static methods.
|
|
// Also checks that we correctly find non-conflicting names in static contexts.
|
|
|
|
//// class C {
|
|
//// static j = /*c*/1 + 1/*d*/;
|
|
//// constructor(q: string = /*a*/"hello"/*b*/) {
|
|
//// }
|
|
//// }
|
|
|
|
goTo.select('a', 'b');
|
|
edit.applyRefactor({
|
|
refactorName: "Extract Symbol",
|
|
actionName: "function_scope_0",
|
|
actionDescription: "Extract to method in class 'C'",
|
|
newContent:
|
|
`class C {
|
|
static j = 1 + 1;
|
|
constructor(q: string = C./*RENAME*/newMethod()) {
|
|
}
|
|
|
|
private static newMethod(): string {
|
|
return "hello";
|
|
}
|
|
}`
|
|
});
|
|
|
|
verify.currentFileContentIs(`class C {
|
|
static j = 1 + 1;
|
|
constructor(q: string = C.newMethod()) {
|
|
}
|
|
|
|
private static newMethod(): string {
|
|
return "hello";
|
|
}
|
|
}`);
|
|
|
|
goTo.select('c', 'd');
|
|
edit.applyRefactor({
|
|
refactorName: "Extract Symbol",
|
|
actionName: "function_scope_0",
|
|
actionDescription: "Extract to method in class 'C'",
|
|
newContent:
|
|
`class C {
|
|
static j = C./*RENAME*/newMethod_1();
|
|
constructor(q: string = C.newMethod()) {
|
|
}
|
|
|
|
private static newMethod_1() {
|
|
return 1 + 1;
|
|
}
|
|
|
|
private static newMethod(): string {
|
|
return "hello";
|
|
}
|
|
}`
|
|
});
|