From 2d59d0dc79ae1ad9e80d6851d8d1faaa5948fb4c Mon Sep 17 00:00:00 2001 From: Qluxzz Date: Fri, 2 Feb 2024 22:47:57 +0100 Subject: [PATCH] Fix not removing associated data for type variant --- src/common/util/refactorEditUtils.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/util/refactorEditUtils.ts b/src/common/util/refactorEditUtils.ts index 28acbccd..a4fd9f6e 100644 --- a/src/common/util/refactorEditUtils.ts +++ b/src/common/util/refactorEditUtils.ts @@ -476,14 +476,16 @@ export class RefactorEditUtils { return this.removeType(unionVariants[0].parent); } - let startPosition = nodeAtPosition.startPosition; - let endPosition = nodeAtPosition.endPosition; - const unionVariant = unionVariants?.find( (a) => a.text.startsWith(`${nodeAtPosition.text} `) || a.text === nodeAtPosition.text, ); + + let startPosition = + unionVariant?.startPosition ?? nodeAtPosition.startPosition; + let endPosition = unionVariant?.endPosition ?? nodeAtPosition.endPosition; + if (unionVariant?.previousSibling?.type == "eq") { startPosition = unionVariant.previousSibling?.endPosition; if (unionVariant.nextSibling?.type == "|") {