monaco-languageclient-examples 7.0.0 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -43,29 +43,29 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-editor-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-files-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-json-default-extension": "~1.83.5",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-python-default-extension": "~1.83.5",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.5",
-    "@codingame/monaco-vscode-theme-service-override": "~1.83.5",
-    "@codingame/monaco-vscode-language-pack-de": "~1.83.5",
-    "@codingame/monaco-vscode-language-pack-es": "~1.83.5",
-    "@codingame/monaco-vscode-language-pack-fr": "~1.83.5",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-files-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-json-default-extension": "~1.83.7",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-python-default-extension": "~1.83.7",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.7",
+    "@codingame/monaco-vscode-theme-service-override": "~1.83.7",
+    "@codingame/monaco-vscode-language-pack-de": "~1.83.7",
+    "@codingame/monaco-vscode-language-pack-es": "~1.83.7",
+    "@codingame/monaco-vscode-language-pack-fr": "~1.83.7",
     "express": "~4.18.2",
     "langium": "~2.1.0",
     "langium-statemachine-dsl": "~2.1.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~7.0.0",
+    "monaco-languageclient": "~7.0.2",
     "pyright": "~1.1.333",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
     "vscode-json-languageservice": "~5.3.7",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
@@ -87,8 +87,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

package/src/langium/statemachineClient.ts

@@ -24,8 +24,7 @@ buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/',
 const languageId = 'statemachine';
 
 export const setupStatemachineClient = async () => {
-    // use this to demonstrate all possible services made available by the monaco-vscode-api
-    await initServices({
+    const serviceConfig = {
         userServices: {
             ...getThemeServiceOverride(),
             ...getTextmateServiceOverride(),
@@ -35,7 +34,13 @@ export const setupStatemachineClient = async () => {
         },
         debugLogging: true,
         logLevel: LogLevel.Info
-    });
+    };
+    await initServices(serviceConfig);
+
+    // does not do harm
+    for (let i = 0; i < 3; i++) {
+        await initServices(serviceConfig);
+    }
 
     console.log('Setting up Statemachine client configuration ...');
     const extension = {
@@ -72,7 +77,7 @@ export const setupStatemachineClient = async () => {
             }]
         }
     };
-    const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess, {});
+    const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess);
 
     registerFileUrl('/statemachine-configuration.json', new URL('../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href);
     registerFileUrl('/statemachine-grammar.json', new URL('../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href);

package/src/python/client/main.ts

@@ -139,14 +139,6 @@ export const startPythonClient = async () => {
     fileSystemProvider.registerFile(new RegisteredMemoryFile(vscode.Uri.file('/workspace/hello.py'), 'print("Hello, World!")'));
     registerFileSystemOverlay(1, fileSystemProvider);
 
-    // create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
-    createWebSocket(createUrl('localhost', 30001, '/pyright', {
-        // Used to parse an auth token or additional parameters such as import IDs to the language server
-        authorization: 'UserAuth'
-        // By commenting above line out and commenting below line in, connection to language server will be denied.
-        // authorization: 'FailedUserAuth'
-    }, false));
-
     const registerCommand = async (cmdName: string, handler: (...args: unknown[]) => void) => {
         // commands sould not be there, but it demonstrates how to retrieve list of all external commands
         const commands = await vscode.commands.getCommands(true);
@@ -171,4 +163,12 @@ export const startPythonClient = async () => {
         model: modelRef.object.textEditorModel,
         automaticLayout: true
     });
+
+    // create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
+    createWebSocket(createUrl('localhost', 30001, '/pyright', {
+        // Used to parse an auth token or additional parameters such as import IDs to the language server
+        authorization: 'UserAuth'
+        // By commenting above line out and commenting below line in, connection to language server will be denied.
+        // authorization: 'FailedUserAuth'
+    }, false));
 };