monaco-languageclient-examples 2025.6.1 → 2025.6.3

package/dist/langium/langium-dsl/wrapperLangium.js

@@ -3,15 +3,18 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
+import { delayExecution } from 'monaco-languageclient/common';
+import { EditorApp } from 'monaco-languageclient/editorApp';
 import { setupLangiumClientExtended } from './config/extendedConfig.js';
 import { setupLangiumClientClassic } from './config/classicConfig.js';
-import { delayExecution, disableElement } from '../../common/client/utils.js';
+import { disableElement } from '../../common/client/utils.js';
 import text from '../../../resources/langium/langium-dsl/example.langium?raw';
 import workerUrl from './worker/langium-server?worker&url';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
 export const runLangiumDslWrapper = async (extendedMode) => {
     try {
-        let wrapper;
+        let editorApp;
         const loadLangiumWorker = () => {
             console.log(`Langium worker URL: ${workerUrl}`);
             return new Worker(workerUrl, {
@@ -20,7 +23,7 @@ export const runLangiumDslWrapper = async (extendedMode) => {
             });
         };
         const checkStarted = () => {
-            if (wrapper?.isStarted() ?? false) {
+            if (editorApp?.isStarted() ?? false) {
                 alert('Editor was already started!\nPlease reload the page to test the alternative editor.');
                 return true;
             }
@@ -36,24 +39,30 @@ export const runLangiumDslWrapper = async (extendedMode) => {
             reader.listen((message) => {
                 console.log('Received message from worker:', message);
             });
+            let appConfig;
             if (extendedMode) {
-                const config = await setupLangiumClientExtended({
+                appConfig = setupLangiumClientExtended({
                     worker,
                     messageTransports: { reader, writer }
                 });
-                wrapper = new MonacoEditorLanguageClientWrapper();
-                await wrapper.initAndStart(config);
             }
             else {
-                const config = await setupLangiumClientClassic({
+                appConfig = setupLangiumClientClassic({
                     worker,
                     messageTransports: { reader, writer }
                 });
-                wrapper = new MonacoEditorLanguageClientWrapper();
-                await wrapper.initAndStart(config);
             }
+            // perform global init
+            const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
+            await apiWrapper.init();
+            // init language client
+            const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
+            await lcWrapper.start();
+            // run editorApp
+            editorApp = new EditorApp(appConfig.editorAppConfig);
+            await editorApp.start(appConfig.vscodeApiConfig.htmlContainer);
             await delayExecution(1000);
-            await wrapper.updateCodeResources({
+            await editorApp.updateCodeResources({
                 modified: {
                     text: `// modified file\n\n${text}`,
                     uri: '/workspace/mod.langium',
@@ -62,11 +71,9 @@ export const runLangiumDslWrapper = async (extendedMode) => {
             });
         };
         const disposeEditor = async () => {
-            if (!wrapper)
-                return;
-            wrapper.reportStatus();
-            await wrapper.dispose();
-            wrapper = undefined;
+            editorApp?.reportStatus();
+            await editorApp?.dispose();
+            editorApp = undefined;
             disableElement('button-start', false);
         };
         document.querySelector('#button-start')?.addEventListener('click', startLangiumClient);

package/dist/langium/langium-dsl/wrapperLangium.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperLangium.js","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapperLangium.js","sourceRoot":"","sources":["../../../src/langium/langium-dsl/wrapperLangium.ts"],"names":[],"mappings":"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"}

package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts

@@ -1,12 +1,12 @@
 import { MessageTransports } from 'vscode-languageclient';
-import type { CodeContent, WrapperConfig } from 'monaco-editor-wrapper';
+import type { CodeContent } from 'monaco-languageclient/editorApp';
+import type { ExampleAppConfig } from '../../../common/client/utils.js';
 export declare const createLangiumGlobalConfig: (params: {
     languageServerId: string;
-    useLanguageClient: boolean;
     codeContent: CodeContent;
-    worker?: Worker;
+    worker: Worker;
     messagePort?: MessagePort;
     messageTransports?: MessageTransports;
     htmlContainer: HTMLElement;
-}) => WrapperConfig;
+}) => ExampleAppConfig;
 //# sourceMappingURL=wrapperStatemachineConfig.d.ts.map

package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperStatemachineConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAyB,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAO/F,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,EAAE,WAAW,CAAA;CAC7B,KAAG,aA0EH,CAAC"}
+{"version":3,"file":"wrapperStatemachineConfig.d.ts","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK1D,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,iCAAiC,CAAC;AAKpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,EAAE,WAAW,CAAA;CAC7B,KAAG,gBA2EH,CAAC"}

package/dist/langium/statemachine/config/wrapperStatemachineConfig.js

@@ -5,10 +5,10 @@
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
 import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
-import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
 import { LogLevel } from '@codingame/monaco-vscode-api';
 import { MessageTransports } from 'vscode-languageclient';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
+import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscodeApiLocales';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 // cannot be imported with assert as json contains comments
 import statemachineLanguageConfig from './language-configuration.json?raw';
 import responseStatemachineTm from '../syntaxes/statemachine.tmLanguage.json?raw';
@@ -16,41 +16,36 @@ export const createLangiumGlobalConfig = (params) => {
     const extensionFilesOrContents = new Map();
     extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-configuration.json`, statemachineLanguageConfig);
     extensionFilesOrContents.set(`/${params.languageServerId}-statemachine-grammar.json`, responseStatemachineTm);
-    const languageClientConfigs = params.useLanguageClient && params.worker ? {
-        configs: {
-            statemachine: {
-                clientOptions: {
-                    documentSelector: ['statemachine']
-                },
-                connection: {
-                    options: {
-                        $type: 'WorkerDirect',
-                        worker: params.worker,
-                        messagePort: params.messagePort,
-                    },
-                    messageTransports: params.messageTransports
-                }
-            }
+    const languageClientConfig = {
+        clientOptions: {
+            documentSelector: ['statemachine']
+        },
+        connection: {
+            options: {
+                $type: 'WorkerDirect',
+                worker: params.worker,
+                messagePort: params.messagePort,
+            },
+            messageTransports: params.messageTransports
         }
-    } : undefined;
-    return {
+    };
+    const vscodeApiConfig = {
         $type: 'extended',
         htmlContainer: params.htmlContainer,
         logLevel: LogLevel.Debug,
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride(),
-                ...getLifecycleServiceOverride(),
-                ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
-            },
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'editor.guides.bracketPairsHorizontal': 'active',
-                    'editor.wordBasedSuggestions': 'off',
-                    'editor.experimental.asyncTokenization': true
-                })
-            },
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride(),
+            ...getLifecycleServiceOverride(),
+            ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
+        },
+        monacoWorkerFactory: configureDefaultWorkerFactory,
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.guides.bracketPairsHorizontal': 'active',
+                'editor.wordBasedSuggestions': 'off',
+                'editor.experimental.asyncTokenization': true
+            })
         },
         extensions: [{
                 config: {
@@ -75,14 +70,18 @@ export const createLangiumGlobalConfig = (params) => {
                     }
                 },
                 filesOrContents: extensionFilesOrContents
-            }],
-        editorAppConfig: {
-            codeResources: {
-                modified: params.codeContent
-            },
-            monacoWorkerFactory: configureDefaultWorkerFactory
-        },
-        languageClientConfigs
+            }]
+    };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type,
+        codeResources: {
+            modified: params.codeContent
+        }
+    };
+    return {
+        editorAppConfig,
+        vscodeApiConfig,
+        languageClientConfig
     };
 };
 //# sourceMappingURL=wrapperStatemachineConfig.js.map

package/dist/langium/statemachine/config/wrapperStatemachineConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperStatemachineConfig.js","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapperStatemachineConfig.js","sourceRoot":"","sources":["../../../../src/langium/statemachine/config/wrapperStatemachineConfig.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,8BAA8B,MAAM,wDAAwD,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAG1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAGpF,2DAA2D;AAC3D,OAAO,0BAA0B,MAAM,mCAAmC,CAAC;AAC3E,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;AAGlF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAOzC,EAAoB,EAAE;IACnB,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAwB,CAAC;IACjE,wBAAwB,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,kCAAkC,EAAE,0BAA0B,CAAC,CAAC;IACxH,wBAAwB,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,4BAA4B,EAAE,sBAAsB,CAAC,CAAC;IAE9G,MAAM,oBAAoB,GAAyB;QAC/C,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,cAAc,CAAC;SACrC;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,cAAc;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,WAAW,EAAE,MAAM,CAAC,WAAW;aAClC;YACD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;SAC9C;KACJ,CAAC;IAEF,MAAM,eAAe,GAA0B;QAC3C,KAAK,EAAE,UAAU;QACjB,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,gBAAgB,EAAE;YACd,GAAG,6BAA6B,EAAE;YAClC,GAAG,2BAA2B,EAAE;YAChC,GAAG,8BAA8B,CAAC,gCAAgC,EAAE,CAAC;SACxE;QACD,mBAAmB,EAAE,6BAA6B;QAClD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,sBAAsB,EAAE,qBAAqB;gBAC7C,sCAAsC,EAAE,QAAQ;gBAChD,6BAA6B,EAAE,KAAK;gBACpC,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;QACD,UAAU,EAAE,CAAC;gBACT,MAAM,EAAE;oBACJ,IAAI,EAAE,sBAAsB;oBAC5B,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,OAAO;oBAChB,OAAO,EAAE;wBACL,MAAM,EAAE,GAAG;qBACd;oBACD,WAAW,EAAE;wBACT,SAAS,EAAE,CAAC;gCACR,EAAE,EAAE,cAAc;gCAClB,UAAU,EAAE,CAAC,eAAe,CAAC;gCAC7B,OAAO,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;gCACzC,aAAa,EAAE,KAAK,MAAM,CAAC,gBAAgB,kCAAkC;6BAChF,CAAC;wBACF,QAAQ,EAAE,CAAC;gCACP,QAAQ,EAAE,cAAc;gCACxB,SAAS,EAAE,qBAAqB;gCAChC,IAAI,EAAE,KAAK,MAAM,CAAC,gBAAgB,4BAA4B;6BACjE,CAAC;qBACL;iBACJ;gBACD,eAAe,EAAE,wBAAwB;aAC5C,CAAC;KACL,CAAC;IAEF,MAAM,eAAe,GAAoB;QACrC,KAAK,EAAE,eAAe,CAAC,KAAK;QAC5B,aAAa,EAAE;YACX,QAAQ,EAAE,MAAM,CAAC,WAAW;SAC/B;KACJ,CAAC;IAEF,OAAO;QACH,eAAe;QACf,eAAe;QACf,oBAAoB;KACvB,CAAC;AACN,CAAC,CAAC"}

package/dist/langium/statemachine/launcher.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { initLocaleLoader } from 'monaco-editor-wrapper/vscode/locale';
+import { initLocaleLoader } from 'monaco-languageclient/vscodeApiLocales';
 await initLocaleLoader();
 const { runStatemachineWrapper } = await import('./main.js');
 runStatemachineWrapper();

package/dist/langium/statemachine/launcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/langium/statemachine/launcher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;AAC7D,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/langium/statemachine/launcher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;AAC7D,sBAAsB,EAAE,CAAC"}

package/dist/langium/statemachine/main-react.js

@@ -17,9 +17,8 @@ export const runStatemachineReact = async () => {
     reader.listen((message) => {
         console.log('Received message from worker:', message);
     });
-    const wrapperConfig = createLangiumGlobalConfig({
+    const appConfig = createLangiumGlobalConfig({
         languageServerId: 'react',
-        useLanguageClient: true,
         codeContent: {
             text,
             uri: '/workspace/example.statemachine'
@@ -49,7 +48,7 @@ export const runStatemachineReact = async () => {
                 }, []);
                 return (React.createElement(React.Fragment, null,
                     React.createElement("div", { style: { 'height': height } },
-                        React.createElement(MonacoEditorReactComp, { style: { 'height': '100%' }, wrapperConfig: wrapperConfig, onTextChanged: onTextChanged }),
+                        React.createElement(MonacoEditorReactComp, { style: { 'height': '100%' }, vscodeApiConfig: appConfig.vscodeApiConfig, editorAppConfig: appConfig.editorAppConfig, onTextChanged: onTextChanged }),
                         React.createElement("b", null, "Debug:"),
                         React.createElement("br", null),
                         testState)));

package/dist/langium/statemachine/main-react.js.map

@@ -1 +1 @@
-{"version":3,"file":"main-react.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"main-react.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main-react.tsx"],"names":[],"mappings":"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"}

package/dist/langium/statemachine/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AA0GA,eAAO,MAAM,sBAAsB,qBAOlC,CAAC;AAEF,eAAO,MAAM,6BAA6B,cAOzC,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAOrC,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AA0HA,eAAO,MAAM,sBAAsB,qBAOlC,CAAC;AAEF,eAAO,MAAM,6BAA6B,cAOzC,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAOrC,CAAC"}

package/dist/langium/statemachine/main.js

@@ -4,19 +4,23 @@
  * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
+import { EditorApp } from 'monaco-languageclient/editorApp';
 import { createLangiumGlobalConfig } from './config/wrapperStatemachineConfig.js';
 import workerUrl from './worker/statemachine-server?worker&url';
 import workerPortUrl from './worker/statemachine-server-port?worker&url';
 import text from '../../../resources/langium/statemachine/example.statemachine?raw';
 import textMod from '../../../resources/langium/statemachine/example-mod.statemachine?raw';
-import { delayExecution, disableElement } from '../../common/client/utils.js';
-const wrapper = new MonacoEditorLanguageClientWrapper();
-const wrapper2 = new MonacoEditorLanguageClientWrapper();
+import { disableElement } from '../../common/client/utils.js';
+import { delayExecution } from 'monaco-languageclient/common';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
+let editorApp;
+let editorApp2;
+let lcWrapper;
 const startEditor = async () => {
     disableElement('button-start', true);
     disableElement('button-dispose', false);
-    if (wrapper.isStarted() && wrapper2.isStarted()) {
+    if (editorApp?.isStarted() === true || editorApp2?.isStarted() === true) {
         alert('Editor was already started!');
         return;
     }
@@ -36,42 +40,48 @@ const startEditor = async () => {
         console.log('Received message from worker:', message);
     });
     // the configuration does not contain any text content
-    const langiumGlobalConfig = createLangiumGlobalConfig({
+    const appConfig = createLangiumGlobalConfig({
         languageServerId: 'first',
         codeContent: {
             text,
             uri: '/workspace/example.statemachine'
         },
-        useLanguageClient: true,
         worker: stateMachineWorkerPort,
         messagePort: channel.port1,
         messageTransports: { reader, writer },
         htmlContainer: document.getElementById('monaco-editor-root')
     });
-    await wrapper.initAndStart(langiumGlobalConfig);
-    wrapper.updateCodeResources({
+    editorApp = new EditorApp(appConfig.editorAppConfig);
+    // perform global init
+    const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
+    await apiWrapper.init();
+    // init language client
+    lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
+    await lcWrapper.start();
+    // run editorApp
+    await editorApp.start(appConfig.vscodeApiConfig.htmlContainer);
+    editorApp.updateCodeResources({
         modified: {
             text,
             uri: '/workspace/statemachine-mod.statemachine'
         }
     });
-    // start the second wrapper without any languageclient config
+    // start the second editorApp without any languageclient config
     // => they share the language server and both text contents have different uris
-    const langiumGlobalConfig2 = createLangiumGlobalConfig({
-        languageServerId: 'second',
-        useLanguageClient: false,
-        codeContent: {
-            text: textMod,
-            uri: '/workspace/example-mod.statemachine'
-        },
-        htmlContainer: document.getElementById('monaco-editor-root2')
-    });
-    await wrapper2.initAndStart(langiumGlobalConfig2);
+    const appConfig2 = appConfig;
+    appConfig2.editorAppConfig.codeResources.modified = {
+        text: textMod,
+        uri: '/workspace/example-mod.statemachine'
+    };
+    appConfig2.vscodeApiConfig.htmlContainer = document.getElementById('monaco-editor-root2');
+    editorApp2 = new EditorApp(appConfig2.editorAppConfig);
+    // run editorApp
+    await editorApp2.start(appConfig2.vscodeApiConfig.htmlContainer);
     vscode.commands.getCommands().then((x) => {
         console.log('Currently registered # of vscode commands: ' + x.length);
     });
     await delayExecution(1000);
-    wrapper.updateCodeResources({
+    editorApp.updateCodeResources({
         modified: {
             text: `// modified file\n\n${text}`,
             uri: '/workspace/statemachine-mod2.statemachine'
@@ -81,12 +91,13 @@ const startEditor = async () => {
 const disposeEditor = async () => {
     disableElement('button-start', false);
     disableElement('button-dispose', true);
-    wrapper.reportStatus();
-    await wrapper.dispose();
-    console.log(wrapper.reportStatus().join('\n'));
-    wrapper2.reportStatus();
-    await wrapper2.dispose();
-    console.log(wrapper2.reportStatus().join('\n'));
+    lcWrapper.dispose();
+    editorApp?.reportStatus();
+    await editorApp?.dispose();
+    console.log(editorApp?.reportStatus().join('\n'));
+    editorApp2?.reportStatus();
+    await editorApp2?.dispose();
+    console.log(editorApp2?.reportStatus().join('\n'));
 };
 export const runStatemachineWrapper = async () => {
     try {

package/dist/langium/statemachine/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,SAAS,MAAM,yCAAyC,CAAC;AAChE,OAAO,aAAa,MAAM,8CAA8C,CAAC;AACzE,OAAO,IAAI,MAAM,kEAAkE,CAAC;AACpF,OAAO,OAAO,MAAM,sEAAsE,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9E,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;AACxD,MAAM,QAAQ,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAEzD,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IAC3B,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrC,cAAc,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAExC,IAAI,OAAO,CAAC,SAAS,EAAE,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;QAC9C,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,OAAO;IACX,CAAC;IAED,8CAA8C;IAC9C,MAAM,sBAAsB,GAAG,yBAAyB,EAAE,CAAC;IAC3D,uGAAuG;IACvG,sBAAsB,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;QACzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,sBAAsB,CAAC,WAAW,CAAC;QAC/B,IAAI,EAAE,OAAO,CAAC,KAAK;KACtB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpB,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,mBAAmB,GAAG,yBAAyB,CAAC;QAClD,gBAAgB,EAAE,OAAO;QACzB,WAAW,EAAE;YACT,IAAI;YACJ,GAAG,EAAE,iCAAiC;SACzC;QACD,iBAAiB,EAAE,IAAI;QACvB,MAAM,EAAE,sBAAsB;QAC9B,WAAW,EAAE,OAAO,CAAC,KAAK;QAC1B,iBAAiB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;QACrC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE;KAChE,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAEhD,OAAO,CAAC,mBAAmB,CAAC;QACxB,QAAQ,EAAE;YACN,IAAI;YACJ,GAAG,EAAE,0CAA0C;SAClD;KACJ,CAAC,CAAC;IAEH,6DAA6D;IAC7D,+EAA+E;IAC/E,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;QACnD,gBAAgB,EAAE,QAAQ;QAC1B,iBAAiB,EAAE,KAAK;QACxB,WAAW,EAAE;YACT,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,qCAAqC;SAC7C;QACD,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAE;KACjE,CAAC,CAAC;IACH,MAAM,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,6CAA6C,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAE3B,OAAO,CAAC,mBAAmB,CAAC;QACxB,QAAQ,EAAE;YACN,IAAI,EAAE,uBAAuB,IAAI,EAAE;YACnC,GAAG,EAAE,2CAA2C;SACnD;KACJ,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC7B,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACtC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAEvC,OAAO,CAAC,YAAY,EAAE,CAAC;IACvB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,YAAY,EAAE,CAAC;IACxB,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC7C,IAAI,CAAC;QACD,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChF,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACxF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAC9C,8BAA8B;IAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;IAChD,OAAO,IAAI,MAAM,CAAC,SAAS,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,6BAA6B;KACtC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC1C,8BAA8B;IAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;IACpD,OAAO,IAAI,MAAM,CAAC,aAAa,EAAE;QAC7B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,0BAA0B;KACnC,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/langium/statemachine/main.ts"],"names":[],"mappings":"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"}

package/dist/multi/config.d.ts

@@ -1,4 +1,4 @@
-import type { LanguageClientConfig } from 'monaco-editor-wrapper';
+import type { LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
 export declare const createJsonLanguageClientConfig: () => LanguageClientConfig;
 export declare const createPythonLanguageClientConfig: () => LanguageClientConfig;
 //# sourceMappingURL=config.d.ts.map

package/dist/multi/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/multi/config.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,8BAA8B,EAAE,MAAM,oBAgBlD,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,oBAmCpD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/multi/config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,eAAO,MAAM,8BAA8B,EAAE,MAAM,oBAgBlD,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,oBAmCpD,CAAC"}

package/dist/multi/config.js

@@ -3,7 +3,6 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
-import { MonacoLanguageClient } from 'monaco-languageclient';
 export const createJsonLanguageClientConfig = () => {
     return {
         name: 'JSON Client',

package/dist/multi/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/multi/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,CAAC,MAAM,8BAA8B,GAA+B,GAAG,EAAE;IAC3E,OAAO;QACH,IAAI,EAAE,aAAa;QACnB,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;SAC7B;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,KAAK;aACjB;SACJ;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAA+B,GAAG,EAAE;IAC7E,OAAO;QACH,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE;oBACT,aAAa,EAAE,UAAU;iBAC5B;gBACD,YAAY,EAAE;oBACV,MAAM,EAAE,CAAC,cAAqC,EAAE,EAAE;wBAC9C,UAAU,CAAC,GAAG,EAAE;4BACZ,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gCACrE,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;oCAC5D,cAAc,EAAE,WAAW,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gCACnG,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;wBACP,CAAC,EAAE,GAAG,CAAC,CAAC;oBACZ,CAAC;oBACD,YAAY,EAAE,IAAI;iBACrB;aACJ;SACJ;QACD,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC;YAClC,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC;aACtC;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/multi/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAIjC,MAAM,CAAC,MAAM,8BAA8B,GAA+B,GAAG,EAAE;IAC3E,OAAO;QACH,IAAI,EAAE,aAAa;QACnB,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;SAC7B;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,KAAK;aACjB;SACJ;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAA+B,GAAG,EAAE;IAC7E,OAAO;QACH,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE;oBACT,aAAa,EAAE,UAAU;iBAC5B;gBACD,YAAY,EAAE;oBACV,MAAM,EAAE,CAAC,cAAmC,EAAE,EAAE;wBAC5C,UAAU,CAAC,GAAG,EAAE;4BACZ,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gCACrE,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;oCAC5D,cAAc,EAAE,WAAW,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gCACnG,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;wBACP,CAAC,EAAE,GAAG,CAAC,CAAC;oBACZ,CAAC;oBACD,YAAY,EAAE,IAAI;iBACrB;aACJ;SACJ;QACD,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC;YAClC,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC;aACtC;SACJ;KACJ,CAAC;AACN,CAAC,CAAC"}

package/dist/multi/twoLanguageClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"twoLanguageClients.d.ts","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"AAKA,OAAO,2BAA2B,CAAC;AAGnC,OAAO,iDAAiD,CAAC;AACzD,OAAO,mDAAmD,CAAC;AAO3D,eAAO,MAAM,iCAAiC,qBAuG7C,CAAC"}
+{"version":3,"file":"twoLanguageClients.d.ts","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"AAKA,OAAO,2BAA2B,CAAC;AAGnC,OAAO,iDAAiD,CAAC;AACzD,OAAO,mDAAmD,CAAC;AAS3D,eAAO,MAAM,iCAAiC,qBAiG7C,CAAC"}

package/dist/multi/twoLanguageClients.js

@@ -8,10 +8,12 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import '@codingame/monaco-vscode-json-default-extension';
 import '@codingame/monaco-vscode-python-default-extension';
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
+import { EditorApp } from 'monaco-languageclient/editorApp';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import { disableElement } from '../common/client/utils.js';
 import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { LanguageClientsManager } from 'monaco-languageclient/lcwrapper';
 export const runMultipleLanguageClientsExample = async () => {
     disableElement('button-flip', true);
     const textJson = `{
@@ -25,59 +27,56 @@ print("Hello Moon!")
 `;
     let currentText = textJson;
     let currenFileExt = 'json';
-    const wrapperConfig = {
-        id: '42',
+    const htmlContainer = document.getElementById('monaco-editor-root');
+    const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer: document.getElementById('monaco-editor-root'),
+        htmlContainer,
         logLevel: LogLevel.Debug,
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride()
-            },
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'editor.wordBasedSuggestions': 'off',
-                    'editor.experimental.asyncTokenization': true
-                })
-            }
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride()
         },
-        editorAppConfig: {
-            codeResources: {
-                modified: {
-                    text: currentText,
-                    uri: `/workspace/example.${currenFileExt}`
-                }
-            },
-            monacoWorkerFactory: configureDefaultWorkerFactory
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.wordBasedSuggestions': 'off',
+                'editor.experimental.asyncTokenization': true
+            })
         },
-        languageClientConfigs: {
-            configs: {
-                json: createJsonLanguageClientConfig(),
-                python: createPythonLanguageClientConfig()
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type,
+        id: '42',
+        codeResources: {
+            modified: {
+                text: currentText,
+                uri: `/workspace/example.${currenFileExt}`
             }
         }
     };
-    const wrapper = new MonacoEditorLanguageClientWrapper();
+    // perform global init
+    const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
+    await apiWrapper.init();
+    const lcManager = new LanguageClientsManager();
+    const languageClientConfigs = {
+        configs: {
+            json: createJsonLanguageClientConfig(),
+            python: createPythonLanguageClientConfig()
+        }
+    };
+    const editorApp = new EditorApp(editorAppConfig);
     document.querySelector('#button-start')?.addEventListener('click', async () => {
         try {
             disableElement('button-start', true);
             disableElement('button-flip', false);
-            disableElement('checkbox-extlc', true);
-            const externalLc = document.getElementById('checkbox-extlc').checked;
-            wrapperConfig.languageClientConfigs.automaticallyInit = !externalLc;
-            wrapperConfig.languageClientConfigs.automaticallyStart = !externalLc;
-            wrapperConfig.languageClientConfigs.automaticallyDispose = !externalLc;
-            await wrapper.initAndStart(wrapperConfig);
-            if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
-                wrapperConfig.editorAppConfig.codeResources.modified.text = currentText;
-                wrapperConfig.editorAppConfig.codeResources.modified.uri = `/workspace/example.${currenFileExt}`;
-            }
-            // init language clients after start
-            if (externalLc) {
-                wrapper.initLanguageClients();
-                await wrapper.startLanguageClients();
+            await editorApp.start(htmlContainer);
+            if (editorAppConfig.codeResources?.modified !== undefined) {
+                editorAppConfig.codeResources.modified.text = currentText;
+                editorAppConfig.codeResources.modified.uri = `/workspace/example.${currenFileExt}`;
             }
+            // init and start language clients after start
+            await lcManager.setConfigs(languageClientConfigs);
+            await lcManager.start();
         }
         catch (e) {
             console.error(e);
@@ -87,16 +86,13 @@ print("Hello Moon!")
         disableElement('button-flip', true);
         disableElement('button-dispose', true);
         disableElement('button-start', false);
-        const externalLc = document.getElementById('checkbox-extlc').checked;
-        await wrapper.dispose();
-        if (externalLc) {
-            wrapper.disposeLanguageClients();
-        }
+        await editorApp.dispose();
+        await lcManager.dispose();
     });
     document.querySelector('#button-flip')?.addEventListener('click', async () => {
         currentText = currentText === textJson ? textPython : textJson;
         currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
-        wrapper.updateCodeResources({
+        editorApp.updateCodeResources({
             modified: {
                 text: currentText,
                 uri: `/workspace/example.${currenFileExt}`