From d36f254f5e529814105956c3a664202467ce996d Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 31 Aug 2017 13:21:08 -0700 Subject: [PATCH] Fix extract method for anon class expressions (#18168) Check `scope.name` when trying to extract from an anon class (cherry picked from commit c7b4ed3a91964915b953b34ad2ae72f36e7d6efe) --- src/harness/unittests/extractMethods.ts | 8 ++++++ src/services/refactors/extractMethod.ts | 2 +- .../extractMethod/extractMethod20.ts | 28 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/extractMethod/extractMethod20.ts diff --git a/src/harness/unittests/extractMethods.ts b/src/harness/unittests/extractMethods.ts index 8b937826d0a..9fc7bd689e9 100644 --- a/src/harness/unittests/extractMethods.ts +++ b/src/harness/unittests/extractMethods.ts @@ -547,6 +547,14 @@ namespace A { } } }`); + + testExtractMethod("extractMethod20", + `const _ = class { + a() { + [#|let a1 = { x: 1 }; + return a1.x + 10;|] + } +}`); }); diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts index 505f514b04c..f2b644a9389 100644 --- a/src/services/refactors/extractMethod.ts +++ b/src/services/refactors/extractMethod.ts @@ -570,7 +570,7 @@ namespace ts.refactor.extractMethod { else if (isClassLike(scope)) { return scope.kind === SyntaxKind.ClassDeclaration ? `class '${scope.name.text}'` - : scope.name.text + : scope.name && scope.name.text ? `class expression '${scope.name.text}'` : "anonymous class expression"; } diff --git a/tests/baselines/reference/extractMethod/extractMethod20.ts b/tests/baselines/reference/extractMethod/extractMethod20.ts new file mode 100644 index 00000000000..1731109b919 --- /dev/null +++ b/tests/baselines/reference/extractMethod/extractMethod20.ts @@ -0,0 +1,28 @@ +// ==ORIGINAL== +const _ = class { + a() { + let a1 = { x: 1 }; + return a1.x + 10; + } +} +// ==SCOPE::anonymous class expression== +const _ = class { + a() { + return this./*RENAME*/newFunction(); + } + + private newFunction() { + let a1 = { x: 1 }; + return a1.x + 10; + } +} +// ==SCOPE::global scope== +const _ = class { + a() { + return /*RENAME*/newFunction(); + } +} +function newFunction() { + let a1 = { x: 1 }; + return a1.x + 10; +}