@effect/language-service 0.40.0 → 0.40.1

package/index.js

@@ -3499,7 +3499,10 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
       ]
     );
     return ts.factory.createPropertyDeclaration(
-      [ts.factory.createModifier(ts.SyntaxKind.StaticKeyword)],
+      [
+        ts.factory.createModifier(ts.SyntaxKind.StaticKeyword),
+        ts.factory.createModifier(ts.SyntaxKind.OverrideKeyword)
+      ],
       propertyName,
       void 0,
       type,
@@ -3865,7 +3868,7 @@ var classSelfMismatch = createDiagnostic({
         );
         if (result) {
           const { className, selfTypeNode } = result;
-          let actualName = "";
+          let actualName = sourceFile.text.substring(selfTypeNode.pos, selfTypeNode.end);
           if (ts.isTypeReferenceNode(selfTypeNode)) {
             if (ts.isIdentifier(selfTypeNode.typeName)) {
               actualName = ts.idText(selfTypeNode.typeName);
@@ -13694,45 +13697,56 @@ var init = (modules) => {
       }
       return applicableRenameInfo;
     };
-    info.session?.addProtocolHandler("_effectGetLayerMermaid", (arg) => {
-      const { character, line, path } = arg.arguments;
-      const normalizedPath = modules.typescript.server.toNormalizedPath(path);
-      const projectService = info.project.projectService;
-      const scriptInfo = projectService.getScriptInfoForNormalizedPath(normalizedPath);
-      if (scriptInfo) {
-        const targetProject = scriptInfo.getDefaultProject();
-        if (targetProject) {
-          const program = targetProject.getLanguageService().getProgram();
-          if (program) {
-            const sourceFile = targetProject.getSourceFile(scriptInfo.path);
-            if (sourceFile) {
-              return pipe(
-                effectApiGetLayerGraph(sourceFile, line, character),
-                map3((response) => ({
-                  response: {
-                    success: true,
-                    ...response
-                  }
-                })),
-                runNano(program),
-                getOrElse((e) => ({
-                  response: {
-                    success: false,
-                    error: e.message
-                  }
-                }))
-              );
+    const additionalProtocolHandlers = {
+      "_effectGetLayerMermaid": (arg) => {
+        const { character, line, path } = arg.arguments;
+        const normalizedPath = modules.typescript.server.toNormalizedPath(path);
+        const projectService = info.project.projectService;
+        const scriptInfo = projectService.getScriptInfoForNormalizedPath(normalizedPath);
+        if (scriptInfo) {
+          const targetProject = scriptInfo.getDefaultProject();
+          if (targetProject) {
+            const program = targetProject.getLanguageService().getProgram();
+            if (program) {
+              const sourceFile = targetProject.getSourceFile(scriptInfo.path);
+              if (sourceFile) {
+                return pipe(
+                  effectApiGetLayerGraph(sourceFile, line, character),
+                  map3((response) => ({
+                    response: {
+                      success: true,
+                      ...response
+                    }
+                  })),
+                  runNano(program),
+                  getOrElse((e) => ({
+                    response: {
+                      success: false,
+                      error: e.message
+                    }
+                  }))
+                );
+              }
             }
           }
         }
+        return {
+          response: {
+            success: false,
+            error: "No source file found"
+          }
+        };
       }
-      return {
-        response: {
-          success: false,
-          error: "No source file found"
+    };
+    if (info.session) {
+      for (const [key, value] of Object.entries(additionalProtocolHandlers)) {
+        try {
+          info.session.addProtocolHandler(key, value);
+        } catch (e) {
+          info.project.log("[@effect/language-service] Skipped adding " + key + " protocol handler due to error: " + e);
         }
-      };
-    });
+      }
+    }
     return proxy;
   }
   return { create, onConfigurationChanged };