update

Author: ymc9

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.0.8",
+    "version": "3.0.9",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,

packages/language/src/zmodel-linker.ts

@@ -10,6 +10,7 @@ import {
     type LangiumDocument,
     type LinkingError,
     type Reference,
+    type ReferenceInfo,
     interruptAndCheck,
 } from 'langium';
 import { match } from 'ts-pattern';
@@ -93,31 +94,22 @@ export class ZModelLinker extends DefaultLinker {
         document.state = DocumentState.Linked;
     }
 
-    private linkReference(
-        container: AstNode,
-        property: string,
-        document: LangiumDocument,
-        extraScopes: ScopeProvider[],
-    ) {
-        if (this.resolveFromScopeProviders(container, property, document, extraScopes)) {
+    private linkReference(refInfo: ReferenceInfo, document: LangiumDocument, extraScopes: ScopeProvider[]) {
+        if (this.resolveFromScopeProviders(refInfo.reference, document, extraScopes)) {
             return;
         }
-
-        const reference: DefaultReference = (container as any)[property];
-        this.doLink({ reference, container, property }, document);
+        this.doLink(refInfo, document);
     }
 
     //#endregion
 
     //#region Expression type resolving
 
     private resolveFromScopeProviders(
-        node: AstNode,
-        property: string,
+        reference: DefaultReference,
         document: LangiumDocument,
         providers: ScopeProvider[],
     ) {
-        const reference: DefaultReference = (node as any)[property];
         for (const provider of providers) {
             const target = provider(reference.$refText);
             if (target) {
@@ -275,7 +267,7 @@ export class ZModelLinker extends DefaultLinker {
     }
 
     private resolveInvocation(node: InvocationExpr, document: LangiumDocument, extraScopes: ScopeProvider[]) {
-        this.linkReference(node, 'function', document, extraScopes);
+        this.linkReference({ reference: node.function, container: node, property: 'function' }, document, extraScopes);
         node.args.forEach((arg) => this.resolve(arg, document, extraScopes));
         if (node.function.ref) {
             const funcDecl = node.function.ref as FunctionDecl;
@@ -400,7 +392,7 @@ export class ZModelLinker extends DefaultLinker {
                 if (isArrayExpr(node.value)) {
                     node.value.items.forEach((item) => {
                         if (isReferenceExpr(item)) {
-                            const resolved = this.resolveFromScopeProviders(item, 'target', document, [scopeProvider]);
+                            const resolved = this.resolveFromScopeProviders(item.target, document, [scopeProvider]);
                             if (resolved) {
                                 this.resolveToDeclaredType(item, (resolved as DataField).type);
                             } else {
@@ -413,7 +405,7 @@ export class ZModelLinker extends DefaultLinker {
                         this.resolveToBuiltinTypeOrDecl(node.value, node.value.items[0].$resolvedType.decl, true);
                     }
                 } else if (isReferenceExpr(node.value)) {
-                    const resolved = this.resolveFromScopeProviders(node.value, 'target', document, [scopeProvider]);
+                    const resolved = this.resolveFromScopeProviders(node.value.target, document, [scopeProvider]);
                     if (resolved) {
                         this.resolveToDeclaredType(node.value, (resolved as DataField).type);
                     } else {
@@ -494,7 +486,9 @@ export class ZModelLinker extends DefaultLinker {
     }
 
     private resolveDefault(node: AstNode, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
-        AstUtils.streamReferences(node).forEach((ref) => this.doLink(ref, document));
+        AstUtils.streamReferences(node).forEach((ref) => {
+            this.linkReference(ref, document, extraScopes);
+        });
         for (const child of AstUtils.streamContents(node)) {
             this.resolve(child, document, extraScopes);
         }