GLSP-865: Update to latest protocol version (#183)

* GLSP-865: Update to latest protocol version Part of eclipse-glsp/glsp/issues/865 * Upgrade yarn.lock
eclipse-glsp · Oct 10, 2023 · ebc2240 · ebc2240
1 parent fa56b69
commit ebc2240
Show file tree

Hide file tree

Showing 5 changed files with 552 additions and 590 deletions.
diff --git a/examples/workflow-theia/tsconfig.json b/examples/workflow-theia/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib",
-    "baseUrl": ".",
-    "resolveJsonModule": true,
-    "module": "Node16"
+    "resolveJsonModule": true
   },
   "include": ["src"]
 }
diff --git a/...s/theia-integration/src/browser/diagram/features/select/theia-glsp-selection-forwarder.ts b/...s/theia-integration/src/browser/diagram/features/select/theia-glsp-selection-forwarder.ts
@@ -17,14 +17,14 @@
 import {
     AnyObject,
     GLSPModelSource,
-    hasArrayProp,
-    hasObjectProp,
-    hasStringProp,
+    GModelRoot,
     ISelectionListener,
     ModelSource,
-    SModelRoot,
     TYPES,
-    ViewerOptions
+    ViewerOptions,
+    hasArrayProp,
+    hasObjectProp,
+    hasStringProp
 } from '@eclipse-glsp/client';
 import { SelectionService } from '@theia/core';
 import { inject, injectable, optional } from '@theia/core/shared/inversify';
@@ -97,7 +97,7 @@ export class TheiaGLSPSelectionForwarder implements ISelectionListener {
         return this.sourceUri;
     }
 
-    selectionChanged(_root: Readonly<SModelRoot>, selectedElements: string[]): void {
+    selectionChanged(_root: Readonly<GModelRoot>, selectedElements: string[]): void {
         this.handleSelectionChanged(selectedElements);
     }
 

diff --git a/packages/theia-integration/src/browser/diagram/glsp-diagram-context-key-service.ts b/packages/theia-integration/src/browser/diagram/glsp-diagram-context-key-service.ts
@@ -16,8 +16,8 @@
 import {
     EditMode,
     EditorContextService,
-    SModelElement,
-    SModelRoot,
+    GModelElement,
+    GModelRoot,
     SelectionService,
     getElements,
     isDeletable,
@@ -62,7 +62,7 @@ export abstract class AbstractGLSPDiagramContextKeyService {
         }
     }
 
-    protected updateSelectionContextKeys(root: Readonly<SModelRoot>, selectedElementIds: string[]): void {
+    protected updateSelectionContextKeys(root: Readonly<GModelRoot>, selectedElementIds: string[]): void {
         if (selectedElementIds.length < 1) {
             this.doResetSelectionContextKeys();
             return;
@@ -91,7 +91,7 @@ export abstract class AbstractGLSPDiagramContextKeyService {
     protected abstract registerContextKeys(): void;
     protected abstract doUpdateStaticContextKeys(glspDiagramWidget: GLSPDiagramWidget): void;
     protected abstract doResetStaticContextKeys(): void;
-    protected abstract doUpdateSelectionContextKeys(selectedElements: SModelElement[]): void;
+    protected abstract doUpdateSelectionContextKeys(selectedElements: GModelElement[]): void;
     protected abstract doResetSelectionContextKeys(): void;
     protected abstract doUpdateEditModeContextKeys(editMode: string): void;
     protected abstract doResetEditModeContextKeys(): void;
@@ -159,7 +159,7 @@ export class GLSPDiagramContextKeyService extends AbstractGLSPDiagramContextKeyS
         this.glspEditorDiagramType.reset();
     }
 
-    protected doUpdateSelectionContextKeys(selectedElements: SModelElement[]): void {
+    protected doUpdateSelectionContextKeys(selectedElements: GModelElement[]): void {
         this.glspEditorHasSelection.set(true);
         this.glspEditorHasMultipleSelection.set(selectedElements.length > 1);
         this.glspEditorHasDeletableSelection.set(selectedElements.filter(isDeletable).length > 0);

diff --git a/packages/theia-integration/tsconfig.json b/packages/theia-integration/tsconfig.json
@@ -2,9 +2,7 @@
   "extends": "@eclipse-glsp/ts-config/tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "module": "Node16"
+    "outDir": "lib"
   },
   "include": ["src"]
 }