monaco-languageclient 6.3.0-next.2 → 6.3.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 +1 -0
- package/lib/monaco-vscode-api-services.d.ts +1 -2
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +5 -5
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +1 -1
- package/src/monaco-vscode-api-services.ts +5 -6
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,7 @@ All notable changes to this npm module are documented in this file.
|
|
|
5
5
|
## [6.3.0] - 2023-08-0x
|
|
6
6
|
|
|
7
7
|
- Update to `monaco-editor` `0.40.0` and `monaco-vscode-api` `1.80.2` [#513](https://github.com/TypeFox/monaco-languageclient/pull/513)
|
|
8
|
+
- vscode api services have been cleaned-up and fully aligned with `monaco-vscode-api
|
|
8
9
|
|
|
9
10
|
## [6.2.0] - 2023-06-16
|
|
10
11
|
|
|
@@ -7,8 +7,7 @@ export type InitializeServiceConfig = {
|
|
|
7
7
|
enableNotificationService?: boolean;
|
|
8
8
|
enableModelService?: boolean;
|
|
9
9
|
configureEditorOrViewsServiceConfig?: {
|
|
10
|
-
enableViewsService
|
|
11
|
-
useDefaultOpenEditorFunction: boolean;
|
|
10
|
+
enableViewsService?: boolean;
|
|
12
11
|
openEditorFunc?: OpenEditor;
|
|
13
12
|
};
|
|
14
13
|
configureConfigurationServiceConfig?: {
|
|
@@ -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;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,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mCAAmC,CAAC,EAAE;QAClC,kBAAkB,
|
|
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,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mCAAmC,CAAC,EAAE;QAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,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,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,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;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,uBAAuB,CAAA;CACvD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB,YAAmB,uBAAuB,kBA6KvE,CAAC"}
|
|
@@ -42,7 +42,7 @@ export const importAllServices = async (config) => {
|
|
|
42
42
|
addService('model', import('vscode/service-override/model'));
|
|
43
43
|
}
|
|
44
44
|
if (lc.configureEditorOrViewsServiceConfig !== undefined) {
|
|
45
|
-
if (lc.configureEditorOrViewsServiceConfig.enableViewsService) {
|
|
45
|
+
if (lc.configureEditorOrViewsServiceConfig.enableViewsService === true) {
|
|
46
46
|
addService('views', import('vscode/service-override/views'));
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
@@ -149,16 +149,16 @@ export const importAllServices = async (config) => {
|
|
|
149
149
|
}
|
|
150
150
|
let services = {};
|
|
151
151
|
if (serviceName === 'editor' || serviceName === 'views') {
|
|
152
|
-
if (lc.configureEditorOrViewsServiceConfig
|
|
152
|
+
if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
|
|
153
|
+
services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
153
156
|
const defaultOpenEditorFunc = async (model, options, sideBySide) => {
|
|
154
157
|
console.log('Trying to open a model', model, options, sideBySide);
|
|
155
158
|
return undefined;
|
|
156
159
|
};
|
|
157
160
|
services = loadedImport.default(defaultOpenEditorFunc);
|
|
158
161
|
}
|
|
159
|
-
else if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
|
|
160
|
-
services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
|
|
161
|
-
}
|
|
162
162
|
}
|
|
163
163
|
else if (serviceName === 'configuration') {
|
|
164
164
|
if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) {
|
|
@@ -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,WAAW,EAAE,UAAU,IAAI,uBAAuB,EAAY,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACnH,OAAO,EAAE,UAAU,IAAI,0BAA0B,EAAE,MAAM,mBAAmB,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
|
@@ -18,8 +18,7 @@ export type InitializeServiceConfig = {
|
|
|
18
18
|
enableNotificationService?: boolean;
|
|
19
19
|
enableModelService?: boolean;
|
|
20
20
|
configureEditorOrViewsServiceConfig?: {
|
|
21
|
-
enableViewsService
|
|
22
|
-
useDefaultOpenEditorFunction: boolean;
|
|
21
|
+
enableViewsService?: boolean;
|
|
23
22
|
openEditorFunc?: OpenEditor
|
|
24
23
|
};
|
|
25
24
|
configureConfigurationServiceConfig?: {
|
|
@@ -93,7 +92,7 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
93
92
|
addService('model', import('vscode/service-override/model'));
|
|
94
93
|
}
|
|
95
94
|
if (lc.configureEditorOrViewsServiceConfig !== undefined) {
|
|
96
|
-
if (lc.configureEditorOrViewsServiceConfig.enableViewsService) {
|
|
95
|
+
if (lc.configureEditorOrViewsServiceConfig.enableViewsService === true) {
|
|
97
96
|
addService('views', import('vscode/service-override/views'));
|
|
98
97
|
} else {
|
|
99
98
|
addService('editor', import('vscode/service-override/editor'));
|
|
@@ -206,14 +205,14 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
206
205
|
|
|
207
206
|
let services: editor.IEditorOverrideServices = {};
|
|
208
207
|
if (serviceName === 'editor' || serviceName === 'views') {
|
|
209
|
-
if (lc.configureEditorOrViewsServiceConfig
|
|
208
|
+
if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
|
|
209
|
+
services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
|
|
210
|
+
} else {
|
|
210
211
|
const defaultOpenEditorFunc: OpenEditor = async (model, options, sideBySide) => {
|
|
211
212
|
console.log('Trying to open a model', model, options, sideBySide);
|
|
212
213
|
return undefined;
|
|
213
214
|
};
|
|
214
215
|
services = loadedImport.default(defaultOpenEditorFunc);
|
|
215
|
-
} else if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
|
|
216
|
-
services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
|
|
217
216
|
}
|
|
218
217
|
} else if (serviceName === 'configuration') {
|
|
219
218
|
if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) {
|