monaco-languageclient 6.1.0-next.1 → 6.2.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.
- package/CHANGELOG.md +5 -1
- package/lib/monaco-language-client.d.ts.map +1 -1
- package/lib/monaco-language-client.js +7 -7
- package/lib/monaco-language-client.js.map +1 -1
- package/lib/monaco-vscode-api-services.d.ts +10 -0
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +54 -13
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +6 -6
- package/src/monaco-language-client.ts +7 -8
- package/src/monaco-vscode-api-services.ts +65 -14
package/CHANGELOG.md
CHANGED
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
-
## [6.
|
|
5
|
+
## [6.2.0] - 2023-06-16
|
|
6
|
+
|
|
7
|
+
- Updated `monaco-vscode-api` to version `1.79.3`, `monaco-editor` to version `0.39.0` and `monaco-editor-workers` to version `0.39.1` [#503](https://github.com/TypeFox/monaco-languageclient/pull/503)
|
|
8
|
+
|
|
9
|
+
## [6.1.0] - 2023-06-12
|
|
6
10
|
|
|
7
11
|
- Updated to `monaco-vscode-api` version `1.79.0` and `monaco-editor` version `0.38.0` [#493](https://github.com/TypeFox/monaco-languageclient/issues/493)
|
|
8
12
|
- Updated to `monaco-vscode-api` version `1.79.1` [#501](https://github.com/TypeFox/monaco-languageclient/pull/501)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-language-client.d.ts","sourceRoot":"","sources":["../src/monaco-language-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAqC1H,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;IACxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;gBAE/C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,oBAAoB,CAAC,OAAO;IAsBzF,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;cAI5D,SAAS,IAAI,MAAM;cAInB,uBAAuB;
|
|
1
|
+
{"version":3,"file":"monaco-language-client.d.ts","sourceRoot":"","sources":["../src/monaco-language-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAqC1H,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;IACxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;gBAE/C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,oBAAoB,CAAC,OAAO;IAsBzF,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;cAI5D,SAAS,IAAI,MAAM;cAInB,uBAAuB;IA0D1C;;;OAGG;IACI,uBAAuB;CAKjC;AACD,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,OAAO;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,qBAAqB,CAAC;QACrC,kBAAkB,EAAE,mBAAmB,CAAC;KAC3C;CACJ"}
|
|
@@ -110,13 +110,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
|
|
|
110
110
|
this.registerFeature(new WillSaveFeature(this));
|
|
111
111
|
this.registerFeature(new WillSaveWaitUntilFeature(this));
|
|
112
112
|
this.registerFeature(new DidSaveTextDocumentFeature(this));
|
|
113
|
-
|
|
114
|
-
/**
|
|
115
|
-
* These are all contained in BaseLanguageClient#registerBuiltinFeatures but not registered
|
|
116
|
-
* in MonacoLanguageClient. This method is not called!
|
|
117
|
-
*/
|
|
118
|
-
registerNotUsedFeatures() {
|
|
119
|
-
// theses feature will become supported once https://github.com/CodinGame/monaco-vscode-api/pull/110 is ready
|
|
113
|
+
// enabled since monaco-vscode-api 1.79.0 (PR https://github.com/CodinGame/monaco-vscode-api/pull/110)
|
|
120
114
|
this.registerFeature(new WorkspaceSymbolFeature(this));
|
|
121
115
|
this.registerFeature(new DidCreateFilesFeature(this));
|
|
122
116
|
this.registerFeature(new DidRenameFilesFeature(this));
|
|
@@ -127,6 +121,12 @@ export class MonacoLanguageClient extends BaseLanguageClient {
|
|
|
127
121
|
this.registerFeature(new CallHierarchyFeature(this));
|
|
128
122
|
this.registerFeature(new TypeHierarchyFeature(this));
|
|
129
123
|
this.registerFeature(new InlineValueFeature(this));
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* These are all contained in BaseLanguageClient#registerBuiltinFeatures but not registered
|
|
127
|
+
* in MonacoLanguageClient. This method is not called!
|
|
128
|
+
*/
|
|
129
|
+
registerNotUsedFeatures() {
|
|
130
130
|
// these will stay unsupported for now
|
|
131
131
|
this.registerFeature(new ProgressFeature(this));
|
|
132
132
|
this.registerFeature(new NotebookDocumentSyncFeature(this));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-language-client.js","sourceRoot":"","sources":["../src/monaco-language-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monaco-language-client.js","sourceRoot":"","sources":["../src/monaco-language-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { editor } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
|
2
|
+
import { LogLevel } from 'vscode/services';
|
|
2
3
|
import type { OpenEditor } from 'vscode/service-override/editor';
|
|
4
|
+
import { ITerminalBackend, SimpleTerminalBackend } from 'vscode/service-override/terminal';
|
|
3
5
|
export type InitializeServiceConfig = {
|
|
6
|
+
enableFilesService?: boolean;
|
|
4
7
|
enableDialogService?: boolean;
|
|
5
8
|
enableNotificationService?: boolean;
|
|
6
9
|
enableModelService?: boolean;
|
|
@@ -21,8 +24,15 @@ export type InitializeServiceConfig = {
|
|
|
21
24
|
enablePreferencesService?: boolean;
|
|
22
25
|
enableSnippetsService?: boolean;
|
|
23
26
|
enableQuickaccessService?: boolean;
|
|
27
|
+
enableOutputService?: boolean;
|
|
28
|
+
configureTerminalServiceConfig?: {
|
|
29
|
+
backendImpl: SimpleTerminalBackend | ITerminalBackend;
|
|
30
|
+
};
|
|
31
|
+
enableSearchService?: boolean;
|
|
32
|
+
enableMarkersService?: boolean;
|
|
24
33
|
userServices?: editor.IEditorOverrideServices;
|
|
25
34
|
debugLogging?: boolean;
|
|
35
|
+
logLevel?: LogLevel;
|
|
26
36
|
};
|
|
27
37
|
export declare const wasVscodeApiInitialized: () => boolean;
|
|
28
38
|
export declare const initServices: (config?: InitializeServiceConfig) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-vscode-api-services.d.ts","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAoB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-vscode-api-services.d.ts","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAoB,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAsD,QAAQ,EAAsB,MAAM,iBAAiB,CAAC;AAEnH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAM3F,MAAM,MAAM,uBAAuB,GAAG;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mCAAmC,CAAC,EAAE;QAClC,kBAAkB,EAAE,OAAO,CAAC;QAC5B,4BAA4B,EAAE,OAAO,CAAC;QACtC,cAAc,CAAC,EAAE,UAAU,CAAA;KAC9B,CAAC;IACF,mCAAmC,CAAC,EAAE;QAClC,mBAAmB,EAAE,MAAM,CAAC;KAC/B,CAAC;IACF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,8BAA8B,CAAC,EAAE;QAC7B,WAAW,EAAE,qBAAqB,GAAG,gBAAgB,CAAA;KACxD,CAAA;IACD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,uBAAuB,CAAC;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACtB,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAEnC,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,uBAAuB,kBAkBlE,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { Uri } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
|
6
|
-
import { initialize as initializeMonacoService } from 'vscode/services';
|
|
6
|
+
import { ILogService, initialize as initializeMonacoService, StandaloneServices } from 'vscode/services';
|
|
7
7
|
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
|
|
8
8
|
export const wasVscodeApiInitialized = () => {
|
|
9
9
|
return window.MonacoEnvironment?.vscodeApiInitialised === true;
|
|
@@ -18,7 +18,11 @@ export const initServices = async (config) => {
|
|
|
18
18
|
console.log('initializeVscodeExtensions completed successfully');
|
|
19
19
|
}
|
|
20
20
|
if (!window.MonacoEnvironment) {
|
|
21
|
-
window.MonacoEnvironment = {
|
|
21
|
+
window.MonacoEnvironment = {
|
|
22
|
+
createTrustedTypesPolicy: (_policyName) => {
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
22
26
|
}
|
|
23
27
|
window.MonacoEnvironment.vscodeApiInitialised = true;
|
|
24
28
|
};
|
|
@@ -31,8 +35,9 @@ const importAllServices = async (config) => {
|
|
|
31
35
|
promises.push(promise);
|
|
32
36
|
serviceNames.push(name);
|
|
33
37
|
};
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
if (lc.enableFilesService === true) {
|
|
39
|
+
addService('files', import('vscode/service-override/files'));
|
|
40
|
+
}
|
|
36
41
|
if (lc.enableModelService === true) {
|
|
37
42
|
addService('model', import('vscode/service-override/model'));
|
|
38
43
|
}
|
|
@@ -44,11 +49,6 @@ const importAllServices = async (config) => {
|
|
|
44
49
|
addService('editor', import('vscode/service-override/editor'));
|
|
45
50
|
}
|
|
46
51
|
}
|
|
47
|
-
if (lc.enableQuickaccessService === true) {
|
|
48
|
-
addService('quickaccess', import('vscode/service-override/quickaccess'));
|
|
49
|
-
// quickaccess requires keybindings
|
|
50
|
-
lc.enableKeybindingsService = true;
|
|
51
|
-
}
|
|
52
52
|
if (lc.configureConfigurationServiceConfig !== undefined) {
|
|
53
53
|
addService('configuration', import('vscode/service-override/configuration'));
|
|
54
54
|
}
|
|
@@ -60,8 +60,6 @@ const importAllServices = async (config) => {
|
|
|
60
60
|
}
|
|
61
61
|
if (lc.enableThemeService === true) {
|
|
62
62
|
addService('theme', import('vscode/service-override/theme'));
|
|
63
|
-
// theme requires textmate
|
|
64
|
-
lc.enableTextmateService = true;
|
|
65
63
|
}
|
|
66
64
|
if (lc.enableTextmateService === true) {
|
|
67
65
|
addService('textmate', import('vscode/service-override/textmate'));
|
|
@@ -84,6 +82,21 @@ const importAllServices = async (config) => {
|
|
|
84
82
|
if (lc.enableSnippetsService === true) {
|
|
85
83
|
addService('snippets', import('vscode/service-override/snippets'));
|
|
86
84
|
}
|
|
85
|
+
if (lc.enableQuickaccessService === true) {
|
|
86
|
+
addService('quickaccess', import('vscode/service-override/quickaccess'));
|
|
87
|
+
}
|
|
88
|
+
if (lc.enableOutputService === true) {
|
|
89
|
+
addService('output', import('vscode/service-override/output'));
|
|
90
|
+
}
|
|
91
|
+
if (lc.configureTerminalServiceConfig !== undefined) {
|
|
92
|
+
addService('terminal', import('vscode/service-override/terminal'));
|
|
93
|
+
}
|
|
94
|
+
if (lc.enableSearchService === true) {
|
|
95
|
+
addService('search', import('vscode/service-override/search'));
|
|
96
|
+
}
|
|
97
|
+
if (lc.enableMarkersService === true) {
|
|
98
|
+
addService('markers', import('vscode/service-override/markers'));
|
|
99
|
+
}
|
|
87
100
|
const reportServiceLoading = (origin, services, debugLogging) => {
|
|
88
101
|
for (const serviceName of Object.keys(services)) {
|
|
89
102
|
if (debugLogging) {
|
|
@@ -103,6 +116,24 @@ const importAllServices = async (config) => {
|
|
|
103
116
|
mergeServices(userServices, overrideServices);
|
|
104
117
|
reportServiceLoading('user', userServices, lc.debugLogging === true);
|
|
105
118
|
}
|
|
119
|
+
// files service is required
|
|
120
|
+
if (!serviceNames.includes('files') && !Object.keys(overrideServices).includes('fileService')) {
|
|
121
|
+
throw new Error('"files" service was not configured, but it is mandatory. Please add it to the "initServices" config.');
|
|
122
|
+
}
|
|
123
|
+
// theme requires textmate
|
|
124
|
+
if ((serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService')) &&
|
|
125
|
+
!(serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature'))) {
|
|
126
|
+
throw new Error('"theme" requires "textmate" service. Please add it to the "initServices" config.');
|
|
127
|
+
}
|
|
128
|
+
// quickaccess requires keybindings
|
|
129
|
+
if ((serviceNames.includes('quickaccess') || Object.keys(overrideServices).includes('quickInputService')) &&
|
|
130
|
+
!(serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService'))) {
|
|
131
|
+
throw new Error('"quickaccess" requires "keybindings" service. Please add it to the "initServices" config.');
|
|
132
|
+
}
|
|
133
|
+
if (serviceNames.includes('markers') &&
|
|
134
|
+
!(serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService'))) {
|
|
135
|
+
throw new Error('"markers" requires "views" service. Please add it to the "initServices" config.');
|
|
136
|
+
}
|
|
106
137
|
for (const loadedImport of loadedImports) {
|
|
107
138
|
const serviceName = serviceNames[count];
|
|
108
139
|
if (lc.debugLogging === true) {
|
|
@@ -122,8 +153,15 @@ const importAllServices = async (config) => {
|
|
|
122
153
|
}
|
|
123
154
|
}
|
|
124
155
|
else if (serviceName === 'configuration') {
|
|
125
|
-
|
|
126
|
-
|
|
156
|
+
if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) {
|
|
157
|
+
const uri = Uri.file(lc.configureConfigurationServiceConfig.defaultWorkspaceUri);
|
|
158
|
+
services = loadedImport.default(uri);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
else if (serviceName === 'terminal') {
|
|
162
|
+
if (lc.configureTerminalServiceConfig?.backendImpl) {
|
|
163
|
+
services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl);
|
|
164
|
+
}
|
|
127
165
|
}
|
|
128
166
|
else {
|
|
129
167
|
services = loadedImport.default();
|
|
@@ -133,5 +171,8 @@ const importAllServices = async (config) => {
|
|
|
133
171
|
count++;
|
|
134
172
|
}
|
|
135
173
|
await initializeMonacoService(overrideServices);
|
|
174
|
+
if (lc.logLevel) {
|
|
175
|
+
StandaloneServices.get(ILogService).setLevel(lc.logLevel);
|
|
176
|
+
}
|
|
136
177
|
};
|
|
137
178
|
//# sourceMappingURL=monaco-vscode-api-services.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-vscode-api-services.js","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAuB,GAAG,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,UAAU,IAAI,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-vscode-api-services.js","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"volta": {
|
|
40
40
|
"node": "18.16.0",
|
|
41
|
-
"npm": "9.6.
|
|
41
|
+
"npm": "9.6.7"
|
|
42
42
|
},
|
|
43
43
|
"files": [
|
|
44
44
|
"lib",
|
|
@@ -48,14 +48,14 @@
|
|
|
48
48
|
"License.txt"
|
|
49
49
|
],
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"monaco-editor": "~0.
|
|
52
|
-
"vscode": "npm:@codingame/monaco-vscode-api
|
|
51
|
+
"monaco-editor": "~0.39.0",
|
|
52
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.79.3",
|
|
53
53
|
"vscode-jsonrpc": "~8.1.0",
|
|
54
54
|
"vscode-languageclient": "~8.1.0"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"monaco-editor": "~0.
|
|
58
|
-
"vscode": "npm:@codingame/monaco-vscode-api
|
|
57
|
+
"monaco-editor": "~0.39.0",
|
|
58
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.79.3"
|
|
59
59
|
},
|
|
60
60
|
"peerDependenciesMeta": {
|
|
61
61
|
"monaco-editor": {
|
|
@@ -124,14 +124,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
|
|
|
124
124
|
this.registerFeature(new WillSaveFeature(this));
|
|
125
125
|
this.registerFeature(new WillSaveWaitUntilFeature(this));
|
|
126
126
|
this.registerFeature(new DidSaveTextDocumentFeature(this));
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
/**
|
|
130
|
-
* These are all contained in BaseLanguageClient#registerBuiltinFeatures but not registered
|
|
131
|
-
* in MonacoLanguageClient. This method is not called!
|
|
132
|
-
*/
|
|
133
|
-
public registerNotUsedFeatures() {
|
|
134
|
-
// theses feature will become supported once https://github.com/CodinGame/monaco-vscode-api/pull/110 is ready
|
|
127
|
+
// enabled since monaco-vscode-api 1.79.0 (PR https://github.com/CodinGame/monaco-vscode-api/pull/110)
|
|
135
128
|
this.registerFeature(new WorkspaceSymbolFeature(this));
|
|
136
129
|
this.registerFeature(new DidCreateFilesFeature(this));
|
|
137
130
|
this.registerFeature(new DidRenameFilesFeature(this));
|
|
@@ -142,7 +135,13 @@ export class MonacoLanguageClient extends BaseLanguageClient {
|
|
|
142
135
|
this.registerFeature(new CallHierarchyFeature(this));
|
|
143
136
|
this.registerFeature(new TypeHierarchyFeature(this));
|
|
144
137
|
this.registerFeature(new InlineValueFeature(this));
|
|
138
|
+
}
|
|
145
139
|
|
|
140
|
+
/**
|
|
141
|
+
* These are all contained in BaseLanguageClient#registerBuiltinFeatures but not registered
|
|
142
|
+
* in MonacoLanguageClient. This method is not called!
|
|
143
|
+
*/
|
|
144
|
+
public registerNotUsedFeatures() {
|
|
146
145
|
// these will stay unsupported for now
|
|
147
146
|
this.registerFeature(new ProgressFeature(this));
|
|
148
147
|
this.registerFeature(new NotebookDocumentSyncFeature(this));
|
|
@@ -4,15 +4,17 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
6
|
import { editor, Environment, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js';
|
|
7
|
-
import { initialize as initializeMonacoService } from 'vscode/services';
|
|
7
|
+
import { ILogService, initialize as initializeMonacoService, LogLevel, StandaloneServices } from 'vscode/services';
|
|
8
8
|
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
|
|
9
9
|
import type { OpenEditor } from 'vscode/service-override/editor';
|
|
10
|
+
import { ITerminalBackend, SimpleTerminalBackend } from 'vscode/service-override/terminal';
|
|
10
11
|
|
|
11
12
|
interface MonacoEnvironmentEnhanced extends Environment {
|
|
12
13
|
vscodeApiInitialised: boolean;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
export type InitializeServiceConfig = {
|
|
17
|
+
enableFilesService?: boolean;
|
|
16
18
|
enableDialogService?: boolean;
|
|
17
19
|
enableNotificationService?: boolean;
|
|
18
20
|
enableModelService?: boolean;
|
|
@@ -33,8 +35,15 @@ export type InitializeServiceConfig = {
|
|
|
33
35
|
enablePreferencesService?: boolean;
|
|
34
36
|
enableSnippetsService?: boolean;
|
|
35
37
|
enableQuickaccessService?: boolean;
|
|
38
|
+
enableOutputService?: boolean;
|
|
39
|
+
configureTerminalServiceConfig?: {
|
|
40
|
+
backendImpl: SimpleTerminalBackend | ITerminalBackend
|
|
41
|
+
}
|
|
42
|
+
enableSearchService?: boolean;
|
|
43
|
+
enableMarkersService?: boolean;
|
|
36
44
|
userServices?: editor.IEditorOverrideServices;
|
|
37
45
|
debugLogging?: boolean;
|
|
46
|
+
logLevel?: LogLevel
|
|
38
47
|
};
|
|
39
48
|
|
|
40
49
|
export const wasVscodeApiInitialized = () => {
|
|
@@ -52,7 +61,11 @@ export const initServices = async (config?: InitializeServiceConfig) => {
|
|
|
52
61
|
}
|
|
53
62
|
|
|
54
63
|
if (!window.MonacoEnvironment) {
|
|
55
|
-
window.MonacoEnvironment = {
|
|
64
|
+
window.MonacoEnvironment = {
|
|
65
|
+
createTrustedTypesPolicy: (_policyName: string) => {
|
|
66
|
+
return undefined;
|
|
67
|
+
}
|
|
68
|
+
};
|
|
56
69
|
}
|
|
57
70
|
(window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true;
|
|
58
71
|
};
|
|
@@ -72,9 +85,9 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
72
85
|
serviceNames.push(name);
|
|
73
86
|
};
|
|
74
87
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
88
|
+
if (lc.enableFilesService === true) {
|
|
89
|
+
addService('files', import('vscode/service-override/files'));
|
|
90
|
+
}
|
|
78
91
|
if (lc.enableModelService === true) {
|
|
79
92
|
addService('model', import('vscode/service-override/model'));
|
|
80
93
|
}
|
|
@@ -85,11 +98,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
85
98
|
addService('editor', import('vscode/service-override/editor'));
|
|
86
99
|
}
|
|
87
100
|
}
|
|
88
|
-
if (lc.enableQuickaccessService === true) {
|
|
89
|
-
addService('quickaccess', import('vscode/service-override/quickaccess'));
|
|
90
|
-
// quickaccess requires keybindings
|
|
91
|
-
lc.enableKeybindingsService = true;
|
|
92
|
-
}
|
|
93
101
|
if (lc.configureConfigurationServiceConfig !== undefined) {
|
|
94
102
|
addService('configuration', import('vscode/service-override/configuration'));
|
|
95
103
|
}
|
|
@@ -101,8 +109,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
101
109
|
}
|
|
102
110
|
if (lc.enableThemeService === true) {
|
|
103
111
|
addService('theme', import('vscode/service-override/theme'));
|
|
104
|
-
// theme requires textmate
|
|
105
|
-
lc.enableTextmateService = true;
|
|
106
112
|
}
|
|
107
113
|
if (lc.enableTextmateService === true) {
|
|
108
114
|
addService('textmate', import('vscode/service-override/textmate'));
|
|
@@ -125,6 +131,21 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
125
131
|
if (lc.enableSnippetsService === true) {
|
|
126
132
|
addService('snippets', import('vscode/service-override/snippets'));
|
|
127
133
|
}
|
|
134
|
+
if (lc.enableQuickaccessService === true) {
|
|
135
|
+
addService('quickaccess', import('vscode/service-override/quickaccess'));
|
|
136
|
+
}
|
|
137
|
+
if (lc.enableOutputService === true) {
|
|
138
|
+
addService('output', import('vscode/service-override/output'));
|
|
139
|
+
}
|
|
140
|
+
if (lc.configureTerminalServiceConfig !== undefined) {
|
|
141
|
+
addService('terminal', import('vscode/service-override/terminal'));
|
|
142
|
+
}
|
|
143
|
+
if (lc.enableSearchService === true) {
|
|
144
|
+
addService('search', import('vscode/service-override/search'));
|
|
145
|
+
}
|
|
146
|
+
if (lc.enableMarkersService === true) {
|
|
147
|
+
addService('markers', import('vscode/service-override/markers'));
|
|
148
|
+
}
|
|
128
149
|
|
|
129
150
|
const reportServiceLoading = (origin: string, services: editor.IEditorOverrideServices, debugLogging: boolean) => {
|
|
130
151
|
for (const serviceName of Object.keys(services)) {
|
|
@@ -148,6 +169,27 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
148
169
|
reportServiceLoading('user', userServices, lc.debugLogging === true);
|
|
149
170
|
}
|
|
150
171
|
|
|
172
|
+
// files service is required
|
|
173
|
+
if (!serviceNames.includes('files') && !Object.keys(overrideServices).includes('fileService')) {
|
|
174
|
+
throw new Error('"files" service was not configured, but it is mandatory. Please add it to the "initServices" config.');
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
// theme requires textmate
|
|
178
|
+
if ((serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService')) &&
|
|
179
|
+
!(serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature'))) {
|
|
180
|
+
throw new Error('"theme" requires "textmate" service. Please add it to the "initServices" config.');
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
// quickaccess requires keybindings
|
|
184
|
+
if ((serviceNames.includes('quickaccess') || Object.keys(overrideServices).includes('quickInputService')) &&
|
|
185
|
+
!(serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService'))) {
|
|
186
|
+
throw new Error('"quickaccess" requires "keybindings" service. Please add it to the "initServices" config.');
|
|
187
|
+
}
|
|
188
|
+
if (serviceNames.includes('markers') &&
|
|
189
|
+
!(serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService'))) {
|
|
190
|
+
throw new Error('"markers" requires "views" service. Please add it to the "initServices" config.');
|
|
191
|
+
}
|
|
192
|
+
|
|
151
193
|
for (const loadedImport of loadedImports) {
|
|
152
194
|
const serviceName = serviceNames[count];
|
|
153
195
|
if (lc.debugLogging === true) {
|
|
@@ -166,8 +208,14 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
166
208
|
services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
|
|
167
209
|
}
|
|
168
210
|
} else if (serviceName === 'configuration') {
|
|
169
|
-
|
|
170
|
-
|
|
211
|
+
if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) {
|
|
212
|
+
const uri = Uri.file(lc.configureConfigurationServiceConfig!.defaultWorkspaceUri);
|
|
213
|
+
services = loadedImport.default(uri);
|
|
214
|
+
}
|
|
215
|
+
} else if (serviceName === 'terminal') {
|
|
216
|
+
if (lc.configureTerminalServiceConfig?.backendImpl) {
|
|
217
|
+
services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl);
|
|
218
|
+
}
|
|
171
219
|
} else {
|
|
172
220
|
services = loadedImport.default();
|
|
173
221
|
}
|
|
@@ -179,4 +227,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
179
227
|
}
|
|
180
228
|
|
|
181
229
|
await initializeMonacoService(overrideServices);
|
|
230
|
+
if (lc.logLevel) {
|
|
231
|
+
StandaloneServices.get(ILogService).setLevel(lc.logLevel);
|
|
232
|
+
}
|
|
182
233
|
};
|