Update to monaco-languageclient 5.1.0-next.0 and monaco-vscode-api 1.…

…78.0
TypeFox · Apr 17, 2023 · ba2ef98 · ba2ef98
1 parent 01c3b08
commit ba2ef98
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 180 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -8,11 +8,10 @@
     "langium-statemachine-dsl": "~1.1.0",
     "monaco-editor-wrapper": "2.0.0-next.1",
     "@typefox/monaco-editor-react": "1.0.0-next.8",
-    "monaco-editor-workers": "0.36.0",
+    "monaco-editor-workers": "0.37.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.76.6",
     "vscode-uri": "~3.0.7",
     "vscode-languageclient": "~8.1.0",
     "vscode-languageserver": "~8.1.0",

diff --git a/packages/examples/src/langium/langiumWrapperConfig.ts b/packages/examples/src/langium/langiumWrapperConfig.ts
@@ -19,10 +19,15 @@ export const createLangiumGlobalConfig = async (htmlElement: HTMLElement): Promi
         htmlElement: htmlElement,
         wrapperConfig: {
             useVscodeConfig: true,
-            monacoVscodeApiConfig: {
-                activationConfig: {
-                    basePath: '../monaco-editor-wrapper'
+            serviceConfig: {
+                enableThemeService: true,
+                enableLanguagesService: true,
+                enableConfigurationService: true,
+                configurationServiceConfig: {
+                    defaultWorkspaceUri: '/tmp/'
                 },
+            },
+            monacoVscodeApiConfig: {
                 extension: {
                     name: 'langium-example',
                     publisher: 'monaco-languageclient-project',
@@ -60,7 +65,7 @@ export const createLangiumGlobalConfig = async (htmlElement: HTMLElement): Promi
                 },
                 extensionFiles: extensionFiles,
                 userConfiguration: `{
-                "workbench.colorTheme": "Dark+ (Experimental)",
+                "workbench.colorTheme": "Default Dark+",
                 "editor.fontSize": 14,
                 "editor.lightbulb.enabled": true,
                 "editor.lineHeight": 20,

diff --git a/packages/examples/src/langium/wrapperLangium.ts b/packages/examples/src/langium/wrapperLangium.ts
@@ -15,10 +15,10 @@ const startEditor = async () => {
     const langiumGlobalConfig = await createLangiumGlobalConfig(document.getElementById('monaco-editor-root') as HTMLElement);
     wrapper
         .init(langiumGlobalConfig)
-        .startEditor()
-        .then((s: unknown) => {
-            console.log(s);
-
+        .then(() => {
+            wrapper.startEditor();
+        })
+        .then(() => {
             vscode.commands.getCommands().then((x) => {
                 console.log('Currently registered # of vscode commands: ' + x.length);
             });

diff --git a/packages/monaco-editor-react/package.json b/packages/monaco-editor-react/package.json
@@ -67,8 +67,8 @@
     "npm": "9.6.3"
   },
   "dependencies": {
-    "monaco-editor-workers": "0.36.0",
     "monaco-editor-wrapper": "2.0.0-next.1",
+    "monaco-languageclient": "5.1.0-next.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0"
   },

diff --git a/packages/monaco-editor-wrapper/package.json b/packages/monaco-editor-wrapper/package.json
@@ -95,7 +95,7 @@
   },
   "dependencies": {
     "@types/css-font-loading-module": "~0.0.8",
-    "monaco-languageclient": "5.0.1",
+    "monaco-languageclient": "5.1.0-next.0",
     "vscode-ws-jsonrpc": "3.0.0",
     "normalize-url": "~8.0.0"
   },

diff --git a/packages/monaco-editor-wrapper/src/index.ts b/packages/monaco-editor-wrapper/src/index.ts
@@ -6,10 +6,6 @@ import {
     MonacoEditorWrapper
 } from './monacoEditorWrapper.js';
 
-import type {
-    MonacoVscodeApiActivtion
-} from './monacoVscodeApiWrapper.js';
-
 import {
     MonacoVscodeApiWrapper
 } from './monacoVscodeApiWrapper.js';
@@ -29,7 +25,6 @@ import {
 export type {
     EditorConfig,
     MonacoLanguageExtensionConfig,
-    MonacoVscodeApiActivtion,
     WebSocketConfigOptions,
     WorkerConfigOptions,
     UserConfig,

diff --git a/packages/monaco-editor-wrapper/src/indexAllLanguages.ts b/packages/monaco-editor-wrapper/src/indexAllLanguages.ts
@@ -1,7 +1,6 @@
 export type {
     EditorConfig,
     MonacoLanguageExtensionConfig,
-    MonacoVscodeApiActivtion,
     WebSocketConfigOptions,
     WorkerConfigOptions,
     UserConfig,

diff --git a/packages/monaco-editor-wrapper/src/monacoEditorWrapper.ts b/packages/monaco-editor-wrapper/src/monacoEditorWrapper.ts
@@ -24,9 +24,14 @@ export type MonacoEditorWrapperConfig = {
 export class MonacoEditorWrapper {
 
     async init(editorConfig: EditorConfig, runtimeConfig: MonacoEditorWrapperConfig) {
-        this.updateWrapperConfig(editorConfig, runtimeConfig);
-
-        console.log('Init of MonacoConfig was completed.');
+        return this.updateWrapperConfig(editorConfig, runtimeConfig)
+            .then(() => {
+                console.log('Init of MonacoConfig was completed.');
+                return Promise.resolve();
+            })
+            .catch(e => {
+                return Promise.reject(e);
+            });
     }
 
     async updateWrapperConfig(editorConfig: EditorConfig, runtimeConfig: MonacoEditorWrapperConfig) {