@effect/language-service 0.16.4 → 0.16.6

package/index.js

@@ -1980,7 +1980,7 @@ var expectedAndRealType = fn("TypeCheckerApi.expectedAndRealType")(function* (so
       if (expectedType) {
         result.push([body, expectedType, body, realType]);
       }
-      ts.forEachChild(node, appendNodeToVisit);
+      ts.forEachChild(body, appendNodeToVisit);
       continue;
     } else if (ts.isArrowFunction(node) && (node.typeParameters || []).length > 0 && ts.isExpression(node.body)) {
       const body = node.body;
@@ -1989,7 +1989,7 @@ var expectedAndRealType = fn("TypeCheckerApi.expectedAndRealType")(function* (so
       if (isSome2(expectedType)) {
         result.push([body, expectedType.value, body, realType]);
       }
-      ts.forEachChild(node, appendNodeToVisit);
+      ts.forEachChild(body, appendNodeToVisit);
       continue;
     } else if (ts.isSatisfiesExpression(node)) {
       const expectedType = typeChecker.getTypeAtLocation(node.type);
@@ -2887,21 +2887,31 @@ var effectGenToFn = createRefactor({
     const parseEffectGenNode = fn("asyncAwaitToGen.apply")(function* (node) {
       const effectGen2 = yield* effectGen(node);
       let pipeArgs2 = ts.factory.createNodeArray([]);
-      let nodeToReplace2 = node.parent;
-      if (ts.isPropertyAccessExpression(node.parent) && node.parent.name.text === "pipe" && ts.isCallExpression(node.parent.parent)) {
-        pipeArgs2 = node.parent.parent.arguments;
-        nodeToReplace2 = node.parent.parent.parent;
-      }
-      while (nodeToReplace2) {
-        if (ts.isArrowFunction(nodeToReplace2) || ts.isFunctionDeclaration(nodeToReplace2) || ts.isMethodDeclaration(nodeToReplace2)) {
-          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: nodeToReplace2 };
+      let nodeToReplace2 = node;
+      while (nodeToReplace2.parent) {
+        const parent = nodeToReplace2.parent;
+        if (ts.isConciseBody(nodeToReplace2) && ts.isArrowFunction(parent) && parent.body === nodeToReplace2) {
+          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: parent };
+        }
+        if ((ts.isFunctionDeclaration(parent) || ts.isMethodDeclaration(parent)) && parent.body === nodeToReplace2) {
+          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: parent };
+        }
+        if (ts.isBlock(parent) && parent.statements.length === 1 && parent.statements[0] === nodeToReplace2) {
+          nodeToReplace2 = parent;
+          continue;
+        }
+        if (ts.isReturnStatement(parent) && parent.expression === nodeToReplace2) {
+          nodeToReplace2 = parent;
+          continue;
         }
-        if (ts.isConciseBody(nodeToReplace2) || ts.isReturnStatement(nodeToReplace2)) {
-          nodeToReplace2 = nodeToReplace2.parent;
+        if (ts.isPropertyAccessExpression(parent) && parent.expression === nodeToReplace2 && parent.name.text === "pipe" && ts.isCallExpression(parent.parent)) {
+          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.parent.arguments));
+          nodeToReplace2 = parent.parent;
           continue;
         }
-        if (ts.isBlock(nodeToReplace2) && nodeToReplace2.statements.length === 1) {
-          nodeToReplace2 = nodeToReplace2.parent;
+        if (ts.isCallExpression(parent) && ts.isIdentifier(parent.expression) && parent.expression.text === "pipe" && parent.arguments.length > 0 && parent.arguments[0] === nodeToReplace2) {
+          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.arguments.slice(1)));
+          nodeToReplace2 = parent;
           continue;
         }
         break;