From afeacf41bd85f3cddb13cbece45e3a33c4cd18e6 Mon Sep 17 00:00:00 2001 From: Oleksandr T Date: Mon, 7 Feb 2022 23:26:39 +0200 Subject: [PATCH] fix(47782): forbid super() extraction outside this container (#47784) --- src/services/refactors/extractSymbol.ts | 4 ++-- tests/cases/fourslash/extractSuperOutsideClass.ts | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tests/cases/fourslash/extractSuperOutsideClass.ts diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts index 5b0032e6f01..0120f81cb02 100644 --- a/src/services/refactors/extractSymbol.ts +++ b/src/services/refactors/extractSymbol.ts @@ -486,8 +486,8 @@ namespace ts.refactor.extractSymbol { // but a super *method call* simply implies a 'this' reference if (node.parent.kind === SyntaxKind.CallExpression) { // Super constructor call - const containingClass = getContainingClass(node)!; // TODO:GH#18217 - if (containingClass.pos < span.start || containingClass.end >= (span.start + span.length)) { + const containingClass = getContainingClass(node); + if (containingClass === undefined || containingClass.pos < span.start || containingClass.end >= (span.start + span.length)) { (errors ||= []).push(createDiagnosticForNode(node, Messages.cannotExtractSuper)); return true; } diff --git a/tests/cases/fourslash/extractSuperOutsideClass.ts b/tests/cases/fourslash/extractSuperOutsideClass.ts new file mode 100644 index 00000000000..26fd2becd6a --- /dev/null +++ b/tests/cases/fourslash/extractSuperOutsideClass.ts @@ -0,0 +1,6 @@ +/// + +/////*a*/super()/*b*/ + +goTo.select("a", "b"); +verify.not.refactorAvailable("Extract Symbol");