Skip to content

Handle class declarations without names in Extract Symbol #21849

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
Feb 10, 2018
Merged

Handle class declarations without names in Extract Symbol #21849

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
7 changes: 7 additions & 0 deletions src/harness/unittests/extractFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,13 @@ var q = /*b*/ //c
/*g*/ + /*h*/ //i
/*j*/ 2|] /*k*/ //l
/*m*/; /*n*/ //o`);

testExtractFunction("extractFunction_NamelessClass", `
export default class {
M() {
[#|1 + 1|];
}
}`);
});

function testExtractFunction(caption: string, text: string, includeLib?: boolean) {
Expand Down
2 changes: 1 addition & 1 deletion src/services/refactors/extractSymbol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ namespace ts.refactor.extractSymbol {
}
function getDescriptionForClassLikeDeclaration(scope: ClassLikeDeclaration): string {
return scope.kind === SyntaxKind.ClassDeclaration
? `class '${scope.name.text}'`
? scope.name ? `class '${scope.name.text}'` : "anonymous class declaration"
: scope.name ? `class expression '${scope.name.text}'` : "anonymous class expression";
}
function getDescriptionForModuleLikeDeclaration(scope: SourceFile | ModuleBlock): string | SpecialScope {
Expand Down
29 changes: 29 additions & 0 deletions tests/baselines/reference/extractFunction/extractFunction_NamelessClass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// ==ORIGINAL==

export default class {
M() {
/*[#|*/1 + 1/*|]*/;
}
}
// ==SCOPE::Extract to method in anonymous class declaration==

export default class {
M() {
this./*RENAME*/newMethod();
}

newMethod() {
1 + 1;
}
}
// ==SCOPE::Extract to function in module scope==

export default class {
M() {
/*RENAME*/newFunction();
}
}

function newFunction() {
1 + 1;
}
29 changes: 29 additions & 0 deletions tests/baselines/reference/extractFunction/extractFunction_NamelessClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// ==ORIGINAL==

export default class {
M() {
/*[#|*/1 + 1/*|]*/;
}
}
// ==SCOPE::Extract to method in anonymous class declaration==

export default class {
M() {
this./*RENAME*/newMethod();
}

private newMethod() {
1 + 1;
}
}
// ==SCOPE::Extract to function in module scope==

export default class {
M() {
/*RENAME*/newFunction();
}
}

function newFunction() {
1 + 1;
}