monaco-languageclient 6.3.0 → 6.4.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-vscode-api-services.d.ts +3 -0
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +9 -6
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +5 -5
- package/src/monaco-vscode-api-services.ts +13 -6
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.4.0] - 2023-08-10
|
|
6
|
+
|
|
7
|
+
- Update to `monaco-editor` `0.41.0` and `monaco-vscode-api` `1.81.0` [#520](https://github.com/TypeFox/monaco-languageclient/pull/520)
|
|
8
|
+
|
|
9
|
+
## [6.3.0] - 2023-08-04
|
|
6
10
|
|
|
7
11
|
- Update to `monaco-editor` `0.40.0` and `monaco-vscode-api` `1.80.2` [#513](https://github.com/TypeFox/monaco-languageclient/pull/513)
|
|
8
12
|
- vscode api services have been cleaned-up and fully aligned with `monaco-vscode-api
|
|
@@ -6,6 +6,9 @@ export type InitializeServiceConfig = {
|
|
|
6
6
|
enableDialogService?: boolean;
|
|
7
7
|
enableNotificationService?: boolean;
|
|
8
8
|
enableModelService?: boolean;
|
|
9
|
+
/**
|
|
10
|
+
* editor service is the default. If you want to use the views service, set enableViewsService to true.
|
|
11
|
+
*/
|
|
9
12
|
configureEditorOrViewsServiceConfig?: {
|
|
10
13
|
enableViewsService?: boolean;
|
|
11
14
|
openEditorFunc?: OpenEditor;
|
|
@@ -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,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,
|
|
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;;OAEG;IACH,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,kBAiLvE,CAAC"}
|
|
@@ -127,19 +127,22 @@ export const importAllServices = async (config) => {
|
|
|
127
127
|
mergeServices(userServices, overrideServices);
|
|
128
128
|
reportServiceLoading(userServices, lc.debugLogging === true, 'user');
|
|
129
129
|
}
|
|
130
|
+
const haveThemeService = serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService');
|
|
131
|
+
const haveTextmateService = serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature');
|
|
132
|
+
const haveQuickaccessService = serviceNames.includes('quickaccess') || Object.keys(overrideServices).includes('quickInputService');
|
|
133
|
+
const haveKeybindingsService = serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService');
|
|
134
|
+
const haveMarkersService = serviceNames.includes('markers');
|
|
135
|
+
const haveViewsService = serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService');
|
|
130
136
|
// theme requires textmate
|
|
131
|
-
if (
|
|
132
|
-
!(serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature'))) {
|
|
137
|
+
if (haveThemeService && !haveTextmateService) {
|
|
133
138
|
throw new Error('"theme" requires "textmate" service. Please add it to the "initServices" config.');
|
|
134
139
|
}
|
|
135
140
|
// quickaccess requires keybindings
|
|
136
|
-
if (
|
|
137
|
-
!(serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService'))) {
|
|
141
|
+
if (haveQuickaccessService && !haveKeybindingsService) {
|
|
138
142
|
throw new Error('"quickaccess" requires "keybindings" service. Please add it to the "initServices" config.');
|
|
139
143
|
}
|
|
140
144
|
// markers service requires views service
|
|
141
|
-
if (
|
|
142
|
-
!(serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService'))) {
|
|
145
|
+
if (haveMarkersService && !haveViewsService) {
|
|
143
146
|
throw new Error('"markers" requires "views" service. Please add it to the "initServices" config.');
|
|
144
147
|
}
|
|
145
148
|
for (const loadedImport of loadedImports) {
|
|
@@ -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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.4.0",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -48,14 +48,14 @@
|
|
|
48
48
|
"License.txt"
|
|
49
49
|
],
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"monaco-editor": "~0.
|
|
52
|
-
"vscode": "npm:@codingame/monaco-vscode-api@1.
|
|
51
|
+
"monaco-editor": "~0.41.0",
|
|
52
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.81.0",
|
|
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@1.
|
|
57
|
+
"monaco-editor": "~0.41.0",
|
|
58
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.81.0"
|
|
59
59
|
},
|
|
60
60
|
"peerDependenciesMeta": {
|
|
61
61
|
"monaco-editor": {
|
|
@@ -17,6 +17,9 @@ export type InitializeServiceConfig = {
|
|
|
17
17
|
enableDialogService?: boolean;
|
|
18
18
|
enableNotificationService?: boolean;
|
|
19
19
|
enableModelService?: boolean;
|
|
20
|
+
/**
|
|
21
|
+
* editor service is the default. If you want to use the views service, set enableViewsService to true.
|
|
22
|
+
*/
|
|
20
23
|
configureEditorOrViewsServiceConfig?: {
|
|
21
24
|
enableViewsService?: boolean;
|
|
22
25
|
openEditorFunc?: OpenEditor
|
|
@@ -179,21 +182,25 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
179
182
|
reportServiceLoading(userServices, lc.debugLogging === true, 'user');
|
|
180
183
|
}
|
|
181
184
|
|
|
185
|
+
const haveThemeService = serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService');
|
|
186
|
+
const haveTextmateService = serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature');
|
|
187
|
+
const haveQuickaccessService = serviceNames.includes('quickaccess') || Object.keys(overrideServices).includes('quickInputService');
|
|
188
|
+
const haveKeybindingsService = serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService');
|
|
189
|
+
const haveMarkersService = serviceNames.includes('markers');
|
|
190
|
+
const haveViewsService = serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService');
|
|
191
|
+
|
|
182
192
|
// theme requires textmate
|
|
183
|
-
if (
|
|
184
|
-
!(serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature'))) {
|
|
193
|
+
if (haveThemeService && !haveTextmateService) {
|
|
185
194
|
throw new Error('"theme" requires "textmate" service. Please add it to the "initServices" config.');
|
|
186
195
|
}
|
|
187
196
|
|
|
188
197
|
// quickaccess requires keybindings
|
|
189
|
-
if (
|
|
190
|
-
!(serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService'))) {
|
|
198
|
+
if (haveQuickaccessService && !haveKeybindingsService) {
|
|
191
199
|
throw new Error('"quickaccess" requires "keybindings" service. Please add it to the "initServices" config.');
|
|
192
200
|
}
|
|
193
201
|
|
|
194
202
|
// markers service requires views service
|
|
195
|
-
if (
|
|
196
|
-
!(serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService'))) {
|
|
203
|
+
if (haveMarkersService && !haveViewsService) {
|
|
197
204
|
throw new Error('"markers" requires "views" service. Please add it to the "initServices" config.');
|
|
198
205
|
}
|
|
199
206
|
|