monaco-languageclient 10.0.0-next.1 → 10.0.0-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -1
- package/README.md +98 -34
- package/lib/editorApp/config.d.ts +0 -2
- package/lib/editorApp/config.d.ts.map +1 -1
- package/lib/editorApp/config.js +0 -1
- package/lib/editorApp/config.js.map +1 -1
- package/lib/editorApp/editorApp.d.ts +0 -1
- package/lib/editorApp/editorApp.d.ts.map +1 -1
- package/lib/editorApp/editorApp.js +0 -5
- package/lib/editorApp/editorApp.js.map +1 -1
- package/lib/vscode/apiWrapper.d.ts +17 -5
- package/lib/vscode/apiWrapper.d.ts.map +1 -1
- package/lib/vscode/apiWrapper.js +44 -25
- package/lib/vscode/apiWrapper.js.map +1 -1
- package/lib/vscode/config.d.ts +8 -6
- package/lib/vscode/config.d.ts.map +1 -1
- package/lib/vscode/utils.d.ts.map +1 -1
- package/lib/vscode/utils.js +3 -4
- package/lib/vscode/utils.js.map +1 -1
- package/lib/wrapper/lcconfig.d.ts +3 -3
- package/lib/wrapper/lcconfig.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.d.ts +2 -1
- package/lib/wrapper/lcmanager.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.js +20 -16
- package/lib/wrapper/lcmanager.js.map +1 -1
- package/lib/wrapper/lcwrapper.d.ts +1 -1
- package/lib/wrapper/lcwrapper.d.ts.map +1 -1
- package/lib/wrapper/lcwrapper.js +9 -8
- package/lib/wrapper/lcwrapper.js.map +1 -1
- package/package.json +38 -38
- package/src/editorApp/config.ts +0 -2
- package/src/editorApp/editorApp.ts +2 -7
- package/src/vscode/apiWrapper.ts +61 -29
- package/src/vscode/config.ts +12 -7
- package/src/vscode/utils.ts +3 -4
- package/src/wrapper/lcconfig.ts +4 -4
- package/src/wrapper/lcmanager.ts +22 -17
- package/src/wrapper/lcwrapper.ts +9 -8
package/lib/vscode/config.d.ts
CHANGED
|
@@ -5,19 +5,22 @@ import type { IExtensionManifest } from '@codingame/monaco-vscode-api/extensions
|
|
|
5
5
|
import type { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench';
|
|
6
6
|
import type { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
7
7
|
import type { Logger } from 'monaco-languageclient/common';
|
|
8
|
+
export type OverallConfigType = 'extended' | 'classic';
|
|
9
|
+
export type ViewsConfigTypes = 'EditorService' | 'ViewsService' | 'WorkspaceService';
|
|
10
|
+
export type HtmlContainerConfig = HTMLElement | 'ReactPlaceholder';
|
|
8
11
|
export interface MonacoEnvironmentEnhanced extends monaco.Environment {
|
|
9
12
|
vscodeApiInitialising?: boolean;
|
|
10
13
|
vscodeApiInitialised?: boolean;
|
|
11
14
|
vscodeApiGlobalInitAwait?: Promise<void>;
|
|
12
15
|
vscodeApiGlobalInitResolve?: ((value: void | PromiseLike<void>) => void);
|
|
13
|
-
viewServiceType?:
|
|
16
|
+
viewServiceType?: ViewsConfigTypes;
|
|
14
17
|
}
|
|
15
|
-
export type OverallConfigType = 'extended' | 'classic';
|
|
16
18
|
export interface UserConfiguration {
|
|
17
19
|
json?: string;
|
|
18
20
|
}
|
|
19
21
|
export interface ViewsConfig {
|
|
20
|
-
|
|
22
|
+
$type: ViewsConfigTypes;
|
|
23
|
+
htmlContainer: HtmlContainerConfig;
|
|
21
24
|
openEditorFunc?: OpenEditor;
|
|
22
25
|
htmlAugmentationInstructions?: (htmlContainer: HTMLElement | null | undefined) => void;
|
|
23
26
|
viewsInitFunc?: () => Promise<void>;
|
|
@@ -28,12 +31,11 @@ export interface ExtensionConfig {
|
|
|
28
31
|
}
|
|
29
32
|
export interface MonacoVscodeApiConfig {
|
|
30
33
|
$type: OverallConfigType;
|
|
31
|
-
|
|
32
|
-
serviceOverrides
|
|
34
|
+
viewsConfig: ViewsConfig;
|
|
35
|
+
serviceOverrides?: monaco.editor.IEditorOverrideServices;
|
|
33
36
|
logLevel?: LogLevel | number;
|
|
34
37
|
workspaceConfig?: IWorkbenchConstructionOptions;
|
|
35
38
|
userConfiguration?: UserConfiguration;
|
|
36
|
-
viewsConfig?: ViewsConfig;
|
|
37
39
|
envOptions?: EnvironmentOverride;
|
|
38
40
|
extensions?: ExtensionConfig[];
|
|
39
41
|
monacoWorkerFactory?: (logger?: Logger) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/vscode/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,0BAA0B,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IACzE,eAAe,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/vscode/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,cAAc,GAAG,kBAAkB,CAAC;AAErF,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG,kBAAkB,CAAC;AAEnE,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,0BAA0B,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IACzE,eAAe,CAAC,EAAE,gBAAgB,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,aAAa,EAAE,mBAAmB,CAAC;IACnC,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,4BAA4B,CAAC,EAAE,CAAC,aAAa,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI,CAAC;IACvF,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,iBAAiB,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACzD,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,6BAA6B,CAAC;IAChD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,mBAAmB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,EAAE;QACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,2BAA2B,CAAC,EAAE,OAAO,CAAC;KACzC,CAAC;CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/vscode/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAGnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE7D,eAAO,MAAM,4BAA4B,QAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/vscode/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAGnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE7D,eAAO,MAAM,4BAA4B,QAAO,yBAgB/C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,CAAC,MAAM,CAAC,uBAAuB,EAAE,SAAS,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,kBAAkB,MAAM,CAAC,MAAM,CAAC,uBAAuB,EAAE,WAAW,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAMtI,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAU,qBAAqB,OAAO,EAAE,cAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAY7H,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAG/B,CAAC"}
|
package/lib/vscode/utils.js
CHANGED
|
@@ -6,11 +6,10 @@ import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
|
6
6
|
import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override';
|
|
7
7
|
import { FakeWorker as Worker } from 'monaco-languageclient/workerFactory';
|
|
8
8
|
export const getEnhancedMonacoEnvironment = () => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
monWin.MonacoEnvironment = {};
|
|
9
|
+
if (typeof MonacoEnvironment === 'undefined') {
|
|
10
|
+
globalThis.MonacoEnvironment = {};
|
|
12
11
|
}
|
|
13
|
-
const envEnhanced =
|
|
12
|
+
const envEnhanced = MonacoEnvironment;
|
|
14
13
|
if (envEnhanced.vscodeApiInitialising === undefined) {
|
|
15
14
|
envEnhanced.vscodeApiInitialising = false;
|
|
16
15
|
}
|
package/lib/vscode/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/vscode/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAG9D,OAAO,2BAA2B,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAG3E,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAA8B,EAAE;IACxE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/vscode/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAG9D,OAAO,2BAA2B,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAG3E,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAA8B,EAAE;IACxE,IAAI,OAAO,iBAAiB,KAAK,WAAW,EAAE,CAAC;QAC3C,UAAU,CAAC,iBAAiB,GAAG,EAAE,CAAC;IACtC,CAAC;IACD,MAAM,WAAW,GAAG,iBAA8C,CAAC;IACnE,IAAI,WAAW,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;QAClD,WAAW,CAAC,qBAAqB,GAAG,KAAK,CAAC;IAC9C,CAAC;IACD,IAAI,WAAW,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACjD,WAAW,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAC7C,CAAC;IACD,IAAI,WAAW,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QAC5C,WAAW,CAAC,eAAe,GAAG,eAAe,CAAC;IAClD,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAA+C,EAAE,MAAe,EAAE,EAAE;IACrG,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,oBAAoB,WAAW,EAAE,CAAC,CAAC;IACrD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,gBAAuD,EAAE,QAAgD,EAAE,EAAE;IACvI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QACrC,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,mBAA4B,EAAE,YAAmD,EAAE,EAAE;IAC9H,IAAI,mBAAmB,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,2DAA2D,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzI,MAAM,YAAY,GAAiB;YAC/B,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC9B,OAAO,EAAE,UAAU,CAAC,OAAO;SAC9B,CAAC;QAEF,aAAa,CAAC,YAAY,EAAE;YACxB,GAAG,2BAA2B,CAAC,YAAY,CAAC;SAC/C,CAAC,CAAC;IACP,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAe,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;IACjF,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1F,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -5,11 +5,13 @@ export interface ConnectionConfig {
|
|
|
5
5
|
messageTransports?: MessageTransports;
|
|
6
6
|
}
|
|
7
7
|
export interface LanguageClientConfig {
|
|
8
|
-
|
|
8
|
+
languageId: string;
|
|
9
9
|
connection: ConnectionConfig;
|
|
10
10
|
clientOptions: LanguageClientOptions;
|
|
11
11
|
restartOptions?: LanguageClientRestartOptions;
|
|
12
12
|
disposeWorker?: boolean;
|
|
13
|
+
overwriteExisting?: boolean;
|
|
14
|
+
enforceDispose?: boolean;
|
|
13
15
|
}
|
|
14
16
|
export interface LanguageClientRestartOptions {
|
|
15
17
|
retries: number;
|
|
@@ -18,7 +20,5 @@ export interface LanguageClientRestartOptions {
|
|
|
18
20
|
}
|
|
19
21
|
export interface LanguageClientConfigs {
|
|
20
22
|
configs: Record<string, LanguageClientConfig>;
|
|
21
|
-
overwriteExisting?: boolean;
|
|
22
|
-
enforceDispose?: boolean;
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=lcconfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcconfig.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcconfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,uBAAuB,CAAC;IACjC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED,MAAM,WAAW,oBAAoB;IACjC,
|
|
1
|
+
{"version":3,"file":"lcconfig.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcconfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,uBAAuB,CAAC;IACjC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,aAAa,EAAE,qBAAqB,CAAC;IACrC,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,4BAA4B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CACjD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Logger } from 'monaco-languageclient/common';
|
|
2
|
-
import type { LanguageClientConfigs } from './lcconfig.js';
|
|
2
|
+
import type { LanguageClientConfig, LanguageClientConfigs } from './lcconfig.js';
|
|
3
3
|
import { LanguageClientWrapper } from './lcwrapper.js';
|
|
4
4
|
export declare class LanguageClientsManager {
|
|
5
5
|
private logger?;
|
|
@@ -10,6 +10,7 @@ export declare class LanguageClientsManager {
|
|
|
10
10
|
getLanguageClientWrapper(languageId: string): LanguageClientWrapper | undefined;
|
|
11
11
|
getLanguageClient(languageId: string): import("../index.js").MonacoLanguageClient | undefined;
|
|
12
12
|
getWorker(languageId: string): Worker | undefined;
|
|
13
|
+
setConfig(languageClientConfig: LanguageClientConfig): Promise<void>;
|
|
13
14
|
setConfigs(languageClientConfigs: LanguageClientConfigs): Promise<void>;
|
|
14
15
|
start(): Promise<void | void[]>;
|
|
15
16
|
isStarted(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcmanager.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"lcmanager.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,sBAAsB,CAAiD;gBAEnE,MAAM,CAAC,EAAE,MAAM;IAI3B,mBAAmB,IAAI,OAAO;IAI9B,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS;IAI/E,iBAAiB,CAAC,UAAU,EAAE,MAAM;IAIpC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBpE,UAAU,CAAC,qBAAqB,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvE,KAAK,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IAUrC,SAAS,IAAI,OAAO;IAUd,OAAO,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;CAU1C"}
|
package/lib/wrapper/lcmanager.js
CHANGED
|
@@ -22,24 +22,28 @@ export class LanguageClientsManager {
|
|
|
22
22
|
getWorker(languageId) {
|
|
23
23
|
return this.languageClientWrappers.get(languageId)?.getWorker();
|
|
24
24
|
}
|
|
25
|
+
async setConfig(languageClientConfig) {
|
|
26
|
+
const languageId = languageClientConfig.languageId;
|
|
27
|
+
const current = this.languageClientWrappers.get(languageId);
|
|
28
|
+
const lcw = new LanguageClientWrapper(languageClientConfig, this.logger);
|
|
29
|
+
if (current !== undefined) {
|
|
30
|
+
if (languageClientConfig.overwriteExisting === true) {
|
|
31
|
+
if (languageClientConfig.enforceDispose === true) {
|
|
32
|
+
await current.dispose();
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
throw new Error(`A languageclient config with id "${languageId}" already exists and you confiured to not override.`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
this.languageClientWrappers.set(languageId, lcw);
|
|
40
|
+
}
|
|
25
41
|
async setConfigs(languageClientConfigs) {
|
|
26
42
|
this.languageClientConfigs = languageClientConfigs;
|
|
27
|
-
const
|
|
28
|
-
if (
|
|
29
|
-
for (const
|
|
30
|
-
|
|
31
|
-
const lcw = new LanguageClientWrapper(lcc, this.logger);
|
|
32
|
-
if (current !== undefined) {
|
|
33
|
-
if (languageClientConfigs.overwriteExisting === true) {
|
|
34
|
-
if (languageClientConfigs.enforceDispose === true) {
|
|
35
|
-
await current.dispose();
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
throw new Error(`A languageclient config with id "${languageId}" already exists and you confiured to not override.`);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
this.languageClientWrappers.set(languageId, lcw);
|
|
43
|
+
const lccs = Object.values(this.languageClientConfigs.configs);
|
|
44
|
+
if (lccs.length > 0) {
|
|
45
|
+
for (const lcc of lccs) {
|
|
46
|
+
await this.setConfig(lcc);
|
|
43
47
|
}
|
|
44
48
|
}
|
|
45
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcmanager.js","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,OAAO,sBAAsB;IAEvB,MAAM,CAAU;IAChB,qBAAqB,CAAyB;IAC9C,sBAAsB,GAAuC,IAAI,GAAG,EAAE,CAAC;IAE/E,YAAY,MAAe;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,wBAAwB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,iBAAiB,CAAC,UAAkB;QAChC,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC5E,CAAC;IAED,SAAS,CAAC,UAAkB;QACxB,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"lcmanager.js","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class LanguageClientWrapper {
|
|
|
11
11
|
private languageClientConfig;
|
|
12
12
|
private worker?;
|
|
13
13
|
private port?;
|
|
14
|
-
private
|
|
14
|
+
private languageId;
|
|
15
15
|
private logger;
|
|
16
16
|
constructor(config: LanguageClientConfig, logger?: Logger);
|
|
17
17
|
haveLanguageClient(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcwrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"AAMA,OAAO,EAA4B,iBAAiB,EAAS,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAa,KAAK,MAAM,EAAE,KAAK,yBAAyB,EAAE,KAAK,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAEtI,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAExF,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;CACzB;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,cAAc,CAAC,CAAuB;IAC9C,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,IAAI,CAAC,CAAc;IAC3B,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"lcwrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"AAMA,OAAO,EAA4B,iBAAiB,EAAS,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAa,KAAK,MAAM,EAAE,KAAK,yBAAyB,EAAE,KAAK,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAEtI,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAExF,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;CACzB;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,cAAc,CAAC,CAAuB;IAC9C,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,IAAI,CAAC,CAAc;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,MAAM;IAMzD,kBAAkB,IAAI,OAAO;IAI7B,iBAAiB,IAAI,oBAAoB,GAAG,SAAS;IAIrD,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,SAAS,IAAI,OAAO;IAId,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B;;;;;OAKG;IACG,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAQlE,6BAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;cA6B3G,0BAA0B,CAAC,UAAU,EAAE,yBAAyB,GAAG,yBAAyB,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;cAqCrJ,0BAA0B,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI;IAsExI,SAAS,CAAC,wBAAwB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAE,4BAA4B;IA6BtH,SAAS,CAAC,aAAa;IAKjB,OAAO,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1D,YAAY;CAOf"}
|
package/lib/wrapper/lcwrapper.js
CHANGED
|
@@ -12,11 +12,11 @@ export class LanguageClientWrapper {
|
|
|
12
12
|
languageClientConfig;
|
|
13
13
|
worker;
|
|
14
14
|
port;
|
|
15
|
-
|
|
15
|
+
languageId;
|
|
16
16
|
logger;
|
|
17
17
|
constructor(config, logger) {
|
|
18
18
|
this.languageClientConfig = config;
|
|
19
|
-
this.
|
|
19
|
+
this.languageId = this.languageClientConfig.languageId;
|
|
20
20
|
this.logger = logger;
|
|
21
21
|
}
|
|
22
22
|
haveLanguageClient() {
|
|
@@ -80,7 +80,7 @@ export class LanguageClientWrapper {
|
|
|
80
80
|
};
|
|
81
81
|
webSocket.onerror = (ev) => {
|
|
82
82
|
const languageClientError = {
|
|
83
|
-
message: `languageClientWrapper (${this.
|
|
83
|
+
message: `languageClientWrapper (${this.languageId}): Websocket connection failed.`,
|
|
84
84
|
error: ev.error ?? 'No error was provided.'
|
|
85
85
|
};
|
|
86
86
|
reject(languageClientError);
|
|
@@ -96,7 +96,7 @@ export class LanguageClientWrapper {
|
|
|
96
96
|
});
|
|
97
97
|
this.worker.onerror = (ev) => {
|
|
98
98
|
const languageClientError = {
|
|
99
|
-
message: `languageClientWrapper (${this.
|
|
99
|
+
message: `languageClientWrapper (${this.languageId}): Illegal worker configuration detected.`,
|
|
100
100
|
error: ev.error ?? 'No error was provided.'
|
|
101
101
|
};
|
|
102
102
|
reject(languageClientError);
|
|
@@ -128,7 +128,8 @@ export class LanguageClientWrapper {
|
|
|
128
128
|
resolve();
|
|
129
129
|
}
|
|
130
130
|
const mlcConfig = {
|
|
131
|
-
|
|
131
|
+
id: this.languageClientConfig.languageId,
|
|
132
|
+
name: 'Monaco Wrapper Language Client',
|
|
132
133
|
clientOptions: {
|
|
133
134
|
// disable the default error handler...
|
|
134
135
|
errorHandler: {
|
|
@@ -174,12 +175,12 @@ export class LanguageClientWrapper {
|
|
|
174
175
|
}
|
|
175
176
|
catch (e) {
|
|
176
177
|
const languageClientError = {
|
|
177
|
-
message: `languageClientWrapper (${this.
|
|
178
|
+
message: `languageClientWrapper (${this.languageId}): Start was unsuccessful.`,
|
|
178
179
|
error: Object.hasOwn(e ?? {}, 'cause') ? e : 'No error was provided.'
|
|
179
180
|
};
|
|
180
181
|
reject(languageClientError);
|
|
181
182
|
}
|
|
182
|
-
this.logger?.info(`languageClientWrapper (${this.
|
|
183
|
+
this.logger?.info(`languageClientWrapper (${this.languageId}): Started successfully.`);
|
|
183
184
|
resolve();
|
|
184
185
|
starting = false;
|
|
185
186
|
}
|
|
@@ -224,7 +225,7 @@ export class LanguageClientWrapper {
|
|
|
224
225
|
}
|
|
225
226
|
catch (e) {
|
|
226
227
|
const languageClientError = {
|
|
227
|
-
message: `languageClientWrapper (${this.
|
|
228
|
+
message: `languageClientWrapper (${this.languageId}): Disposing the monaco-languageclient resulted in error.`,
|
|
228
229
|
error: Object.hasOwn(e ?? {}, 'cause') ? e : 'No error was provided.'
|
|
229
230
|
};
|
|
230
231
|
return Promise.reject(languageClientError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcwrapper.js","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACvG,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACtG,OAAO,EAAE,SAAS,EAA+E,MAAM,8BAA8B,CAAC;AACtI,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAQ7D,MAAM,OAAO,qBAAqB;IAEtB,cAAc,CAAwB;IACtC,oBAAoB,CAAuB;IAC3C,MAAM,CAAU;IAChB,IAAI,CAAe;IACnB,
|
|
1
|
+
{"version":3,"file":"lcwrapper.js","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient",
|
|
3
|
-
"version": "10.0.0-next.
|
|
3
|
+
"version": "10.0.0-next.2",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -86,8 +86,8 @@
|
|
|
86
86
|
"npm": ">=10.2.3"
|
|
87
87
|
},
|
|
88
88
|
"volta": {
|
|
89
|
-
"node": "22.
|
|
90
|
-
"npm": "10.9.
|
|
89
|
+
"node": "22.19.0",
|
|
90
|
+
"npm": "10.9.3"
|
|
91
91
|
},
|
|
92
92
|
"files": [
|
|
93
93
|
"lib",
|
|
@@ -97,46 +97,46 @@
|
|
|
97
97
|
"LICENSE"
|
|
98
98
|
],
|
|
99
99
|
"dependencies": {
|
|
100
|
-
"@codingame/monaco-vscode-api": "
|
|
101
|
-
"@codingame/monaco-vscode-configuration-service-override": "
|
|
102
|
-
"@codingame/monaco-vscode-editor-api": "
|
|
103
|
-
"@codingame/monaco-vscode-editor-service-override": "
|
|
104
|
-
"@codingame/monaco-vscode-extensions-service-override": "
|
|
105
|
-
"@codingame/monaco-vscode-extension-api": "
|
|
106
|
-
"@codingame/monaco-vscode-languages-service-override": "
|
|
107
|
-
"@codingame/monaco-vscode-language-pack-cs": "
|
|
108
|
-
"@codingame/monaco-vscode-language-pack-de": "
|
|
109
|
-
"@codingame/monaco-vscode-language-pack-es": "
|
|
110
|
-
"@codingame/monaco-vscode-language-pack-fr": "
|
|
111
|
-
"@codingame/monaco-vscode-language-pack-it": "
|
|
112
|
-
"@codingame/monaco-vscode-language-pack-ja": "
|
|
113
|
-
"@codingame/monaco-vscode-language-pack-ko": "
|
|
114
|
-
"@codingame/monaco-vscode-language-pack-pl": "
|
|
115
|
-
"@codingame/monaco-vscode-language-pack-pt-br": "
|
|
116
|
-
"@codingame/monaco-vscode-language-pack-qps-ploc": "
|
|
117
|
-
"@codingame/monaco-vscode-language-pack-ru": "
|
|
118
|
-
"@codingame/monaco-vscode-language-pack-tr": "
|
|
119
|
-
"@codingame/monaco-vscode-language-pack-zh-hans": "
|
|
120
|
-
"@codingame/monaco-vscode-language-pack-zh-hant": "
|
|
121
|
-
"@codingame/monaco-vscode-localization-service-override": "
|
|
122
|
-
"@codingame/monaco-vscode-log-service-override": "
|
|
123
|
-
"@codingame/monaco-vscode-model-service-override": "
|
|
124
|
-
"@codingame/monaco-vscode-monarch-service-override": "
|
|
125
|
-
"@codingame/monaco-vscode-textmate-service-override": "
|
|
126
|
-
"@codingame/monaco-vscode-theme-defaults-default-extension": "
|
|
127
|
-
"@codingame/monaco-vscode-theme-service-override": "
|
|
128
|
-
"@codingame/monaco-vscode-views-service-override": "
|
|
129
|
-
"@codingame/monaco-vscode-workbench-service-override": "
|
|
100
|
+
"@codingame/monaco-vscode-api": "^21.0.1",
|
|
101
|
+
"@codingame/monaco-vscode-configuration-service-override": "^21.0.1",
|
|
102
|
+
"@codingame/monaco-vscode-editor-api": "^21.0.1",
|
|
103
|
+
"@codingame/monaco-vscode-editor-service-override": "^21.0.1",
|
|
104
|
+
"@codingame/monaco-vscode-extensions-service-override": "^21.0.1",
|
|
105
|
+
"@codingame/monaco-vscode-extension-api": "^21.0.1",
|
|
106
|
+
"@codingame/monaco-vscode-languages-service-override": "^21.0.1",
|
|
107
|
+
"@codingame/monaco-vscode-language-pack-cs": "^21.0.1",
|
|
108
|
+
"@codingame/monaco-vscode-language-pack-de": "^21.0.1",
|
|
109
|
+
"@codingame/monaco-vscode-language-pack-es": "^21.0.1",
|
|
110
|
+
"@codingame/monaco-vscode-language-pack-fr": "^21.0.1",
|
|
111
|
+
"@codingame/monaco-vscode-language-pack-it": "^21.0.1",
|
|
112
|
+
"@codingame/monaco-vscode-language-pack-ja": "^21.0.1",
|
|
113
|
+
"@codingame/monaco-vscode-language-pack-ko": "^21.0.1",
|
|
114
|
+
"@codingame/monaco-vscode-language-pack-pl": "^21.0.1",
|
|
115
|
+
"@codingame/monaco-vscode-language-pack-pt-br": "^21.0.1",
|
|
116
|
+
"@codingame/monaco-vscode-language-pack-qps-ploc": "^21.0.1",
|
|
117
|
+
"@codingame/monaco-vscode-language-pack-ru": "^21.0.1",
|
|
118
|
+
"@codingame/monaco-vscode-language-pack-tr": "^21.0.1",
|
|
119
|
+
"@codingame/monaco-vscode-language-pack-zh-hans": "^21.0.1",
|
|
120
|
+
"@codingame/monaco-vscode-language-pack-zh-hant": "^21.0.1",
|
|
121
|
+
"@codingame/monaco-vscode-localization-service-override": "^21.0.1",
|
|
122
|
+
"@codingame/monaco-vscode-log-service-override": "^21.0.1",
|
|
123
|
+
"@codingame/monaco-vscode-model-service-override": "^21.0.1",
|
|
124
|
+
"@codingame/monaco-vscode-monarch-service-override": "^21.0.1",
|
|
125
|
+
"@codingame/monaco-vscode-textmate-service-override": "^21.0.1",
|
|
126
|
+
"@codingame/monaco-vscode-theme-defaults-default-extension": "^21.0.1",
|
|
127
|
+
"@codingame/monaco-vscode-theme-service-override": "^21.0.1",
|
|
128
|
+
"@codingame/monaco-vscode-views-service-override": "^21.0.1",
|
|
129
|
+
"@codingame/monaco-vscode-workbench-service-override": "^21.0.1",
|
|
130
130
|
"vscode-languageclient": "~9.0.1",
|
|
131
131
|
"vscode-languageserver-protocol": "~3.17.5",
|
|
132
132
|
"vscode-ws-jsonrpc": "~3.5.0"
|
|
133
133
|
},
|
|
134
134
|
"devDependencies": {
|
|
135
|
-
"@codingame/monaco-vscode-standalone-languages": "
|
|
136
|
-
"@codingame/monaco-vscode-standalone-css-language-features": "
|
|
137
|
-
"@codingame/monaco-vscode-standalone-html-language-features": "
|
|
138
|
-
"@codingame/monaco-vscode-standalone-json-language-features": "
|
|
139
|
-
"@codingame/monaco-vscode-standalone-typescript-language-features": "
|
|
135
|
+
"@codingame/monaco-vscode-standalone-languages": "^21.0.1",
|
|
136
|
+
"@codingame/monaco-vscode-standalone-css-language-features": "^21.0.1",
|
|
137
|
+
"@codingame/monaco-vscode-standalone-html-language-features": "^21.0.1",
|
|
138
|
+
"@codingame/monaco-vscode-standalone-json-language-features": "^21.0.1",
|
|
139
|
+
"@codingame/monaco-vscode-standalone-typescript-language-features": "^21.0.1"
|
|
140
140
|
},
|
|
141
141
|
|
|
142
142
|
"scripts": {
|
package/src/editorApp/config.ts
CHANGED
|
@@ -7,7 +7,6 @@ import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
|
7
7
|
import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
|
|
8
8
|
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
9
9
|
import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
|
|
10
|
-
import { type OverallConfigType } from 'monaco-languageclient/vscodeApiWrapper';
|
|
11
10
|
|
|
12
11
|
export class ModelRefs {
|
|
13
12
|
modified?: IReference<ITextFileEditorModel>;
|
|
@@ -47,7 +46,6 @@ export interface DisposableModelRefs {
|
|
|
47
46
|
|
|
48
47
|
export interface EditorAppConfig {
|
|
49
48
|
id?: string;
|
|
50
|
-
$type?: OverallConfigType;
|
|
51
49
|
logLevel?: LogLevel | number;
|
|
52
50
|
codeResources?: CodeResources;
|
|
53
51
|
useDiffEditor?: boolean;
|
|
@@ -8,7 +8,7 @@ import { createModelReference, type ITextFileEditorModel } from '@codingame/mona
|
|
|
8
8
|
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
9
9
|
import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
|
|
10
10
|
import { ConsoleLogger, type Logger } from 'monaco-languageclient/common';
|
|
11
|
-
import { getEnhancedMonacoEnvironment
|
|
11
|
+
import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWrapper';
|
|
12
12
|
import * as vscode from 'vscode';
|
|
13
13
|
import type { CallbackDisposeable, CodeContent, CodeResources, DisposableModelRefs, EditorAppConfig, TextContents, TextModels } from './config.js';
|
|
14
14
|
import { ModelRefs } from './config.js';
|
|
@@ -22,7 +22,6 @@ import { ModelRefs } from './config.js';
|
|
|
22
22
|
*/
|
|
23
23
|
export class EditorApp {
|
|
24
24
|
|
|
25
|
-
private $type: OverallConfigType;
|
|
26
25
|
private id: string;
|
|
27
26
|
private config: EditorAppConfig;
|
|
28
27
|
|
|
@@ -44,7 +43,6 @@ export class EditorApp {
|
|
|
44
43
|
private disposingAwait?: Promise<void>;
|
|
45
44
|
|
|
46
45
|
constructor(userAppConfig?: EditorAppConfig) {
|
|
47
|
-
this.$type = userAppConfig?.$type ?? 'extended';
|
|
48
46
|
this.id = userAppConfig?.id ?? Math.floor(Math.random() * 1000001).toString();
|
|
49
47
|
if ((userAppConfig?.useDiffEditor ?? false) && !userAppConfig?.codeResources?.original) {
|
|
50
48
|
throw new Error(`Use diff editor was used without a valid config. code: ${userAppConfig?.codeResources?.modified} codeOriginal: ${userAppConfig?.codeResources?.original}`);
|
|
@@ -146,9 +144,6 @@ export class EditorApp {
|
|
|
146
144
|
|
|
147
145
|
const languageDef = this.config.languageDef;
|
|
148
146
|
if (languageDef) {
|
|
149
|
-
if (this.$type === 'extended') {
|
|
150
|
-
throw new Error('Language definition is not supported for extended editor apps where textmate is used.');
|
|
151
|
-
}
|
|
152
147
|
// register own language first
|
|
153
148
|
monaco.languages.register(languageDef.languageExtensionConfig);
|
|
154
149
|
|
|
@@ -176,7 +171,7 @@ export class EditorApp {
|
|
|
176
171
|
this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
|
|
177
172
|
}
|
|
178
173
|
|
|
179
|
-
await this.createEditors(htmlContainer
|
|
174
|
+
await this.createEditors(htmlContainer);
|
|
180
175
|
|
|
181
176
|
// everything is fine at this point
|
|
182
177
|
startingResolve();
|