Glsp collaboration

.vscode/launch.json

@@ -30,7 +30,7 @@
       }
     },
     {
-      "name": "Workflow GLSP Example Extension (External GLSP Server)",
+      "name": "Workflow GLSP Example Extension (External GLSP Server) 5007",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
@@ -53,6 +53,25 @@
         "GLSP_SERVER_PORT": "5007"
       }
     },
+    {
+      "name": "Workflow GLSP Example Extension (External GLSP Server) 5017",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "${workspaceFolder}/example/workflow/workspace",
+        "--extensionDevelopmentPath=${workspaceFolder}/example/workflow/extension"
+      ],
+      "outFiles": [
+        "${workspaceFolder}/example/workflow/extension/lib/*.js",
+        "${workspaceFolder}/vscode-integration/lib/**/*.js"
+      ],
+      "sourceMaps": true,
+      "env": {
+        "GLSP_SERVER_DEBUG": "true",
+        "GLSP_SERVER_PORT": "5017"
+      }
+    },
     {
       "name": "Workflow GLSP Example Extension (Integrated Node GLSP Server)",
       "type": "extensionHost",

example/workflow/extension/package.json

@@ -40,6 +40,9 @@
     "watch": "tsc -w"
   },
   "contributes": {
+    "liveshare.spaces": [
+      "workflow-vscode-example"
+    ],
     "commands": [
       {
         "command": "workflow.fit",
@@ -82,6 +85,11 @@
         "title": "Export as SVG",
         "category": "Workflow Diagram",
         "enablement": "activeCustomEditorId == 'workflow.glspDiagram'"
+      },
+      {
+        "command": "workflow.liveshare.init",
+        "title": "Initialize Liveshare for Workflow",
+        "category": "Workflow Diagram"
       }
     ],
     "customEditors": [
@@ -191,8 +199,12 @@
     ]
   },
   "activationEvents": [
-    "onStartupFinished"
+    "onStartupFinished",
+    "onCommand:bigUML.liveshare.init"
   ],
+  "dependencies": {
+    "vsls": "^1.0.4753"
+  },
   "devDependencies": {
     "@eclipse-glsp-examples/workflow-server": "next",
     "@eclipse-glsp-examples/workflow-server-bundled": "next",
@@ -205,6 +217,9 @@
     "webpack-merge": "^5.9.0",
     "workflow-glsp-webview": "2.2.0-next"
   },
+  "extensionDependencies": [
+    "ms-vsliveshare.vsliveshare"
+  ],
   "engines": {
     "vscode": "^1.54.0"
   }

example/workflow/extension/src/workflow-extension.ts

@@ -18,6 +18,8 @@ import 'reflect-metadata';
 import { WorkflowDiagramModule, WorkflowLayoutConfigurator, WorkflowServerModule } from '@eclipse-glsp-examples/workflow-server/node';
 import { configureELKLayoutModule } from '@eclipse-glsp/layout-elk';
 import { GModelStorage, LogLevel, createAppModule } from '@eclipse-glsp/server/node';
+import { configureCollaborationCommands } from '@eclipse-glsp/vscode-integration/lib/collaboration';
+import { LiveshareGlspClientProvider, writeExtensionPermissionsForLiveshare } from '@eclipse-glsp/vscode-integration/lib/liveshare';
 import {
     GlspSocketServerLauncher,
     GlspVscodeConnector,
@@ -58,20 +60,27 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         context.subscriptions.push(serverProcess);
         await serverProcess.start();
     }
+
+    writeExtensionPermissionsForLiveshare('Eclipse-GLSP');
+
+    const liveshareGlspClientProvider = new LiveshareGlspClientProvider();
+
     // Wrap server with quickstart component
     const workflowServer = useIntegratedServer
         ? new NodeGlspVscodeServer({
               clientId: 'glsp.workflow',
               clientName: 'workflow',
               serverModules: createServerModules()
+              // collaboration: liveshareGlspClientProvider TODO implement collaboration for Node-Server
           })
         : new SocketGlspVscodeServer({
               clientId: 'glsp.workflow',
               clientName: 'workflow',
               connectionOptions: {
                   port: serverProcess?.getPort() || JSON.parse(process.env.GLSP_SERVER_PORT || DEFAULT_SERVER_PORT),
                   path: process.env.GLSP_WEBSOCKET_PATH
-              }
+              },
+              collaboration: liveshareGlspClientProvider
           });
     // Initialize GLSP-VSCode connector with server wrapper
     const glspVscodeConnector = new GlspVscodeConnector({
@@ -89,10 +98,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     );
 
     context.subscriptions.push(workflowServer, glspVscodeConnector, customEditorProvider);
+
     workflowServer.start();
 
     configureDefaultCommands({ extensionContext: context, connector: glspVscodeConnector, diagramPrefix: 'workflow' });
 
+    configureCollaborationCommands({ extensionContext: context, connector: glspVscodeConnector });
+
     context.subscriptions.push(
         vscode.commands.registerCommand('workflow.goToNextNode', () => {
             glspVscodeConnector.dispatchAction(NavigateAction.create('next'));
@@ -102,6 +114,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         }),
         vscode.commands.registerCommand('workflow.showDocumentation', () => {
             glspVscodeConnector.dispatchAction(NavigateAction.create('documentation'));
+        }),
+        vscode.commands.registerCommand('workflow.liveshare.init', () => {
+            writeExtensionPermissionsForLiveshare('Eclipse-GLSP', true);
         })
     );
 }