zenstack 0.4.2 → 0.5.0

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "author": {
     "name": "ZenStack Team"
   },
@@ -87,7 +87,7 @@
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-uri": "^3.0.6",
-    "@zenstackhq/runtime": "0.4.2"
+    "@zenstackhq/runtime": "0.5.0"
   },
   "devDependencies": {
     "@prisma/internals": "~4.7.0",

package/src/language-server/zmodel-linker.ts

@@ -129,10 +129,6 @@ export class ZModelLinker extends DefaultLinker {
         document: LangiumDocument,
         extraScopes: ScopeProvider[] = []
     ) {
-        if (node.$resolvedType) {
-            return;
-        }
-
         switch (node.$type) {
             case LiteralExpr:
                 this.resolveLiteral(node as LiteralExpr);

package/src/language-server/zmodel-module.ts

@@ -30,7 +30,6 @@ import {
 import { TextDocuments } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import ZModelWorkspaceManager from './zmodel-workspace-manager';
-import ZModelDefinitionProvider from './lsp/zmodel-definition-provider';
 
 /**
  * Declaration of custom services - add your own service classes here.
@@ -65,10 +64,6 @@ export const ZModelModule: Module<
             new ZModelValidationRegistry(services),
         ZModelValidator: () => new ZModelValidator(),
     },
-    lsp: {
-        DefinitionProvider: (services) =>
-            new ZModelDefinitionProvider(services),
-    },
 };
 
 // this duplicates createDefaultSharedModule except that a custom WorkspaceManager is used

package/src/language-server/lsp/zmodel-definition-provider.ts

@@ -1,87 +0,0 @@
-import {
-    CstNode,
-    DefinitionProvider,
-    findDeclarationNodeAtOffset,
-    getDocument,
-    GoToLink,
-    LangiumDocument,
-    LangiumServices,
-    MaybePromise,
-    NameProvider,
-} from 'langium';
-import { GrammarConfig } from 'langium/lib/grammar/grammar-config';
-import { References } from 'langium/lib/references/references';
-import { DefinitionParams, LocationLink } from 'vscode-languageserver';
-
-/**
- * Custom Langium DefinitionProvider implementation
- */
-export default class ZModelDefinitionProvider implements DefinitionProvider {
-    protected readonly nameProvider: NameProvider;
-    protected readonly references: References;
-    protected readonly grammarConfig: GrammarConfig;
-
-    constructor(services: LangiumServices) {
-        this.nameProvider = services.references.NameProvider;
-        this.references = services.references.References;
-        this.grammarConfig = services.parser.GrammarConfig;
-    }
-
-    getDefinition(
-        document: LangiumDocument,
-        params: DefinitionParams
-    ): MaybePromise<LocationLink[] | undefined> {
-        const rootNode = document.parseResult.value;
-        if (rootNode.$cstNode) {
-            const cst = rootNode.$cstNode;
-            const sourceCstNode = findDeclarationNodeAtOffset(
-                cst,
-                document.textDocument.offsetAt(params.position),
-                this.grammarConfig.nameRegexp
-            );
-            if (sourceCstNode) {
-                return this.collectLocationLinks(sourceCstNode, params);
-            }
-        }
-        return undefined;
-    }
-
-    protected collectLocationLinks(
-        sourceCstNode: CstNode,
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        _params: DefinitionParams
-    ): MaybePromise<LocationLink[] | undefined> {
-        const goToLink = this.findLink(sourceCstNode);
-        if (goToLink) {
-            if (
-                // this condition is for working around a potential Langium bug
-                // https://github.com/langium/langium/discussions/732
-                !goToLink.targetDocument.textDocument.uri.endsWith(
-                    'stdlib.zmodel'
-                )
-            ) {
-                return [
-                    LocationLink.create(
-                        goToLink.targetDocument.textDocument.uri,
-                        (goToLink.target.element.$cstNode ?? goToLink.target)
-                            .range,
-                        goToLink.target.range,
-                        goToLink.source.range
-                    ),
-                ];
-            }
-        }
-        return undefined;
-    }
-
-    protected findLink(source: CstNode): GoToLink | undefined {
-        const target = this.references.findDeclarationNode(source);
-        if (target?.element) {
-            const targetDocument = getDocument(target.element);
-            if (target && targetDocument) {
-                return { source, target, targetDocument };
-            }
-        }
-        return undefined;
-    }
-}