@effect/language-service 0.71.1 → 0.71.2

package/cli.js

@@ -30214,7 +30214,7 @@ var runMain3 = runMain2;
 // package.json
 var package_default = {
   name: "@effect/language-service",
-  version: "0.71.1",
+  version: "0.71.2",
   packageManager: "pnpm@8.11.0",
   publishConfig: {
     access: "public",
@@ -41510,8 +41510,7 @@ var getPatchesForModule = fn("getPatchesForModule")(
     let insertCheckSourceFilePosition = none2();
     let insertSkipPrecedingCommentDirectivePosition = none2();
     let insertAppendMetadataRelationErrorPosition = none2();
-    let insertExtractDiagnosticsForExitStatusPosition = none2();
-    let replacedBindingExtractDiagnosticsForExitStatus = none2();
+    let insertEmitFilesAndReportErrorsDiagnosticsRange = none2();
     let nodesToCheck = [];
     function findNodeAtPositionIncludingTrivia(sourceFile2, position) {
       function find3(node) {
@@ -41540,7 +41539,7 @@ var getPatchesForModule = fn("getPatchesForModule")(
     if (!pushFunctionDeclarationNode("checkSourceFileWorker")) requiresFullScan = true;
     if (!pushFunctionDeclarationNode("markPrecedingCommentDirectiveLine")) requiresFullScan = true;
     if (!pushFunctionDeclarationNode("reportRelationError")) requiresFullScan = true;
-    if (!pushFunctionDeclarationNode("emitFilesAndReportErrorsAndGetExitStatus")) requiresFullScan = true;
+    if (!pushFunctionDeclarationNode("emitFilesAndReportErrors")) requiresFullScan = true;
     if (requiresFullScan) nodesToCheck = [sourceFile];
     while (nodesToCheck.length > 0) {
       const node = nodesToCheck.shift();
@@ -41575,23 +41574,18 @@ var getPatchesForModule = fn("getPatchesForModule")(
             });
           }
         }
-      } else if (ts.isCallExpression(node)) {
-        const callee = node.expression;
-        if (ts.isIdentifier(callee) && ts.idText(callee) === "emitFilesAndReportErrors") {
-          const parentVariableDeclaration = ts.findAncestor(node, ts.isVariableDeclaration);
-          if (parentVariableDeclaration) {
-            const parentVariableStatement = ts.findAncestor(parentVariableDeclaration, ts.isVariableStatement);
-            if (parentVariableStatement) {
-              const parentBlock = parentVariableStatement.parent;
-              if (ts.isBlock(parentBlock)) {
-                const parentFunctionDeclaration = parentBlock.parent;
-                if (ts.isFunctionDeclaration(parentFunctionDeclaration) && parentFunctionDeclaration.name && ts.isIdentifier(parentFunctionDeclaration.name) && ts.idText(parentFunctionDeclaration.name) === "emitFilesAndReportErrorsAndGetExitStatus") {
-                  insertExtractDiagnosticsForExitStatusPosition = some2({
-                    position: parentVariableStatement.end
-                  });
-                  replacedBindingExtractDiagnosticsForExitStatus = some2({
-                    pos: parentVariableDeclaration.name.pos,
-                    end: parentVariableDeclaration.name.end
+      } else if (ts.isReturnStatement(node)) {
+        const parentBlock = node.parent;
+        if (parentBlock && ts.isBlock(parentBlock)) {
+          const parentFunctionDeclaration = parentBlock.parent;
+          if (parentFunctionDeclaration && ts.isFunctionDeclaration(parentFunctionDeclaration) && parentFunctionDeclaration.name && ts.isIdentifier(parentFunctionDeclaration.name) && ts.idText(parentFunctionDeclaration.name) === "emitFilesAndReportErrors") {
+            if (node.expression && ts.isObjectLiteralExpression(node.expression)) {
+              const properties = node.expression.properties;
+              for (const property of properties) {
+                if (property && ts.isShorthandPropertyAssignment(property) && property.name && ts.isIdentifier(property.name) && ts.idText(property.name) === "diagnostics") {
+                  insertEmitFilesAndReportErrorsDiagnosticsRange = some2({
+                    pos: property.pos,
+                    end: property.end
                   });
                 }
               }
@@ -41664,30 +41658,17 @@ var getPatchesForModule = fn("getPatchesForModule")(
         version
       )
     );
-    if (isNone2(insertExtractDiagnosticsForExitStatusPosition)) {
+    if (isNone2(insertEmitFilesAndReportErrorsDiagnosticsRange)) {
       return yield* new UnableToFindPositionToPatchError({ positionToFind: "extractDiagnosticsForExitStatus" });
     }
-    if (isNone2(replacedBindingExtractDiagnosticsForExitStatus)) {
-      return yield* new UnableToFindPositionToPatchError({ positionToFind: "extractDiagnosticsForExitStatus-binding" });
-    }
-    patches.push(
-      yield* makeEffectLspPatchChange(
-        sourceFile.text,
-        replacedBindingExtractDiagnosticsForExitStatus.value.pos,
-        replacedBindingExtractDiagnosticsForExitStatus.value.end,
-        ` { emitResult, diagnostics: tscDiagnostics }`,
-        " ",
-        version
-      )
-    );
     patches.push(
       yield* makeEffectLspPatchChange(
         sourceFile.text,
-        insertExtractDiagnosticsForExitStatusPosition.value.position,
-        insertExtractDiagnosticsForExitStatusPosition.value.position,
-        `const diagnostics = effectLspPatchUtils().extractDiagnosticsForExitStatus(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis()"}, program, tscDiagnostics, "${moduleName}")
+        insertEmitFilesAndReportErrorsDiagnosticsRange.value.pos,
+        insertEmitFilesAndReportErrorsDiagnosticsRange.value.end,
+        `diagnostics: effectLspPatchUtils().extractDiagnosticsForExitStatus(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis()"}, program, diagnostics, "${moduleName}")
 `,
-        "\n",
+        " ",
         version
       )
     );