fix: skip if call expression

zardoy · Nov 13, 2023 · 8cbf209 · 8cbf209
1 parent c017eab
commit 8cbf209
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/typescript/src/codeActions/custom/addDestructure.ts b/typescript/src/codeActions/custom/addDestructure.ts
@@ -43,7 +43,7 @@ const addDestructureToVariableWithSplittedPropertyAccessors = (
         const highlightedNode = findChildContainingExactPosition(sourceFile, pos)
 
         if (!highlightedNode) continue
-        if (ts.isElementAccessExpression(highlightedNode.parent)) return
+        if (ts.isElementAccessExpression(highlightedNode.parent) || ts.isCallExpression(highlightedNode.parent.parent)) return
 
         if (ts.isIdentifier(highlightedNode) && ts.isPropertyAccessExpression(highlightedNode.parent)) {
             const accessorName = highlightedNode.parent.name.getText()

diff --git a/typescript/src/utils.ts b/typescript/src/utils.ts
@@ -438,16 +438,11 @@ export const isTypeNode = (node: ts.Node) => {
         // built-in types
         return true
     }
+    const isInTypeReference = (node: ts.Node) => {
+        if (ts.isTypeReferenceNode(node)) return true
 
-    if (inTypeReference(node)) return true
-
-    return false
-
-    function inTypeReference(node: ts.Node) {
-        if (ts.isTypeReferenceNode(node)) {
-            return true
-        }
-
-        return node.parent && inTypeReference(node.parent)
+        return node.parent && isInTypeReference(node.parent)
     }
+
+    return isInTypeReference(node)
 }
diff --git a/typescript/test/codeActions.spec.ts b/typescript/test/codeActions.spec.ts
@@ -285,6 +285,22 @@ describe('Add destructure', () => {
             })
         })
     })
+    test('Should skip if trying to destruct call expression', () => {
+        const initial = /* ts */ `
+            const /*t*/newVariable/*t*/ = foo
+
+            const obj = {
+                tag: newVariable.map(() => 10),
+            }
+        `
+
+        const { codeAction } = fourslashLikeTester(initial, undefined, { dedent: true })
+
+        codeAction(0, {
+            refactorName: 'Add Destruct',
+            newContent: null,
+        })
+    })
 })
 
 describe('From destructure', () => {