monaco-languageclient 9.0.0-next.9 → 9.1.0

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.
Files changed (7) hide show
  1. package/CHANGELOG.md +9 -2
  2. package/lib/vscode/services.d.ts +3 -2
  3. package/lib/vscode/services.d.ts.map +1 -1
  4. package/lib/vscode/services.js +14 -9
  5. package/lib/vscode/services.js.map +1 -1
  6. package/package.json +594 -16
  7. package/src/vscode/services.ts +20 -12
package/CHANGELOG.md CHANGED
@@ -2,8 +2,16 @@
2
2
 
3
3
  All notable changes to this npm module are documented in this file.
4
4
 
5
- ## [9.0.0-next.9] - 2024-11-22
5
+ ## [9.1.0] - 2025-01-10
6
6
 
7
+ - `@typefox/monaco-editor-react` now works with views service `initialize` [#823](https://github.com/TypeFox/monaco-languageclient/pull/823)
8
+ - Ensure configuration is init before service init [#820](https://github.com/TypeFox/monaco-languageclient/pull/820)
9
+
10
+ ## [9.0.0] - 2024-12-18
11
+
12
+ - Include all `@codingame/monaco-vscode` packages as peerDependencies. Mark only required ones as non-optional.
13
+ - Updated engine engine requirements for node to (`>=18.19.0`) and for npm to (`>=10.2.3`)
14
+ - Updated all `@codingame/monaco-vscode` packages to `11.1.2`.
7
15
  - Workaround for `@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common` dependency problem
8
16
  - Run language clients independent of wrapper lifecycle [#784](https://github.com/TypeFox/monaco-languageclient/pull/784)
9
17
  - API and internal functions clean-up
@@ -13,7 +21,6 @@ All notable changes to this npm module are documented in this file.
13
21
  - Updated to eslint 9
14
22
  - Support all arguments for monaco-vscode-api `initialize` [#756](https://github.com/TypeFox/monaco-languageclient/pull/756)
15
23
  - Update to monaco-vscode-api 9.0.x [#749](https://github.com/TypeFox/monaco-languageclient/pull/749)
16
- - Updated all `@codingame/monaco-vscode` packages to `11.1.1`.
17
24
  - Enhancements to logging
18
25
  - monaco-languageclient config improvement, wrapper+languageclientwrapper improvements [#741](https://github.com/TypeFox/monaco-languageclient/pull/741)
19
26
  - Pass MessageTransports directly
package/lib/vscode/services.d.ts CHANGED
@@ -15,6 +15,7 @@ export interface UserConfiguration {
15
15
  export interface ViewsConfig {
16
16
  viewServiceType: 'EditorService' | 'ViewsService' | 'WorkspaceService';
17
17
  openEditorFunc?: OpenEditor;
18
+ htmlAugmentationInstructions?: (htmlContainer: HTMLElement | null | undefined) => void;
18
19
  viewsInitFunc?: () => void;
19
20
  }
20
21
  export interface VscodeApiConfig {
@@ -40,7 +41,7 @@ export declare const supplyRequiredServices: () => Promise<{
40
41
  }>;
41
42
  export declare const reportServiceLoading: (services: monaco.editor.IEditorOverrideServices, logger?: Logger) => void;
42
43
  export declare const mergeServices: (overrideServices: monaco.editor.IEditorOverrideServices, services?: monaco.editor.IEditorOverrideServices) => void;
43
- export declare const initServices: (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => Promise<void>;
44
+ export declare const initServices: (vscodeApiConfig: VscodeApiConfig, instructions?: InitServicesInstructions) => Promise<boolean | undefined>;
44
45
  /**
45
46
  * monaco-vscode-api automatically loads the following services:
46
47
  * - layout
@@ -52,7 +53,7 @@ export declare const initServices: (vscodeApiConfig: VscodeApiConfig, instructio
52
53
  * - languages
53
54
  * - model
54
55
  */
55
- export declare const importAllServices: (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => Promise<void>;
56
+ export declare const importAllServices: (vscodeApiConfig: VscodeApiConfig, instructions?: InitServicesInstructions) => Promise<void>;
56
57
  /**
57
58
  * Enable ext host to run in a worker
58
59
  */
package/lib/vscode/services.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAc,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAM9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAKrD,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,WAAW;IACxB,eAAe,EAAE,eAAe,GAAG,cAAc,GAAG,kBAAkB,CAAC;IACvE,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC5B,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,6BAA6B,CAAC;IAChD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,wBAAwB;IACrC,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B,CAAC,EAAE,MAAM,OAAO,CAAC;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,6BAA6B,iCAczC,CAAC;AAEF,eAAO,MAAM,4BAA4B,QAEF,yBACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;EAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,WAAW,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,qBAAsB,MAAM,CAAC,MAAM,CAAC,uBAAuB,aAAa,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAMtI,CAAC;AAEF,eAAO,MAAM,YAAY,oBAA2B,eAAe,gBAAgB,wBAAwB,kBAmB1G,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,oBAA2B,eAAe,gBAAgB,wBAAwB,kBAoB/G,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAY7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}
1
+ {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAc,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAM9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAKrD,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,WAAW;IACxB,eAAe,EAAE,eAAe,GAAG,cAAc,GAAG,kBAAkB,CAAC;IACvE,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,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC5B,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,6BAA6B,CAAC;IAChD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,wBAAwB;IACrC,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B,CAAC,EAAE,MAAM,OAAO,CAAC;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,6BAA6B,iCAczC,CAAC;AAEF,eAAO,MAAM,4BAA4B,QAEF,yBACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;EAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,WAAW,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,qBAAsB,MAAM,CAAC,MAAM,CAAC,uBAAuB,aAAa,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAMtI,CAAC;AAEF,eAAO,MAAM,YAAY,oBAA2B,eAAe,iBAAiB,wBAAwB,iCA0B3G,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,oBAA2B,eAAe,iBAAiB,wBAAwB,kBAoBhH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAY7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}
package/lib/vscode/services.js CHANGED
@@ -10,7 +10,7 @@ import getModelServiceOverride from '@codingame/monaco-vscode-model-service-over
10
10
  import getLogServiceOverride from '@codingame/monaco-vscode-log-service-override';
11
11
  import { FakeWorker as Worker } from './fakeWorker.js';
12
12
  import { setUnexpectedErrorHandler } from 'vscode/monaco';
13
- import { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
13
+ import { initUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
14
14
  export const initEnhancedMonacoEnvironment = () => {
15
15
  const monWin = self;
16
16
  if (!monWin.MonacoEnvironment) {
@@ -52,18 +52,23 @@ export const initServices = async (vscodeApiConfig, instructions) => {
52
52
  const envEnhanced = initEnhancedMonacoEnvironment();
53
53
  if (!(envEnhanced.vscodeInitialising ?? false)) {
54
54
  if (envEnhanced.vscodeApiInitialised ?? false) {
55
- instructions.logger?.debug('Initialization of vscode services can only performed once!');
55
+ instructions?.logger?.debug('Initialization of vscode services can only performed once!');
56
56
  }
57
57
  else {
58
58
  envEnhanced.vscodeInitialising = true;
59
- instructions.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
59
+ instructions?.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
60
+ if (vscodeApiConfig.userConfiguration?.json !== undefined) {
61
+ await initUserConfiguration(vscodeApiConfig.userConfiguration.json);
62
+ }
60
63
  await importAllServices(vscodeApiConfig, instructions);
64
+ vscodeApiConfig.viewsConfig?.htmlAugmentationInstructions?.(instructions?.htmlContainer);
61
65
  vscodeApiConfig.viewsConfig?.viewsInitFunc?.();
62
- instructions.logger?.debug('Initialization of vscode services completed successfully.');
66
+ instructions?.logger?.debug('Initialization of vscode services completed successfully.');
63
67
  envEnhanced.vscodeApiInitialised = true;
68
+ envEnhanced.vscodeInitialising = false;
64
69
  }
65
- await updateUserConfiguration(vscodeApiConfig.userConfiguration?.json ?? JSON.stringify({}));
66
70
  }
71
+ return envEnhanced.vscodeApiInitialised;
67
72
  };
68
73
  /**
69
74
  * monaco-vscode-api automatically loads the following services:
@@ -80,18 +85,18 @@ export const importAllServices = async (vscodeApiConfig, instructions) => {
80
85
  const services = await supplyRequiredServices();
81
86
  mergeServices(services, vscodeApiConfig.serviceOverrides);
82
87
  await configureExtHostWorker(vscodeApiConfig.enableExtHostWorker === true, services);
83
- reportServiceLoading(services, instructions.logger);
84
- if (instructions.performServiceConsistencyChecks === undefined ||
88
+ reportServiceLoading(services, instructions?.logger);
89
+ if (instructions?.performServiceConsistencyChecks === undefined ||
85
90
  (typeof instructions.performServiceConsistencyChecks === 'function' && instructions.performServiceConsistencyChecks())) {
86
91
  if (vscodeApiConfig.viewsConfig?.viewServiceType === 'ViewsService' || vscodeApiConfig.viewsConfig?.viewServiceType === 'WorkspaceService') {
87
- await initialize(services, instructions.htmlContainer, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
92
+ await initialize(services, instructions?.htmlContainer, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
88
93
  }
89
94
  else {
90
95
  await initialize(services, undefined, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
91
96
  }
92
97
  }
93
98
  setUnexpectedErrorHandler((e) => {
94
- instructions.logger?.createErrorAndLog('Unexpected error', e);
99
+ instructions?.logger?.createErrorAndLog('Unexpected error', e);
95
100
  });
96
101
  };
97
102
  /**
package/lib/vscode/services.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAiC,MAAM,iBAAiB,CAAC;AAG5E,OAAO,2BAA2B,MAAM,sDAAsD,CAAC;AAC/F,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,OAAO,qBAAqB,MAAM,+CAA+C,CAAC;AAIlF,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAmChG,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAC9C,MAAM,MAAM,GAAI,IAAe,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC5B,MAAM,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAClC,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,iBAA8C,CAAC;IAC1E,IAAI,WAAW,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACjD,WAAW,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAC7C,CAAC;IACD,IAAI,WAAW,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,WAAW,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAC3C,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE;IAC7C,MAAM,MAAM,GAAI,IAAe,CAAC;IAChC,OAAO,MAAM,CAAC,iBAA8C,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC7C,OAAO;QACH,GAAG,2BAA2B,EAAE;QAChC,GAAG,qBAAqB,EAAE;QAC1B,GAAG,uBAAuB,EAAE;KAC/B,CAAC;AACN,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,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,eAAgC,EAAE,YAAuC,EAAE,EAAE;IAC5G,MAAM,WAAW,GAAG,6BAA6B,EAAE,CAAC;IAEpD,IAAI,CAAC,CAAC,WAAW,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC;QAE7C,IAAI,WAAW,CAAC,oBAAoB,IAAI,KAAK,EAAE,CAAC;YAC5C,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC9F,CAAC;aAAM,CAAC;YACJ,WAAW,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACtC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,yCAAyC,YAAY,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;YAEzG,IAAI,eAAe,CAAC,iBAAiB,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxD,MAAM,qBAAqB,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxE,CAAC;YACD,MAAM,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;YAEvD,eAAe,CAAC,WAAW,EAAE,4BAA4B,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;YACzF,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,EAAE,CAAC;YAC/C,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,2DAA2D,CAAC,CAAC;YAEzF,WAAW,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACxC,WAAW,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAC3C,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC,oBAAoB,CAAC;AAC5C,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,eAAgC,EAAE,YAAuC,EAAE,EAAE;IACjH,MAAM,QAAQ,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAEhD,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAC1D,MAAM,sBAAsB,CAAC,eAAe,CAAC,mBAAmB,KAAK,IAAI,EAAE,QAAQ,CAAC,CAAC;IAErF,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAErD,IAAI,YAAY,EAAE,+BAA+B,KAAK,SAAS;QAC3D,CAAC,OAAO,YAAY,CAAC,+BAA+B,KAAK,UAAU,IAAI,YAAY,CAAC,+BAA+B,EAAE,CAAC,EAAE,CAAC;QACzH,IAAI,eAAe,CAAC,WAAW,EAAE,eAAe,KAAK,cAAc,IAAI,eAAe,CAAC,WAAW,EAAE,eAAe,KAAK,kBAAkB,EAAE,CAAC;YACzI,MAAM,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,CAAC,eAAe,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACzH,CAAC;aAAM,CAAC;YACJ,MAAM,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,CAAC,eAAe,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACvG,CAAC;IACL,CAAC;IAED,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,YAAY,EAAE,MAAM,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACP,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,qCAAqC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnH,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,gCAAgC,GAAG,GAAwB,EAAE;IACtE,OAAO;QACH,KAAK,CAAC,WAAW;YACb,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,EAAU;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,kBAAkB,EAAE,CAAC;gBACjB,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,OAAO;aACxB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,UAAU;aAC3B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,OAAO;gBACf,YAAY,EAAE,qBAAqB;aACtC,EAAE;gBACC,MAAM,EAAE,UAAU;gBAClB,YAAY,EAAE,iBAAiB;aAClC,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,SAAS;gBACjB,YAAY,EAAE,sBAAsB;aACvC,EAAE;gBACC,MAAM,EAAE,SAAS;gBACjB,YAAY,EAAE,uBAAuB;aACxC,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,CAAC;KACL,CAAC;AACN,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "monaco-languageclient",
3
- "version": "9.0.0-next.9",
3
+ "version": "9.1.0",
4
4
  "description": "Monaco Language client implementation",
5
5
  "author": {
6
6
  "name": "TypeFox GmbH",
@@ -54,11 +54,11 @@
54
54
  }
55
55
  },
56
56
  "engines": {
57
- "node": ">=16.11.0",
58
- "npm": ">=9.0.0"
57
+ "node": ">=18.19.0",
58
+ "npm": ">=10.2.3"
59
59
  },
60
60
  "volta": {
61
- "node": "22.11.0",
61
+ "node": "22.12.0",
62
62
  "npm": "10.9.0"
63
63
  },
64
64
  "files": [
@@ -69,26 +69,604 @@
69
69
  "LICENSE"
70
70
  ],
71
71
  "dependencies": {
72
- "@codingame/monaco-vscode-configuration-service-override": "~11.1.1",
73
- "@codingame/monaco-vscode-extensions-service-override": "~11.1.1",
74
- "@codingame/monaco-vscode-languages-service-override": "~11.1.1",
75
- "@codingame/monaco-vscode-localization-service-override": "~11.1.1",
76
- "@codingame/monaco-vscode-log-service-override": "~11.1.1",
77
- "@codingame/monaco-vscode-model-service-override": "~11.1.1",
78
- "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.1",
79
- "vscode": "npm:@codingame/monaco-vscode-api@~11.1.1",
72
+ "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.2",
73
+ "vscode": "npm:@codingame/monaco-vscode-api@~11.1.2",
80
74
  "vscode-languageclient": "~9.0.1"
81
75
  },
82
76
  "peerDependencies": {
83
- "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.1",
84
- "vscode": "npm:@codingame/monaco-vscode-api@~11.1.1"
77
+ "@codingame/monaco-vscode-accessibility-service-override": "~11.1.2",
78
+ "@codingame/monaco-vscode-all-default-extensions": "~11.1.2",
79
+ "@codingame/monaco-vscode-all-language-default-extensions": "~11.1.2",
80
+ "@codingame/monaco-vscode-all-language-feature-default-extensions": "~11.1.2",
81
+ "@codingame/monaco-vscode-api": "~11.1.2",
82
+ "@codingame/monaco-vscode-base-service-override": "~11.1.2",
83
+ "@codingame/monaco-vscode-bat-default-extension": "~11.1.2",
84
+ "@codingame/monaco-vscode-chat-extensions-notebook-common": "~11.1.2",
85
+ "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "~11.1.2",
86
+ "@codingame/monaco-vscode-chat-service-override": "~11.1.2",
87
+ "@codingame/monaco-vscode-clojure-default-extension": "~11.1.2",
88
+ "@codingame/monaco-vscode-coffeescript-default-extension": "~11.1.2",
89
+ "@codingame/monaco-vscode-comments-extensions-common": "~11.1.2",
90
+ "@codingame/monaco-vscode-configuration-editing-default-extension": "~11.1.2",
91
+ "@codingame/monaco-vscode-configuration-service-override": "~11.1.2",
92
+ "@codingame/monaco-vscode-cpp-default-extension": "~11.1.2",
93
+ "@codingame/monaco-vscode-csharp-default-extension": "~11.1.2",
94
+ "@codingame/monaco-vscode-css-default-extension": "~11.1.2",
95
+ "@codingame/monaco-vscode-css-language-features-default-extension": "~11.1.2",
96
+ "@codingame/monaco-vscode-dart-default-extension": "~11.1.2",
97
+ "@codingame/monaco-vscode-debug-service-override": "~11.1.2",
98
+ "@codingame/monaco-vscode-dialogs-service-override": "~11.1.2",
99
+ "@codingame/monaco-vscode-diff-default-extension": "~11.1.2",
100
+ "@codingame/monaco-vscode-docker-default-extension": "~11.1.2",
101
+ "@codingame/monaco-vscode-editor-api": "~11.1.2",
102
+ "@codingame/monaco-vscode-editor-service-override": "~11.1.2",
103
+ "@codingame/monaco-vscode-emmet-default-extension": "~11.1.2",
104
+ "@codingame/monaco-vscode-environment-service-override": "~11.1.2",
105
+ "@codingame/monaco-vscode-explorer-service-override": "~11.1.2",
106
+ "@codingame/monaco-vscode-extension-editing-default-extension": "~11.1.2",
107
+ "@codingame/monaco-vscode-extensions-service-override": "~11.1.2",
108
+ "@codingame/monaco-vscode-files-service-override": "~11.1.2",
109
+ "@codingame/monaco-vscode-fsharp-default-extension": "~11.1.2",
110
+ "@codingame/monaco-vscode-git-base-default-extension": "~11.1.2",
111
+ "@codingame/monaco-vscode-github-authentication-default-extension": "~11.1.2",
112
+ "@codingame/monaco-vscode-go-default-extension": "~11.1.2",
113
+ "@codingame/monaco-vscode-groovy-default-extension": "~11.1.2",
114
+ "@codingame/monaco-vscode-handlebars-default-extension": "~11.1.2",
115
+ "@codingame/monaco-vscode-hlsl-default-extension": "~11.1.2",
116
+ "@codingame/monaco-vscode-host-service-override": "~11.1.2",
117
+ "@codingame/monaco-vscode-html-default-extension": "~11.1.2",
118
+ "@codingame/monaco-vscode-html-language-features-default-extension": "~11.1.2",
119
+ "@codingame/monaco-vscode-ini-default-extension": "~11.1.2",
120
+ "@codingame/monaco-vscode-ipynb-default-extension": "~11.1.2",
121
+ "@codingame/monaco-vscode-java-default-extension": "~11.1.2",
122
+ "@codingame/monaco-vscode-javascript-default-extension": "~11.1.2",
123
+ "@codingame/monaco-vscode-json-default-extension": "~11.1.2",
124
+ "@codingame/monaco-vscode-json-language-features-default-extension": "~11.1.2",
125
+ "@codingame/monaco-vscode-julia-default-extension": "~11.1.2",
126
+ "@codingame/monaco-vscode-keybindings-service-override": "~11.1.2",
127
+ "@codingame/monaco-vscode-language-pack-cs": "~11.1.2",
128
+ "@codingame/monaco-vscode-language-pack-de": "~11.1.2",
129
+ "@codingame/monaco-vscode-language-pack-es": "~11.1.2",
130
+ "@codingame/monaco-vscode-language-pack-fr": "~11.1.2",
131
+ "@codingame/monaco-vscode-language-pack-it": "~11.1.2",
132
+ "@codingame/monaco-vscode-language-pack-ja": "~11.1.2",
133
+ "@codingame/monaco-vscode-language-pack-ko": "~11.1.2",
134
+ "@codingame/monaco-vscode-language-pack-pl": "~11.1.2",
135
+ "@codingame/monaco-vscode-language-pack-pt-br": "~11.1.2",
136
+ "@codingame/monaco-vscode-language-pack-qps-ploc": "~11.1.2",
137
+ "@codingame/monaco-vscode-language-pack-ru": "~11.1.2",
138
+ "@codingame/monaco-vscode-language-pack-tr": "~11.1.2",
139
+ "@codingame/monaco-vscode-language-pack-zh-hans": "~11.1.2",
140
+ "@codingame/monaco-vscode-language-pack-zh-hant": "~11.1.2",
141
+ "@codingame/monaco-vscode-languages-service-override": "~11.1.2",
142
+ "@codingame/monaco-vscode-latex-default-extension": "~11.1.2",
143
+ "@codingame/monaco-vscode-layout-service-override": "~11.1.2",
144
+ "@codingame/monaco-vscode-less-default-extension": "~11.1.2",
145
+ "@codingame/monaco-vscode-lifecycle-service-override": "~11.1.2",
146
+ "@codingame/monaco-vscode-localization-service-override": "~11.1.2",
147
+ "@codingame/monaco-vscode-log-default-extension": "~11.1.2",
148
+ "@codingame/monaco-vscode-log-service-override": "~11.1.2",
149
+ "@codingame/monaco-vscode-lua-default-extension": "~11.1.2",
150
+ "@codingame/monaco-vscode-make-default-extension": "~11.1.2",
151
+ "@codingame/monaco-vscode-markdown-basics-default-extension": "~11.1.2",
152
+ "@codingame/monaco-vscode-markdown-language-features-default-extension": "~11.1.2",
153
+ "@codingame/monaco-vscode-markdown-math-default-extension": "~11.1.2",
154
+ "@codingame/monaco-vscode-markers-service-override": "~11.1.2",
155
+ "@codingame/monaco-vscode-media-preview-default-extension": "~11.1.2",
156
+ "@codingame/monaco-vscode-merge-conflict-default-extension": "~11.1.2",
157
+ "@codingame/monaco-vscode-microsoft-authentication-default-extension": "~11.1.2",
158
+ "@codingame/monaco-vscode-model-service-override": "~11.1.2",
159
+ "@codingame/monaco-vscode-monarch-service-override": "~11.1.2",
160
+ "@codingame/monaco-vscode-notebook-renderers-default-extension": "~11.1.2",
161
+ "@codingame/monaco-vscode-notebook-service-override": "~11.1.2",
162
+ "@codingame/monaco-vscode-notifications-service-override": "~11.1.2",
163
+ "@codingame/monaco-vscode-npm-default-extension": "~11.1.2",
164
+ "@codingame/monaco-vscode-objective-c-default-extension": "~11.1.2",
165
+ "@codingame/monaco-vscode-outline-service-override": "~11.1.2",
166
+ "@codingame/monaco-vscode-output-service-override": "~11.1.2",
167
+ "@codingame/monaco-vscode-perl-default-extension": "~11.1.2",
168
+ "@codingame/monaco-vscode-php-default-extension": "~11.1.2",
169
+ "@codingame/monaco-vscode-powershell-default-extension": "~11.1.2",
170
+ "@codingame/monaco-vscode-preferences-service-override": "~11.1.2",
171
+ "@codingame/monaco-vscode-pug-default-extension": "~11.1.2",
172
+ "@codingame/monaco-vscode-python-default-extension": "~11.1.2",
173
+ "@codingame/monaco-vscode-quickaccess-service-override": "~11.1.2",
174
+ "@codingame/monaco-vscode-r-default-extension": "~11.1.2",
175
+ "@codingame/monaco-vscode-razor-default-extension": "~11.1.2",
176
+ "@codingame/monaco-vscode-references-view-default-extension": "~11.1.2",
177
+ "@codingame/monaco-vscode-restructuredtext-default-extension": "~11.1.2",
178
+ "@codingame/monaco-vscode-rollup-extension-directory-plugin": "~11.1.2",
179
+ "@codingame/monaco-vscode-rollup-vsix-plugin": "~11.1.2",
180
+ "@codingame/monaco-vscode-ruby-default-extension": "~11.1.2",
181
+ "@codingame/monaco-vscode-rust-default-extension": "~11.1.2",
182
+ "@codingame/monaco-vscode-scss-default-extension": "~11.1.2",
183
+ "@codingame/monaco-vscode-search-result-default-extension": "~11.1.2",
184
+ "@codingame/monaco-vscode-search-service-override": "~11.1.2",
185
+ "@codingame/monaco-vscode-server": "~11.1.2",
186
+ "@codingame/monaco-vscode-shaderlab-default-extension": "~11.1.2",
187
+ "@codingame/monaco-vscode-share-service-override": "~11.1.2",
188
+ "@codingame/monaco-vscode-shellscript-default-extension": "~11.1.2",
189
+ "@codingame/monaco-vscode-simple-browser-default-extension": "~11.1.2",
190
+ "@codingame/monaco-vscode-snippets-service-override": "~11.1.2",
191
+ "@codingame/monaco-vscode-sql-default-extension": "~11.1.2",
192
+ "@codingame/monaco-vscode-standalone-css-language-features": "~11.1.2",
193
+ "@codingame/monaco-vscode-standalone-html-language-features": "~11.1.2",
194
+ "@codingame/monaco-vscode-standalone-json-language-features": "~11.1.2",
195
+ "@codingame/monaco-vscode-standalone-languages": "~11.1.2",
196
+ "@codingame/monaco-vscode-standalone-typescript-language-features": "~11.1.2",
197
+ "@codingame/monaco-vscode-storage-service-override": "~11.1.2",
198
+ "@codingame/monaco-vscode-swift-default-extension": "~11.1.2",
199
+ "@codingame/monaco-vscode-task-service-override": "~11.1.2",
200
+ "@codingame/monaco-vscode-terminal-service-override": "~11.1.2",
201
+ "@codingame/monaco-vscode-testing-service-override": "~11.1.2",
202
+ "@codingame/monaco-vscode-textmate-service-override": "~11.1.2",
203
+ "@codingame/monaco-vscode-theme-abyss-default-extension": "~11.1.2",
204
+ "@codingame/monaco-vscode-theme-defaults-default-extension": "~11.1.2",
205
+ "@codingame/monaco-vscode-theme-kimbie-dark-default-extension": "~11.1.2",
206
+ "@codingame/monaco-vscode-theme-monokai-default-extension": "~11.1.2",
207
+ "@codingame/monaco-vscode-theme-monokai-dimmed-default-extension": "~11.1.2",
208
+ "@codingame/monaco-vscode-theme-quietlight-default-extension": "~11.1.2",
209
+ "@codingame/monaco-vscode-theme-red-default-extension": "~11.1.2",
210
+ "@codingame/monaco-vscode-theme-service-override": "~11.1.2",
211
+ "@codingame/monaco-vscode-theme-seti-default-extension": "~11.1.2",
212
+ "@codingame/monaco-vscode-theme-solarized-dark-default-extension": "~11.1.2",
213
+ "@codingame/monaco-vscode-theme-solarized-light-default-extension": "~11.1.2",
214
+ "@codingame/monaco-vscode-theme-tomorrow-night-blue-default-extension": "~11.1.2",
215
+ "@codingame/monaco-vscode-timeline-service-override": "~11.1.2",
216
+ "@codingame/monaco-vscode-typescript-basics-default-extension": "~11.1.2",
217
+ "@codingame/monaco-vscode-typescript-language-features-default-extens": "~11.1.2",
218
+ "@codingame/monaco-vscode-update-service-override": "~11.1.2",
219
+ "@codingame/monaco-vscode-vb-default-extension": "~11.1.2",
220
+ "@codingame/monaco-vscode-views-service-override": "~11.1.2",
221
+ "@codingame/monaco-vscode-welcome-service-override": "~11.1.2",
222
+ "@codingame/monaco-vscode-workbench-service-override": "~11.1.2",
223
+ "@codingame/monaco-vscode-xml-default-extension": "~11.1.2",
224
+ "@codingame/monaco-vscode-yaml-default-extension": "~11.1.2"
85
225
  },
86
226
  "peerDependenciesMeta": {
87
- "monaco-editor": {
227
+ "@codingame/monaco-vscode-accessibility-service-override": {
228
+ "optional": true
229
+ },
230
+ "@codingame/monaco-vscode-all-default-extensions": {
231
+ "optional": true
232
+ },
233
+ "@codingame/monaco-vscode-all-language-default-extensions": {
234
+ "optional": true
235
+ },
236
+ "@codingame/monaco-vscode-all-language-feature-default-extensions": {
237
+ "optional": true
238
+ },
239
+ "@codingame/monaco-vscode-api": {
240
+ "optional": false
241
+ },
242
+ "@codingame/monaco-vscode-base-service-override": {
243
+ "optional": true
244
+ },
245
+ "@codingame/monaco-vscode-bat-default-extension": {
246
+ "optional": true
247
+ },
248
+ "@codingame/monaco-vscode-chat-extensions-notebook-common": {
249
+ "optional": true
250
+ },
251
+ "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": {
252
+ "optional": true
253
+ },
254
+ "@codingame/monaco-vscode-chat-service-override": {
255
+ "optional": true
256
+ },
257
+ "@codingame/monaco-vscode-clojure-default-extension": {
258
+ "optional": true
259
+ },
260
+ "@codingame/monaco-vscode-coffeescript-default-extension": {
261
+ "optional": true
262
+ },
263
+ "@codingame/monaco-vscode-comments-extensions-common": {
264
+ "optional": true
265
+ },
266
+ "@codingame/monaco-vscode-configuration-editing-default-extension": {
267
+ "optional": true
268
+ },
269
+ "@codingame/monaco-vscode-configuration-service-override": {
270
+ "optional": false
271
+ },
272
+ "@codingame/monaco-vscode-cpp-default-extension": {
273
+ "optional": true
274
+ },
275
+ "@codingame/monaco-vscode-csharp-default-extension": {
276
+ "optional": true
277
+ },
278
+ "@codingame/monaco-vscode-css-default-extension": {
279
+ "optional": true
280
+ },
281
+ "@codingame/monaco-vscode-css-language-features-default-extension": {
282
+ "optional": true
283
+ },
284
+ "@codingame/monaco-vscode-dart-default-extension": {
285
+ "optional": true
286
+ },
287
+ "@codingame/monaco-vscode-debug-service-override": {
288
+ "optional": true
289
+ },
290
+ "@codingame/monaco-vscode-dialogs-service-override": {
291
+ "optional": true
292
+ },
293
+ "@codingame/monaco-vscode-diff-default-extension": {
294
+ "optional": true
295
+ },
296
+ "@codingame/monaco-vscode-docker-default-extension": {
297
+ "optional": true
298
+ },
299
+ "@codingame/monaco-vscode-editor-api": {
300
+ "optional": false
301
+ },
302
+ "@codingame/monaco-vscode-editor-service-override": {
303
+ "optional": true
304
+ },
305
+ "@codingame/monaco-vscode-emmet-default-extension": {
306
+ "optional": true
307
+ },
308
+ "@codingame/monaco-vscode-environment-service-override": {
309
+ "optional": true
310
+ },
311
+ "@codingame/monaco-vscode-explorer-service-override": {
312
+ "optional": true
313
+ },
314
+ "@codingame/monaco-vscode-extension-editing-default-extension": {
315
+ "optional": true
316
+ },
317
+ "@codingame/monaco-vscode-extensions-service-override": {
318
+ "optional": false
319
+ },
320
+ "@codingame/monaco-vscode-files-service-override": {
321
+ "optional": true
322
+ },
323
+ "@codingame/monaco-vscode-fsharp-default-extension": {
324
+ "optional": true
325
+ },
326
+ "@codingame/monaco-vscode-git-base-default-extension": {
327
+ "optional": true
328
+ },
329
+ "@codingame/monaco-vscode-github-authentication-default-extension": {
330
+ "optional": true
331
+ },
332
+ "@codingame/monaco-vscode-go-default-extension": {
333
+ "optional": true
334
+ },
335
+ "@codingame/monaco-vscode-groovy-default-extension": {
336
+ "optional": true
337
+ },
338
+ "@codingame/monaco-vscode-handlebars-default-extension": {
339
+ "optional": true
340
+ },
341
+ "@codingame/monaco-vscode-hlsl-default-extension": {
342
+ "optional": true
343
+ },
344
+ "@codingame/monaco-vscode-host-service-override": {
345
+ "optional": true
346
+ },
347
+ "@codingame/monaco-vscode-html-default-extension": {
348
+ "optional": true
349
+ },
350
+ "@codingame/monaco-vscode-html-language-features-default-extension": {
351
+ "optional": true
352
+ },
353
+ "@codingame/monaco-vscode-ini-default-extension": {
354
+ "optional": true
355
+ },
356
+ "@codingame/monaco-vscode-ipynb-default-extension": {
357
+ "optional": true
358
+ },
359
+ "@codingame/monaco-vscode-java-default-extension": {
360
+ "optional": true
361
+ },
362
+ "@codingame/monaco-vscode-javascript-default-extension": {
363
+ "optional": true
364
+ },
365
+ "@codingame/monaco-vscode-json-default-extension": {
366
+ "optional": true
367
+ },
368
+ "@codingame/monaco-vscode-json-language-features-default-extension": {
369
+ "optional": true
370
+ },
371
+ "@codingame/monaco-vscode-julia-default-extension": {
372
+ "optional": true
373
+ },
374
+ "@codingame/monaco-vscode-keybindings-service-override": {
375
+ "optional": true
376
+ },
377
+ "@codingame/monaco-vscode-language-pack-cs": {
378
+ "optional": true
379
+ },
380
+ "@codingame/monaco-vscode-language-pack-de": {
381
+ "optional": true
382
+ },
383
+ "@codingame/monaco-vscode-language-pack-es": {
384
+ "optional": true
385
+ },
386
+ "@codingame/monaco-vscode-language-pack-fr": {
387
+ "optional": true
388
+ },
389
+ "@codingame/monaco-vscode-language-pack-it": {
390
+ "optional": true
391
+ },
392
+ "@codingame/monaco-vscode-language-pack-ja": {
393
+ "optional": true
394
+ },
395
+ "@codingame/monaco-vscode-language-pack-ko": {
396
+ "optional": true
397
+ },
398
+ "@codingame/monaco-vscode-language-pack-pl": {
399
+ "optional": true
400
+ },
401
+ "@codingame/monaco-vscode-language-pack-pt-br": {
402
+ "optional": true
403
+ },
404
+ "@codingame/monaco-vscode-language-pack-qps-ploc": {
405
+ "optional": true
406
+ },
407
+ "@codingame/monaco-vscode-language-pack-ru": {
408
+ "optional": true
409
+ },
410
+ "@codingame/monaco-vscode-language-pack-tr": {
411
+ "optional": true
412
+ },
413
+ "@codingame/monaco-vscode-language-pack-zh-hans": {
414
+ "optional": true
415
+ },
416
+ "@codingame/monaco-vscode-language-pack-zh-hant": {
417
+ "optional": true
418
+ },
419
+ "@codingame/monaco-vscode-languages-service-override": {
420
+ "optional": false
421
+ },
422
+ "@codingame/monaco-vscode-latex-default-extension": {
423
+ "optional": true
424
+ },
425
+ "@codingame/monaco-vscode-layout-service-override": {
426
+ "optional": true
427
+ },
428
+ "@codingame/monaco-vscode-less-default-extension": {
429
+ "optional": true
430
+ },
431
+ "@codingame/monaco-vscode-lifecycle-service-override": {
432
+ "optional": true
433
+ },
434
+ "@codingame/monaco-vscode-localization-service-override": {
435
+ "optional": false
436
+ },
437
+ "@codingame/monaco-vscode-log-default-extension": {
438
+ "optional": true
439
+ },
440
+ "@codingame/monaco-vscode-log-service-override": {
88
441
  "optional": false
89
442
  },
90
- "vscode": {
443
+ "@codingame/monaco-vscode-lua-default-extension": {
444
+ "optional": true
445
+ },
446
+ "@codingame/monaco-vscode-make-default-extension": {
447
+ "optional": true
448
+ },
449
+ "@codingame/monaco-vscode-markdown-basics-default-extension": {
450
+ "optional": true
451
+ },
452
+ "@codingame/monaco-vscode-markdown-language-features-default-extension": {
453
+ "optional": true
454
+ },
455
+ "@codingame/monaco-vscode-markdown-math-default-extension": {
456
+ "optional": true
457
+ },
458
+ "@codingame/monaco-vscode-markers-service-override": {
459
+ "optional": true
460
+ },
461
+ "@codingame/monaco-vscode-media-preview-default-extension": {
462
+ "optional": true
463
+ },
464
+ "@codingame/monaco-vscode-merge-conflict-default-extension": {
465
+ "optional": true
466
+ },
467
+ "@codingame/monaco-vscode-microsoft-authentication-default-extension": {
468
+ "optional": true
469
+ },
470
+ "@codingame/monaco-vscode-model-service-override": {
91
471
  "optional": false
472
+ },
473
+ "@codingame/monaco-vscode-monarch-service-override": {
474
+ "optional": true
475
+ },
476
+ "@codingame/monaco-vscode-notebook-renderers-default-extension": {
477
+ "optional": true
478
+ },
479
+ "@codingame/monaco-vscode-notebook-service-override": {
480
+ "optional": true
481
+ },
482
+ "@codingame/monaco-vscode-notifications-service-override": {
483
+ "optional": true
484
+ },
485
+ "@codingame/monaco-vscode-npm-default-extension": {
486
+ "optional": true
487
+ },
488
+ "@codingame/monaco-vscode-objective-c-default-extension": {
489
+ "optional": true
490
+ },
491
+ "@codingame/monaco-vscode-outline-service-override": {
492
+ "optional": true
493
+ },
494
+ "@codingame/monaco-vscode-output-service-override": {
495
+ "optional": true
496
+ },
497
+ "@codingame/monaco-vscode-perl-default-extension": {
498
+ "optional": true
499
+ },
500
+ "@codingame/monaco-vscode-php-default-extension": {
501
+ "optional": true
502
+ },
503
+ "@codingame/monaco-vscode-powershell-default-extension": {
504
+ "optional": true
505
+ },
506
+ "@codingame/monaco-vscode-preferences-service-override": {
507
+ "optional": true
508
+ },
509
+ "@codingame/monaco-vscode-pug-default-extension": {
510
+ "optional": true
511
+ },
512
+ "@codingame/monaco-vscode-python-default-extension": {
513
+ "optional": true
514
+ },
515
+ "@codingame/monaco-vscode-quickaccess-service-override": {
516
+ "optional": true
517
+ },
518
+ "@codingame/monaco-vscode-r-default-extension": {
519
+ "optional": true
520
+ },
521
+ "@codingame/monaco-vscode-razor-default-extension": {
522
+ "optional": true
523
+ },
524
+ "@codingame/monaco-vscode-references-view-default-extension": {
525
+ "optional": true
526
+ },
527
+ "@codingame/monaco-vscode-restructuredtext-default-extension": {
528
+ "optional": true
529
+ },
530
+ "@codingame/monaco-vscode-rollup-extension-directory-plugin": {
531
+ "optional": true
532
+ },
533
+ "@codingame/monaco-vscode-rollup-vsix-plugin": {
534
+ "optional": true
535
+ },
536
+ "@codingame/monaco-vscode-ruby-default-extension": {
537
+ "optional": true
538
+ },
539
+ "@codingame/monaco-vscode-rust-default-extension": {
540
+ "optional": true
541
+ },
542
+ "@codingame/monaco-vscode-scss-default-extension": {
543
+ "optional": true
544
+ },
545
+ "@codingame/monaco-vscode-search-result-default-extension": {
546
+ "optional": true
547
+ },
548
+ "@codingame/monaco-vscode-search-service-override": {
549
+ "optional": true
550
+ },
551
+ "@codingame/monaco-vscode-server": {
552
+ "optional": true
553
+ },
554
+ "@codingame/monaco-vscode-shaderlab-default-extension": {
555
+ "optional": true
556
+ },
557
+ "@codingame/monaco-vscode-share-service-override": {
558
+ "optional": true
559
+ },
560
+ "@codingame/monaco-vscode-shellscript-default-extension": {
561
+ "optional": true
562
+ },
563
+ "@codingame/monaco-vscode-simple-browser-default-extension": {
564
+ "optional": true
565
+ },
566
+ "@codingame/monaco-vscode-snippets-service-override": {
567
+ "optional": true
568
+ },
569
+ "@codingame/monaco-vscode-sql-default-extension": {
570
+ "optional": true
571
+ },
572
+ "@codingame/monaco-vscode-standalone-css-language-features": {
573
+ "optional": true
574
+ },
575
+ "@codingame/monaco-vscode-standalone-html-language-features": {
576
+ "optional": true
577
+ },
578
+ "@codingame/monaco-vscode-standalone-json-language-features": {
579
+ "optional": true
580
+ },
581
+ "@codingame/monaco-vscode-standalone-languages": {
582
+ "optional": true
583
+ },
584
+ "@codingame/monaco-vscode-standalone-typescript-language-features": {
585
+ "optional": true
586
+ },
587
+ "@codingame/monaco-vscode-storage-service-override": {
588
+ "optional": true
589
+ },
590
+ "@codingame/monaco-vscode-swift-default-extension": {
591
+ "optional": true
592
+ },
593
+ "@codingame/monaco-vscode-task-service-override": {
594
+ "optional": true
595
+ },
596
+ "@codingame/monaco-vscode-terminal-service-override": {
597
+ "optional": true
598
+ },
599
+ "@codingame/monaco-vscode-testing-service-override": {
600
+ "optional": true
601
+ },
602
+ "@codingame/monaco-vscode-textmate-service-override": {
603
+ "optional": true
604
+ },
605
+ "@codingame/monaco-vscode-theme-abyss-default-extension": {
606
+ "optional": true
607
+ },
608
+ "@codingame/monaco-vscode-theme-defaults-default-extension": {
609
+ "optional": true
610
+ },
611
+ "@codingame/monaco-vscode-theme-kimbie-dark-default-extension": {
612
+ "optional": true
613
+ },
614
+ "@codingame/monaco-vscode-theme-monokai-default-extension": {
615
+ "optional": true
616
+ },
617
+ "@codingame/monaco-vscode-theme-monokai-dimmed-default-extension": {
618
+ "optional": true
619
+ },
620
+ "@codingame/monaco-vscode-theme-quietlight-default-extension": {
621
+ "optional": true
622
+ },
623
+ "@codingame/monaco-vscode-theme-red-default-extension": {
624
+ "optional": true
625
+ },
626
+ "@codingame/monaco-vscode-theme-service-override": {
627
+ "optional": true
628
+ },
629
+ "@codingame/monaco-vscode-theme-seti-default-extension": {
630
+ "optional": true
631
+ },
632
+ "@codingame/monaco-vscode-theme-solarized-dark-default-extension": {
633
+ "optional": true
634
+ },
635
+ "@codingame/monaco-vscode-theme-solarized-light-default-extension": {
636
+ "optional": true
637
+ },
638
+ "@codingame/monaco-vscode-theme-tomorrow-night-blue-default-extension": {
639
+ "optional": true
640
+ },
641
+ "@codingame/monaco-vscode-timeline-service-override": {
642
+ "optional": true
643
+ },
644
+ "@codingame/monaco-vscode-typescript-basics-default-extension": {
645
+ "optional": true
646
+ },
647
+ "@codingame/monaco-vscode-typescript-language-features-default-extens": {
648
+ "optional": true
649
+ },
650
+ "@codingame/monaco-vscode-update-service-override": {
651
+ "optional": true
652
+ },
653
+ "@codingame/monaco-vscode-vb-default-extension": {
654
+ "optional": true
655
+ },
656
+ "@codingame/monaco-vscode-views-service-override": {
657
+ "optional": true
658
+ },
659
+ "@codingame/monaco-vscode-welcome-service-override": {
660
+ "optional": true
661
+ },
662
+ "@codingame/monaco-vscode-workbench-service-override": {
663
+ "optional": true
664
+ },
665
+ "@codingame/monaco-vscode-xml-default-extension": {
666
+ "optional": true
667
+ },
668
+ "@codingame/monaco-vscode-yaml-default-extension": {
669
+ "optional": true
92
670
  }
93
671
  },
94
672
  "scripts": {
package/src/vscode/services.ts CHANGED
@@ -17,7 +17,7 @@ import { EnvironmentOverride } from 'vscode/workbench';
17
17
  import { Logger } from 'monaco-languageclient/tools';
18
18
  import { FakeWorker as Worker } from './fakeWorker.js';
19
19
  import { setUnexpectedErrorHandler } from 'vscode/monaco';
20
- import { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
20
+ import { initUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
21
21
 
22
22
  export interface MonacoEnvironmentEnhanced extends monaco.Environment {
23
23
  vscodeInitialising?: boolean;
@@ -30,6 +30,7 @@ export interface UserConfiguration {
30
30
  export interface ViewsConfig {
31
31
  viewServiceType: 'EditorService' | 'ViewsService' | 'WorkspaceService';
32
32
  openEditorFunc?: OpenEditor;
33
+ htmlAugmentationInstructions?: (htmlContainer: HTMLElement | null | undefined) => void;
33
34
  viewsInitFunc?: () => void;
34
35
  }
35
36
 
@@ -94,25 +95,32 @@ export const mergeServices = (overrideServices: monaco.editor.IEditorOverrideSer
94
95
  }
95
96
  };
96
97
 
97
- export const initServices = async (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => {
98
+ export const initServices = async (vscodeApiConfig: VscodeApiConfig, instructions?: InitServicesInstructions) => {
98
99
  const envEnhanced = initEnhancedMonacoEnvironment();
99
100
 
100
101
  if (!(envEnhanced.vscodeInitialising ?? false)) {
102
+
101
103
  if (envEnhanced.vscodeApiInitialised ?? false) {
102
- instructions.logger?.debug('Initialization of vscode services can only performed once!');
104
+ instructions?.logger?.debug('Initialization of vscode services can only performed once!');
103
105
  } else {
104
106
  envEnhanced.vscodeInitialising = true;
105
- instructions.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
107
+ instructions?.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
106
108
 
109
+ if (vscodeApiConfig.userConfiguration?.json !== undefined) {
110
+ await initUserConfiguration(vscodeApiConfig.userConfiguration.json);
111
+ }
107
112
  await importAllServices(vscodeApiConfig, instructions);
113
+
114
+ vscodeApiConfig.viewsConfig?.htmlAugmentationInstructions?.(instructions?.htmlContainer);
108
115
  vscodeApiConfig.viewsConfig?.viewsInitFunc?.();
109
- instructions.logger?.debug('Initialization of vscode services completed successfully.');
116
+ instructions?.logger?.debug('Initialization of vscode services completed successfully.');
110
117
 
111
118
  envEnhanced.vscodeApiInitialised = true;
119
+ envEnhanced.vscodeInitialising = false;
112
120
  }
113
-
114
- await updateUserConfiguration(vscodeApiConfig.userConfiguration?.json ?? JSON.stringify({}));
115
121
  }
122
+
123
+ return envEnhanced.vscodeApiInitialised;
116
124
  };
117
125
 
118
126
  /**
@@ -126,25 +134,25 @@ export const initServices = async (vscodeApiConfig: VscodeApiConfig, instruction
126
134
  * - languages
127
135
  * - model
128
136
  */
129
- export const importAllServices = async (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => {
137
+ export const importAllServices = async (vscodeApiConfig: VscodeApiConfig, instructions?: InitServicesInstructions) => {
130
138
  const services = await supplyRequiredServices();
131
139
 
132
140
  mergeServices(services, vscodeApiConfig.serviceOverrides);
133
141
  await configureExtHostWorker(vscodeApiConfig.enableExtHostWorker === true, services);
134
142
 
135
- reportServiceLoading(services, instructions.logger);
143
+ reportServiceLoading(services, instructions?.logger);
136
144
 
137
- if (instructions.performServiceConsistencyChecks === undefined ||
145
+ if (instructions?.performServiceConsistencyChecks === undefined ||
138
146
  (typeof instructions.performServiceConsistencyChecks === 'function' && instructions.performServiceConsistencyChecks())) {
139
147
  if (vscodeApiConfig.viewsConfig?.viewServiceType === 'ViewsService' || vscodeApiConfig.viewsConfig?.viewServiceType === 'WorkspaceService') {
140
- await initialize(services, instructions.htmlContainer, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
148
+ await initialize(services, instructions?.htmlContainer, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
141
149
  } else {
142
150
  await initialize(services, undefined, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
143
151
  }
144
152
  }
145
153
 
146
154
  setUnexpectedErrorHandler((e) => {
147
- instructions.logger?.createErrorAndLog('Unexpected error', e);
155
+ instructions?.logger?.createErrorAndLog('Unexpected error', e);
148
156
  });
149
157
  };
150
158