fix more unwraps

Gregoor · Nov 6, 2024 · 9199c83 · 9199c83
1 parent 02347cf
commit 9199c83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/actions/unwrap.test.ts b/src/actions/unwrap.test.ts
@@ -20,14 +20,7 @@ test.each([
   ["let n = ≤1≥;", "≤1≥"],
   ["[1•, 2]", "[≤1≥]"],
   ["(ab: ≤A≥) => {}", "(≤A≥) => {}"],
-  [
-    `fn(23, ≤(o) => {
-  const { a } = o;
-}≥);`,
-    `≤(o) => {
-  const { a } = o;
-}≥;`,
-  ],
+  ["fn(≤a≥, b)", "fn(≤a≥)"],
 ])("%s", (sourceWithCursor: string, expected: string) => {
   const { source, cursors } = parseCursorSource(sourceWithCursor);
   const code = new Code(source, "javascript");

diff --git a/src/actions/unwrap.ts b/src/actions/unwrap.ts
@@ -1,17 +1,12 @@
-import { SyntaxNode } from "web-tree-sitter";
-
 import { changeCode, Sub } from "~/change";
 import { Code } from "~/code";
 import { Range } from "~/range";
 import { sliceRange } from "~/utils";
 
-const isFieldOnParent = (n: SyntaxNode) =>
-  n.parent?.childForFieldName(n.type)?.equals(n);
-
 export function unwrap(code: Code, cursor: Range): Sub | null {
   const node = code.tree.getNode(cursor);
   for (const ancestor of node.iterAncestors()) {
-    if (cursor.includes(ancestor) || isFieldOnParent(ancestor.inner)) {
+    if (cursor.includes(ancestor)) {
       continue;
     }