monaco-languageclient 10.0.0-next.0 → 10.0.0-next.2

package/CHANGELOG.md

@@ -2,10 +2,27 @@
 
 All notable changes to this npm module are documented in this file.
 
-## [10.0.0-next.0] - 2025-0z-xy
+## [10.0.0] - unreleased
 
-- Move MonacoLanguageClientWrapper to monaco-languageclient [#920](https://github.com/TypeFox/monaco-languageclient/pull/920)
-- Updated all `@codingame/monaco-vscode` packages to `18.2.0`.
+- Merge `monaco-editor-wrapper` with `monaco-languageclient`:
+  - Documentation update [#956](https://github.com/TypeFox/monaco-languageclient/pull/956).
+  - Lifecycle adjustments [#939](https://github.com/TypeFox/monaco-languageclient/pull/939).
+  - Move MonacoLanguageClientWrapper to monaco-languageclient [#920](https://github.com/TypeFox/monaco-languageclient/pull/920).
+  - Added multiple new sub-exports: `vscodeApiWrapper`, `lcwrapper`, `editorApp` and `workerFactory` that expose the merged functionality, please see the [migration guide](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/migration.md).
+- Updated all `@codingame/monaco-vscode` packages to `^21.0.1`.
+
+## [9.11.0] - 2025-08-21
+
+- Updated all `@codingame/monaco-vscode` packages to `20.2.1`.
+
+## [9.10.0] - 2025-08-14
+
+- Updated all `@codingame/monaco-vscode` packages to `20.1.1`.
+
+## [9.9.0] - 2025-08-11
+
+- Updated all `@codingame/monaco-vscode` packages to `19.1.4`.
+- Updated `vscode-ws-jsonrpc` package to `3.5.0`.
 
 ## [9.8.0] - 2025-06-24
 

package/README.md

@@ -1,6 +1,5 @@
 # Monaco Language Client
 
-[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/TypeFox/monaco-languageclient)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?longCache=true)](https://github.com/TypeFox/monaco-languageclient/labels/help%20wanted)
 [![monaco-languageclient](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml/badge.svg)](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml)
 [![NPM Version](https://img.shields.io/npm/v/monaco-languageclient.svg)](https://www.npmjs.com/package/monaco-languageclient)
@@ -12,41 +11,106 @@ Module to connect [Monaco editor](https://microsoft.github.io/monaco-editor/) wi
 
 All changes are noted in the [CHANGELOG](https://github.com/TypeFox/monaco-languageclient/blob/main/packages/client/CHANGELOG.md).
 
-## Getting Started
-
-This is npm package is part of the <https://github.com/TypeFox/monaco-languageclient> mono repo. Please follow the main repositories [instructions]](<https://github.com/TypeFox/monaco-languageclient#getting-started>) to get started with local development.
-
-## Usage
-
-### NEW with v8: Use monaco-vscode-editor-api package instead of monaco-editor
-
-Since version 2 (see [Important Project Changes](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#important-project-changes)) of this library we rely on [@codingame/monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api) to supply the VSCode API. It evolved substantially since then and thesedays allows to use many vscode only services with `monaco-editor`. With v6 and v7 we used a *treemended* version of `monaco-editor` which brought back monaco-editor code that was removed during bundling/threeshaking. This left users with the need to define overrides / resolution which was problematic.
-Therefore [monaco-vscode-editor-api](https://www.npmjs.com/package/@codingame/monaco-vscode-editor-api) is now used and installed as an alias to `monaco-editor` because it provides the same api as the official monaco-editor, but no longer has the drawbacks of the *treemended* version.
-
-### Using services and extra packages from @codingame/monaco-vscode-api
-
-The bespoke projects not only supplies the api, but it provides 100+ packages with additional services, default extensions and language packs. By default when initalizing `monaco-languageclient` via the required `initServices` the following services are always loaded:
-
-- *languages* and model *services* (always added by `monaco-languagclient`)
-- *layout*, *environment*, *extension*, *files* and *quickAccess* (always added by `monaco-vscode-api`)
-
-Please check the [following link](https://github.com/CodinGame/monaco-vscode-api#monaco-standalone-services) for information about all services supplied by [@codingame/monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api).
-
-#### textmate and monarch
-
-If you use the `textmate` or `theme` services you are able to load textmate based grammars and theme definitions from vscode:
-
-```js
-import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
-import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
+## Official documentation, quick start and examples
+
+This is npm package is part of the [monaco-languageclient mono repo](https://github.com/TypeFox/monaco-languageclient).
+
+You find detailed information in the [official documentation](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/index.md).
+
+If interested, check [quick start for local development]](<https://github.com/TypeFox/monaco-languageclient#getting-started>).
+
+A detailed list of examples is contained in the GitHub repository, please see [this listing](<https://github.com/TypeFox/monaco-languageclient#examples-overview>).
+
+## Version 10: A toolbox for language client applications
+
+Since Version 2 this library relied on [@codingame/monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api) to supply the VSCode API (see [Important Project Changes](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#important-project-changes)). `monaco-vscode-api` has evolved substantially since then and thesedays provides 100+ packages with additional services, default extensions and language packs allowing you to create VSCode Web compatible applications.
+
+Since `monaco-langaugeclient` version `10` all building blocks for complete web applications are contained in this package. The biggest deviation from the previous major versions is that the handling of monaco-vscode-api, the handling of language clients and the single editor app functionality are now very clearly separated. Instead of supplying an independent npm module (monaco-editor-wrapper), almost all useful pieces of code were moved here and the different functionalities are exposed via domain specific sub-exports:
+
+- **vscodeApiWrapper**: Contains MonacoVscodeApiWrapper used to handle everything regarding monaco-vscode-api
+- **lcwrapper**: LanguageClientWrapper & LanguageClientsManager help to control one or multiple language clients
+- **editorApp**: EditorApp is used to control a single monaco-editor
+
+### Usage
+
+The `monaco-vscode-api` initialization and start-up can only and must been only done once within an applications' lifecycle. Everything else cab be repeated. If you use TypeScript all configuration is fully typed.
+
+```typescript
+import * as vscode from 'vscode';
+// Import Monaco Language Client components
+import { EditorApp, type EditorAppConfig } from 'monaco-languageclient/editorApp';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
+import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
+
+async function createEditorAndLanguageClient() {
+    const languageId = 'mylang';
+    const code = '// initial editor content';
+    const codeUri = '/workspace/hello.mylang';
+
+    // Monaco VSCode API configuration
+    const vscodeApiConfig: MonacoVscodeApiConfig = {
+        $type: 'extended',
+        viewsConfig: {
+            $type: 'EditorService',
+            // the div to which monaco-editor is added
+            htmlContainer: document.getElementById('monaco-editor-root')!
+        },
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.wordBasedSuggestions': 'off'
+            })
+        },
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+
+    // Language client configuration
+    const languageClientConfig: LanguageClientConfig = {
+        languageId,
+        connection: {
+            options: {
+                $type: 'WebSocketUrl',
+                // at this url the language server for myLang must be reachable
+                url: 'ws://localhost:30000/myLangLS'
+            }
+        },
+        clientOptions: {
+            documentSelector: [languageId],
+            orkspaceFolder: {
+                index: 0,
+                name: 'workspace',
+                uri: vscode.Uri.file('/workspace')
+            }
+        }
+    };
+
+    // editor app / monaco-editor configuration
+    const editorAppConfig: EditorAppConfig = {
+        codeResources: {
+            main: {
+                text: code,
+                uri: codeUri
+            }
+        }
+    };
+
+    // Create the monaco-vscode api Wrapper and start it before anything else
+    const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
+    await apiWrapper.start();
+
+    // Create language client wrapper
+    const lcWrapper = new LanguageClientWrapper(languageClientConfig);
+    await lcWrapper.start();
+
+    // Create and start the editor app
+    const editorApp = new EditorApp(editorAppConfig);
+    await editorApp.start(apiWrapper.getHtmlContainer());
+}
+
+createEditorAndLanguageClient().catch(console.error);
 ```
 
-Once you those services you can no longer make use of monarch based grammars and themes.
-
-## Examples
-
-For a detailed list of examples please look at [this section](<https://github.com/TypeFox/monaco-languageclient#examples-overview>) in the main repository.
-
 ## License
 
 [MIT](https://github.com/TypeFox/monaco-languageclient/blob/main/packages/client/LICENSE)

package/lib/common/utils.d.ts

@@ -1,5 +1,5 @@
 import type { WebSocketUrlParams, WebSocketUrlString } from './commonTypes.js';
 export declare const createUrl: (config: WebSocketUrlParams | WebSocketUrlString) => string;
-export declare const verifyUrlOrCreateDataUrl: (input: string | URL) => string;
+export declare const encodeStringOrUrlToDataUrl: (input: string | URL) => string;
 export declare const delayExecution: (ms: number) => Promise<unknown>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,eAAO,MAAM,SAAS,GAAI,QAAQ,kBAAkB,GAAG,kBAAkB,WA+BxE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,OAAO,MAAM,GAAG,GAAG,WAS3D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,qBAExC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,eAAO,MAAM,SAAS,GAAI,QAAQ,kBAAkB,GAAG,kBAAkB,WA+BxE,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,OAAO,MAAM,GAAG,GAAG,WAS7D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,qBAExC,CAAC"}

package/lib/common/utils.js

@@ -33,7 +33,7 @@ export const createUrl = (config) => {
     }
     return buildUrl;
 };
-export const verifyUrlOrCreateDataUrl = (input) => {
+export const encodeStringOrUrlToDataUrl = (input) => {
     if (input instanceof URL) {
         return input.href;
     }

package/lib/common/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA+C,EAAE,EAAE;IACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAK,MAA6B,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAC3B,CAAC;SAAM,CAAC;QACJ,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,QAAQ,GAAG,GAAG,QAAQ,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;gBACtB,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7D,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3F,CAAC;YAED,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC5D,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC;IAC5D,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE;IACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA+C,EAAE,EAAE;IACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAK,MAA6B,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAC3B,CAAC;SAAM,CAAC;QACJ,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,QAAQ,GAAG,GAAG,QAAQ,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;gBACtB,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7D,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3F,CAAC;YAED,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC9D,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC;IAC5D,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE;IACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}

package/lib/editorApp/config.d.ts

@@ -2,7 +2,6 @@ import { LogLevel } from '@codingame/monaco-vscode-api';
 import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
 import * as monaco from '@codingame/monaco-vscode-editor-api';
 import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
-import { type OverallConfigType } from 'monaco-languageclient/vscodeApiWrapper';
 export declare class ModelRefs {
     modified?: IReference<ITextFileEditorModel>;
     original?: IReference<ITextFileEditorModel>;
@@ -34,7 +33,6 @@ export interface DisposableModelRefs {
 }
 export interface EditorAppConfig {
     id?: string;
-    $type?: OverallConfigType;
     logLevel?: LogLevel | number;
     codeResources?: CodeResources;
     useDiffEditor?: boolean;

package/lib/editorApp/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,qBAAa,SAAS;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,wCAAwC,CAAC;IAC3E,WAAW,CAAC,EAAE;QACV,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC;QAClE,eAAe,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpD,KAAK,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC;YAC1C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;SAC5C,CAAA;KACJ,CAAA;CACJ"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAEnF,qBAAa,SAAS;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,wCAAwC,CAAC;IAC3E,WAAW,CAAC,EAAE;QACV,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC;QAClE,eAAe,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpD,KAAK,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC;YAC1C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;SAC5C,CAAA;KACJ,CAAA;CACJ"}

package/lib/editorApp/config.js

@@ -1,11 +1,10 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 import { LogLevel } from '@codingame/monaco-vscode-api';
 import {} from '@codingame/monaco-vscode-api/monaco';
 import * as monaco from '@codingame/monaco-vscode-editor-api';
-import {} from 'monaco-languageclient/vscodeApiWrapper';
 export class ModelRefs {
     modified;
     original;

package/lib/editorApp/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAE9D,OAAO,EAA0B,MAAM,wCAAwC,CAAC;AAEhF,MAAM,OAAO,SAAS;IAClB,QAAQ,CAAoC;IAC5C,QAAQ,CAAoC;CAC/C"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAG9D,MAAM,OAAO,SAAS;IAClB,QAAQ,CAAoC;IAC5C,QAAQ,CAAoC;CAC/C"}

package/lib/editorApp/editorApp.d.ts

@@ -2,16 +2,15 @@ import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
 import * as monaco from '@codingame/monaco-vscode-editor-api';
 import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
 import { type Logger } from 'monaco-languageclient/common';
-import { type CodeContent, type CodeResources, type EditorAppConfig, type TextContents, type TextModels } from './config.js';
+import type { CodeContent, CodeResources, EditorAppConfig, TextContents, TextModels } from './config.js';
 /**
- * This is the base class for both Monaco Ediotor Apps:
+ * This is the base class for both Monaco Editor Apps:
  * - EditorAppClassic
  * - EditorAppExtended
  *
  * It provides the generic functionality for both implementations.
  */
 export declare class EditorApp {
-    private $type;
     private id;
     private config;
     protected logger: Logger;
@@ -19,13 +18,11 @@ export declare class EditorApp {
     private diffEditor;
     private modelRefs;
     private onTextChanged?;
-    private textChangedDiposeables;
+    private textChangedDisposables;
     private modelDisposables;
     private modelRefDisposeTimeout;
     private startingAwait?;
-    private startingResolve;
     private disposingAwait?;
-    private disposingResolve;
     constructor(userAppConfig?: EditorAppConfig);
     isDiffEditor(): boolean;
     getConfig(): EditorAppConfig;
@@ -35,15 +32,13 @@ export declare class EditorApp {
     getLogger(): Logger;
     registerOnTextChangedCallback(onTextChanged?: (textChanges: TextContents) => void): void;
     setModelRefDisposeTimeout(modelRefDisposeTimeout: number): void;
-    private markStarting;
-    private markStarted;
     isStarting(): boolean;
     getStartingAwait(): Promise<void> | undefined;
     isStarted(): boolean;
     /**
      * Starts the single editor application.
      */
-    start(htmlContainer: HTMLElement): Promise<void>;
+    start(htmlContainer: HTMLElement): Promise<undefined>;
     createEditors(htmlContainer: HTMLElement): Promise<void>;
     updateCode(code: {
         modified?: string;
@@ -54,8 +49,6 @@ export declare class EditorApp {
     private announceModelUpdate;
     dispose(): Promise<void>;
     isDisposed(): boolean;
-    private markDisposing;
-    private markDisposed;
     isDisposing(): boolean;
     getDisposingAwait(): Promise<void> | undefined;
     disposeModelRefs(): Promise<void>;

package/lib/editorApp/editorApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editorApp.d.ts","sourceRoot":"","sources":["../../src/editorApp/editorApp.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACtG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG1E,OAAO,EAAuC,KAAK,WAAW,EAAE,KAAK,aAAa,EAA4B,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5L;;;;;;GAMG;AACH,qBAAa,SAAS;IAElB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;IAEhC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAuB;IAE/C,OAAO,CAAC,MAAM,CAAkD;IAChE,OAAO,CAAC,UAAU,CAAkD;IAEpE,OAAO,CAAC,SAAS,CAA8B;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAsC;IAC5D,OAAO,CAAC,sBAAsB,CAA2B;IACzD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,sBAAsB,CAAM;IAEpC,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,eAAe,CAA4C;IAEnE,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAA4C;gBAExD,aAAa,CAAC,EAAE,eAAe;IA0B3C,YAAY;IAIZ,SAAS,IAAI,eAAe;IAI5B,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAI5D,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAIhE,aAAa,IAAI,UAAU;IAO3B,SAAS;IAIT,6BAA6B,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI;IAI1E,yBAAyB,CAAC,sBAAsB,EAAE,MAAM;IAI/D,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,WAAW;IAKnB,UAAU;IAIV,gBAAgB;IAIhB,SAAS;IAIT;;OAEG;IACG,KAAK,CAAC,aAAa,EAAE,WAAW;IA+EhC,aAAa,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,UAAU,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;IAgBnD,mBAAmB,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CjE,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAgB/G,OAAO,CAAC,mBAAmB;IA4BrB,OAAO;IAyBb,UAAU,IAAI,OAAO;IAMrB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,YAAY;IAKpB,WAAW;IAIX,iBAAiB;IAIX,gBAAgB;IAuCtB,YAAY;IAQZ,YAAY;CAOf;AAED,eAAO,MAAM,qBAAqB,GAAI,YAAY,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,SAOhH,CAAC"}
+{"version":3,"file":"editorApp.d.ts","sourceRoot":"","sources":["../../src/editorApp/editorApp.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACtG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG1E,OAAO,KAAK,EAAuB,WAAW,EAAE,aAAa,EAAuB,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGnJ;;;;;;GAMG;AACH,qBAAa,SAAS;IAElB,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;IAEhC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAuB;IAE/C,OAAO,CAAC,MAAM,CAAkD;IAChE,OAAO,CAAC,UAAU,CAAkD;IAEpE,OAAO,CAAC,SAAS,CAA8B;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAsC;IAC5D,OAAO,CAAC,sBAAsB,CAA2B;IACzD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,sBAAsB,CAAM;IAEpC,OAAO,CAAC,aAAa,CAAC,CAAgB;IAEtC,OAAO,CAAC,cAAc,CAAC,CAAgB;gBAE3B,aAAa,CAAC,EAAE,eAAe;IAyB3C,YAAY;IAIZ,SAAS,IAAI,eAAe;IAI5B,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAI5D,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAIhE,aAAa,IAAI,UAAU;IAO3B,SAAS;IAIT,6BAA6B,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI;IAI1E,yBAAyB,CAAC,sBAAsB,EAAE,MAAM;IAI/D,UAAU;IAIV,gBAAgB;IAIhB,SAAS;IAIT;;OAEG;IACG,KAAK,CAAC,aAAa,EAAE,WAAW;IAoEhC,aAAa,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C9D,UAAU,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;IAgBnD,mBAAmB,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CjE,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAgB/G,OAAO,CAAC,mBAAmB;IA4BrB,OAAO;IA6Bb,UAAU,IAAI,OAAO;IAKrB,WAAW;IAIX,iBAAiB;IAIX,gBAAgB;IAuCtB,YAAY;IAQZ,YAAY;CAOf;AAED,eAAO,MAAM,qBAAqB,GAAI,YAAY,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,SAOhH,CAAC"}

package/lib/editorApp/editorApp.js

@@ -10,14 +10,13 @@ import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWra
 import * as vscode from 'vscode';
 import { ModelRefs } from './config.js';
 /**
- * This is the base class for both Monaco Ediotor Apps:
+ * This is the base class for both Monaco Editor Apps:
  * - EditorAppClassic
  * - EditorAppExtended
  *
  * It provides the generic functionality for both implementations.
  */
 export class EditorApp {
-    $type;
     id;
     config;
     logger = new ConsoleLogger();
@@ -25,15 +24,12 @@ export class EditorApp {
     diffEditor;
     modelRefs = new ModelRefs();
     onTextChanged;
-    textChangedDiposeables = {};
+    textChangedDisposables = {};
     modelDisposables = {};
     modelRefDisposeTimeout = -1;
     startingAwait;
-    startingResolve;
     disposingAwait;
-    disposingResolve;
     constructor(userAppConfig) {
-        this.$type = userAppConfig?.$type ?? 'extended';
         this.id = userAppConfig?.id ?? Math.floor(Math.random() * 1000001).toString();
         if ((userAppConfig?.useDiffEditor ?? false) && !userAppConfig?.codeResources?.original) {
             throw new Error(`Use diff editor was used without a valid config. code: ${userAppConfig?.codeResources?.modified} codeOriginal: ${userAppConfig?.codeResources?.original}`);
@@ -83,15 +79,6 @@ export class EditorApp {
     setModelRefDisposeTimeout(modelRefDisposeTimeout) {
         this.modelRefDisposeTimeout = modelRefDisposeTimeout;
     }
-    markStarting() {
-        this.startingAwait = new Promise((resolve) => {
-            this.startingResolve = resolve;
-        });
-    }
-    markStarted() {
-        this.startingResolve();
-        this.startingAwait = undefined;
-    }
     isStarting() {
         return this.startingAwait !== undefined;
     }
@@ -108,36 +95,61 @@ export class EditorApp {
         if (this.isStarting()) {
             await this.getStartingAwait();
         }
-        this.markStarting();
-        if (!this.isDisposed()) {
-            throw new Error('You called start without properly disposing the EditorApp.');
-        }
-        const languageDef = this.config.languageDef;
-        if (languageDef) {
-            if (this.$type === 'extended') {
-                throw new Error('Language definition is not supported for extended editor apps where textmate is used.');
+        let startingResolve = () => { };
+        this.startingAwait = new Promise((resolve) => {
+            startingResolve = resolve;
+        });
+        try {
+            const envEnhanced = getEnhancedMonacoEnvironment();
+            const viewServiceType = envEnhanced.viewServiceType;
+            // check general error case first
+            if (!(envEnhanced.vscodeApiInitialised ?? false)) {
+                return Promise.reject('monaco-vscode-api was not initialized. Aborting.');
             }
-            // register own language first
-            monaco.languages.register(languageDef.languageExtensionConfig);
-            const languageRegistered = monaco.languages.getLanguages().filter(x => x.id === languageDef.languageExtensionConfig.id);
-            if (languageRegistered.length === 0) {
-                // this is only meaningful for languages supported by monaco out of the box
-                monaco.languages.register({
-                    id: languageDef.languageExtensionConfig.id
-                });
+            if (viewServiceType !== 'EditorService' && viewServiceType !== undefined) {
+                return Promise.reject('No EditorService configured. monaco-editor will not be started.');
             }
-            // apply monarch definitions
-            if (languageDef.monarchLanguage) {
-                monaco.languages.setMonarchTokensProvider(languageDef.languageExtensionConfig.id, languageDef.monarchLanguage);
+            if (!this.isDisposed()) {
+                return Promise.reject('Start was called without properly disposing the EditorApp first.');
             }
-            if (languageDef.theme) {
-                monaco.editor.defineTheme(languageDef.theme.name, languageDef.theme.data);
-                monaco.editor.setTheme(languageDef.theme.name);
+            const languageDef = this.config.languageDef;
+            if (languageDef) {
+                // register own language first
+                monaco.languages.register(languageDef.languageExtensionConfig);
+                const languageRegistered = monaco.languages.getLanguages().filter(x => x.id === languageDef.languageExtensionConfig.id);
+                if (languageRegistered.length === 0) {
+                    // this is only meaningful for languages supported by monaco out of the box
+                    monaco.languages.register({
+                        id: languageDef.languageExtensionConfig.id
+                    });
+                }
+                // apply monarch definitions
+                if (languageDef.monarchLanguage) {
+                    monaco.languages.setMonarchTokensProvider(languageDef.languageExtensionConfig.id, languageDef.monarchLanguage);
+                }
+                if (languageDef.theme) {
+                    monaco.editor.defineTheme(languageDef.theme.name, languageDef.theme.data);
+                    monaco.editor.setTheme(languageDef.theme.name);
+                }
             }
+            if (this.config.editorOptions?.['semanticHighlighting.enabled'] !== undefined) {
+                StandaloneServices.get(IConfigurationService).updateValue('editor.semanticHighlighting.enabled', this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
+            }
+            await this.createEditors(htmlContainer);
+            // everything is fine at this point
+            startingResolve();
+            this.logger.info('EditorApp start completed successfully.');
         }
-        if (this.config.editorOptions?.['semanticHighlighting.enabled'] !== undefined) {
-            StandaloneServices.get(IConfigurationService).updateValue('editor.semanticHighlighting.enabled', this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
+        catch (e) {
+            // in case of further errors (after general ones above)
+            // take the error and build a new rejection to complete the promise
+            return Promise.reject(e);
         }
+        finally {
+            this.startingAwait = undefined;
+        }
+    }
+    async createEditors(htmlContainer) {
         // ensure proper default resources are initialized, uris have to be unique
         const modified = {
             text: this.config.codeResources?.modified?.text ?? '',
@@ -153,31 +165,10 @@ export class EditorApp {
             };
             this.modelRefs.original = await this.buildModelReference(original, this.logger);
         }
-        try {
-            const envEnhanced = getEnhancedMonacoEnvironment();
-            const viewServiceType = envEnhanced.viewServiceType;
-            if (viewServiceType === 'EditorService' || viewServiceType === undefined) {
-                this.logger.info(`Starting monaco-editor (${this.id})`);
-                await this.createEditors(htmlContainer);
-            }
-            else {
-                this.logger.info('No EditorService configured. monaco-editor will not be started.');
-            }
-            this.logger.info('EditorApp start completed successfully.');
-            // eslint-disable-next-line no-useless-catch
-        }
-        catch (e) {
-            throw e;
-        }
-        finally {
-            // in case of rejection, mark as started, otherwise the promise will never resolve
-            this.markStarted();
-        }
-    }
-    async createEditors(htmlContainer) {
+        this.logger.info(`Starting monaco-editor (${this.id})`);
         if (this.isDiffEditor()) {
             this.diffEditor = monaco.editor.createDiffEditor(htmlContainer, this.config.diffEditorOptions);
-            const modified = this.modelRefs.modified?.object.textEditorModel ?? undefined;
+            const modified = this.modelRefs.modified.object.textEditorModel ?? undefined;
             const original = this.modelRefs.original?.object.textEditorModel ?? undefined;
             if (modified !== undefined && original !== undefined) {
                 const model = {
@@ -190,7 +181,7 @@ export class EditorApp {
         }
         else {
             const model = {
-                modified: this.modelRefs.modified?.object.textEditorModel
+                modified: this.modelRefs.modified.object.textEditorModel
             };
             this.editor = monaco.editor.create(htmlContainer, {
                 ...this.config.editorOptions,
@@ -279,16 +270,16 @@ export class EditorApp {
         if (this.onTextChanged !== undefined) {
             let changed = false;
             if (textModels.modified !== undefined && textModels.modified !== null) {
-                const old = this.textChangedDiposeables.modified;
-                this.textChangedDiposeables.modified = textModels.modified.onDidChangeContent(() => {
+                const old = this.textChangedDisposables.modified;
+                this.textChangedDisposables.modified = textModels.modified.onDidChangeContent(() => {
                     didModelContentChange(textModels, this.onTextChanged);
                 });
                 old?.dispose();
                 changed = true;
             }
             if (textModels.original !== undefined && textModels.original !== null) {
-                const old = this.textChangedDiposeables.original;
-                this.textChangedDiposeables.original = textModels.original.onDidChangeContent(() => {
+                const old = this.textChangedDisposables.original;
+                this.textChangedDisposables.original = textModels.original.onDidChangeContent(() => {
                     didModelContentChange(textModels, this.onTextChanged);
                 });
                 old?.dispose();
@@ -304,7 +295,10 @@ export class EditorApp {
         if (this.isDisposing()) {
             await this.getDisposingAwait();
         }
-        this.markDisposing();
+        let disposingResolve = () => { };
+        this.disposingAwait = new Promise((resolve) => {
+            disposingResolve = resolve;
+        });
         if (this.editor) {
             this.editor.dispose();
             this.editor = undefined;
@@ -313,27 +307,18 @@ export class EditorApp {
             this.diffEditor.dispose();
             this.diffEditor = undefined;
         }
-        this.textChangedDiposeables.modified?.dispose();
-        this.textChangedDiposeables.original?.dispose();
-        this.textChangedDiposeables.modified = undefined;
-        this.textChangedDiposeables.original = undefined;
+        this.textChangedDisposables.modified?.dispose();
+        this.textChangedDisposables.original?.dispose();
+        this.textChangedDisposables.modified = undefined;
+        this.textChangedDisposables.original = undefined;
         await this.disposeModelRefs();
-        this.markDisposed();
+        disposingResolve();
+        this.disposingAwait = undefined;
     }
     isDisposed() {
         return this.editor === undefined && this.diffEditor === undefined &&
-            // this.textChangedDiposeables.modified === undefined && this.textChangedDiposeables.original === undefined &&
             this.modelDisposables.original === undefined && this.modelDisposables.modified === undefined;
     }
-    markDisposing() {
-        this.disposingAwait = new Promise((resolve) => {
-            this.disposingResolve = resolve;
-        });
-    }
-    markDisposed() {
-        this.disposingResolve();
-        this.disposingAwait = undefined;
-    }
     isDisposing() {
         return this.disposingAwait !== undefined;
     }
@@ -341,7 +326,7 @@ export class EditorApp {
         return this.disposingAwait;
     }
     async disposeModelRefs() {
-        const diposeRefs = () => {
+        const disposeRefs = () => {
             if (this.logger.getLevel() === LogLevel.Debug) {
                 const models = monaco.editor.getModels();
                 this.logger.debug('Current model URIs:');
@@ -349,11 +334,11 @@ export class EditorApp {
                     this.logger.debug(`${model.uri.toString()}`);
                 });
             }
-            if (this.modelDisposables.modified !== undefined && !(this.modelDisposables.modified.object.isDisposed() === true)) {
+            if (this.modelDisposables.modified !== undefined && !this.modelDisposables.modified.object.isDisposed()) {
                 this.modelDisposables.modified.dispose();
                 this.modelDisposables.modified = undefined;
             }
-            if (this.modelDisposables.original !== undefined && !(this.modelDisposables.original.object.isDisposed() === true)) {
+            if (this.modelDisposables.original !== undefined && !this.modelDisposables.original.object.isDisposed()) {
                 this.modelDisposables.original.dispose();
                 this.modelDisposables.original = undefined;
             }
@@ -369,12 +354,12 @@ export class EditorApp {
         if (this.modelRefDisposeTimeout > 0) {
             this.logger.debug('Using async dispose of model references');
             await new Promise(resolve => setTimeout(() => {
-                diposeRefs();
+                disposeRefs();
                 resolve();
             }, this.modelRefDisposeTimeout));
         }
         else {
-            diposeRefs();
+            disposeRefs();
         }
     }
     updateLayout() {