@likec4/language-server 0.33.1 → 0.34.0

package/dist/validation/element.js

@@ -1,3 +1,4 @@
+import { getDocument } from 'langium';
 export const elementChecks = (services) => {
     const fqnIndex = services.likec4.FqnIndex;
     return (el, accept) => {
@@ -9,11 +10,23 @@ export const elementChecks = (services) => {
             });
             return;
         }
-        const withSameFqn = fqnIndex.byFqn(fqn).limit(2).count();
-        if (withSameFqn > 1) {
+        const withSameFqn = fqnIndex
+            .byFqn(fqn)
+            .filter(v => v.el !== el)
+            .head();
+        if (withSameFqn) {
             accept('error', `Duplicate element name ${el.name !== fqn ? el.name + ' (' + fqn + ')' : el.name}`, {
                 node: el,
-                property: 'name'
+                property: 'name',
+                relatedInformation: [
+                    {
+                        location: {
+                            range: withSameFqn.el.$cstNode.range,
+                            uri: getDocument(withSameFqn.el).uri.toString()
+                        },
+                        message: `Already defined here`
+                    }
+                ]
             });
         }
     };

package/dist/validation/index.js

@@ -1,8 +1,11 @@
+import { Utils } from 'vscode-uri';
+import { logger } from '../logger';
 import { elementChecks } from './element';
 import { relationChecks } from './relation';
 import { elementKindChecks, tagChecks } from './specification';
 import { viewChecks } from './view';
 export function registerValidationChecks(services) {
+    logger.info('registerValidationChecks');
     const registry = services.validation.ValidationRegistry;
     // const checks: ValidationChecks = {
     // Element: validator.checkElementNameDuplicates,
@@ -19,5 +22,28 @@ export function registerValidationChecks(services) {
         Relation: relationChecks(services),
         Tag: tagChecks(services)
     });
+    const connection = services.shared.lsp.Connection;
+    if (connection) {
+        logger.info('registerValidationChecks');
+        // wokraround for bug in langium
+        services.shared.workspace.DocumentBuilder.onUpdate((changed, deleted) => {
+            const message = [`[DocumentBuilder.onUpdate]`];
+            if (changed.length > 0) {
+                message.push(` changed:`);
+                changed.forEach(u => message.push(`  - ${Utils.basename(u)}`));
+            }
+            if (deleted.length > 0) {
+                message.push(` deleted:`);
+                deleted.forEach(u => message.push(`  - ${Utils.basename(u)}`));
+            }
+            logger.debug(message.join('\n'));
+            for (const uri of deleted) {
+                void connection.sendDiagnostics({
+                    uri: uri.toString(),
+                    diagnostics: []
+                });
+            }
+        });
+    }
 }
 //# sourceMappingURL=index.js.map

package/dist/validation/relation.js

@@ -1,6 +1,6 @@
-import { BaseError } from '@likec4/core';
-import { isSameHierarchy } from '@likec4/core/utils';
+import { isSameHierarchy } from '@likec4/core';
 import { resolveRelationPoints } from '../ast';
+import { logError } from '../logger';
 export const relationChecks = (services) => {
     const fqnIndex = services.likec4.FqnIndex;
     return (el, accept) => {
@@ -30,14 +30,7 @@ export const relationChecks = (services) => {
             }
         }
         catch (e) {
-            if (e instanceof BaseError) {
-                return accept('error', e.message, {
-                    node: el
-                });
-            }
-            accept('error', 'Invalid relation', {
-                node: el
-            });
+            logError(e);
         }
     };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.33.1",
+  "version": "0.34.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -42,20 +42,21 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.33.1",
-    "langium": "^1.2.1",
+    "@likec4/core": "0.34.0",
+    "langium": "^2.0.0",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",
     "remeda": "^1.24.0",
     "strip-indent": "^4.0.0",
     "vscode-languageserver": "~8.1.0",
-    "vscode-languageserver-protocol": "~3.17.3"
+    "vscode-languageserver-protocol": "~3.17.3",
+    "vscode-uri": "~3.0.7"
   },
   "devDependencies": {
     "@types/node": "^18.15.11",
     "@types/object-hash": "^3.0.2",
-    "langium-cli": "^1.2.1",
+    "langium-cli": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.1.6",
     "vitest": "^0.34.1"