fix : align entity operations with data model scope and type constants

Author: remonaadite009

packages/server/src/glsp-server/system-diagram/handler/apply-edit-operation-handler.ts

@@ -18,6 +18,7 @@ export class SystemDiagramApplyLabelEditOperationHandler extends JsonOperationHa
    createCommand(operation: ApplyLabelEditOperation): Command {
       const entityNode = getOrThrow(this.modelState.index.findLogicalEntityNode(operation.labelId), 'Entity node not found');
       const entity = getOrThrow(entityNode.entity.ref, 'Entity not found');
+      const document = findDocument<CrossModelRoot>(entity)!;
       const oldName = entity.name;
       return new CrossModelCommand(
          this.modelState,
@@ -26,7 +27,7 @@ export class SystemDiagramApplyLabelEditOperationHandler extends JsonOperationHa
             this.renameEntity(
                getOrThrow(this.modelState.index.findLogicalEntityNode(operation.labelId), 'Entity node not found'),
                getOrThrow(entityNode.entity.ref, 'Entity not found'),
-               oldName ?? this.modelState.idProvider.findNextGlobalId(LogicalEntity, 'NewEntity')
+               oldName ?? this.modelState.idProvider.findNextLocalId(LogicalEntity, 'NewEntity', document.uri)
             ),
          () =>
             this.renameEntity(

packages/server/src/glsp-server/system-diagram/handler/create-entity-operation-handler.ts

@@ -70,7 +70,7 @@ export class SystemDiagramCreateEntityOperationHandler extends JsonCreateNodeOpe
       const entityRoot: CrossModelRoot = { $type: 'CrossModelRoot' };
       const name = operation.args?.name?.toString() ?? 'NewEntity';
 
-      const id = this.modelState.idProvider.findNextLocalId('LogicalEntity', name, dataModel.uri);
+      const id = this.modelState.idProvider.findNextLocalId(LogicalEntity, name, dataModel.uri);
 
       const entity: LogicalEntity = {
          $type: 'LogicalEntity',

packages/server/src/language-server/cross-model-index-manager.ts

@@ -22,7 +22,7 @@ export class CrossModelIndexManager extends DefaultIndexManager {
       });
    }
 
-   allElementsInDataModelOfType(type: string, dataModelId: string): ReturnType<typeof this.allElements> {
+   allElementsInDataModelOfType(dataModelId: string, type: string): ReturnType<typeof this.allElements> {
       return this.allElementsInDataModel(dataModelId).filter(desc => desc.type === type);
    }
 

packages/server/src/language-server/cross-model-naming.ts

@@ -162,7 +162,7 @@ export class DefaultIdProvider implements IdProvider {
       const dataModelId = this.dataModelManager.getDataModelIdByUri(uri);
 
       const knownIds = this.services.shared.workspace.IndexManager
-         .allElementsInDataModelOfType(type, dataModelId)
+         .allElementsInDataModelOfType(dataModelId, type)
          .map(element => element.name)
          .toArray();
 

packages/server/src/language-server/cross-model-scope.ts

@@ -19,7 +19,7 @@ import {
    isSourceObject,
    isTargetObject
 } from './generated/ast.js';
-import { setAttributes, setImplicitId, setOwner } from './util/ast-util.js';
+import { fixDocument, setAttributes, setImplicitId, setOwner } from './util/ast-util.js';
 
 /**
  * Custom node description that wraps a given description under a potentially new name and also stores the datamodel id for faster access.
@@ -148,22 +148,16 @@ export class CrossModelScopeComputation extends DefaultScopeComputation {
          .map(attribute => this.descriptions.createDescription(attribute, combineIds(nodeId, attribute.id!), document));
    }
 
-   protected getLogicalEntity(node: AstNode & { entity?: Reference<LogicalEntity> }, document: LangiumDocument): LogicalEntity | undefined {
-      const reference = node.entity;
-      if (!reference) {
+   protected getLogicalEntity(
+   node: AstNode & { entity?: Reference<LogicalEntity> },
+   document: LangiumDocument
+   ): LogicalEntity | undefined {
+      try {
+         return fixDocument(node, document).entity?.ref;
+      } catch (error) {
+         console.error(error);
          return undefined;
       }
-      if (reference.ref) {
-         return reference.ref;
-      }
-    
-      const scope = this.services.references.ScopeProvider.getScope({
-         container: node,
-         property: 'entity',
-         reference: reference
-      });
-      const description = scope.getElement(reference.$refText);
-      return this.services.shared.workspace.IndexManager.resolveElement(description) as LogicalEntity;
    }
 
    protected processSourceObject(node: SourceObject, nodeId: string, document: LangiumDocument): AstNodeDescription[] {