monaco-languageclient 6.5.0-next.1 → 6.5.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 +4 -2
- package/lib/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/monaco-vscode-api-services.d.ts +2 -0
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +12 -12
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +1 -0
- package/src/monaco-vscode-api-services.ts +14 -12
package/CHANGELOG.md
CHANGED
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
-
## [6.5.0] - 2023-09-
|
|
5
|
+
## [6.5.0] - 2023-09-29
|
|
6
6
|
|
|
7
7
|
- Updated to `monaco-editor` `0.43.0` and `monaco-vscode-api` `1.82.2`
|
|
8
|
-
- Only keep user services in`initServices`. It requires to specifically import and use services provided by
|
|
8
|
+
- Only keep user services in`initServices`. It requires to specifically import and use services provided by [monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api#monaco-standalone-services)
|
|
9
9
|
- languages and model services are always added by `monaco-languagclient`
|
|
10
|
+
- layout, environment, extension, files and quickAccess servies are always added by `monaco-vscode-api`
|
|
11
|
+
- Additional services need to be added to the package dependencies and imported and configured as shown in the [examples](https://github.com/TypeFox/monaco-languageclient#examples)
|
|
10
12
|
|
|
11
13
|
## [6.4.6] - 2023-09-05
|
|
12
14
|
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type { IConnectionProvider, MonacoLanguageClientOptions } from './monaco-language-client.js';
|
|
2
2
|
export * from './monaco-language-client.js';
|
|
3
|
+
export type { InitializeServiceConfig } from './monaco-vscode-api-services.js';
|
|
3
4
|
export * from './monaco-vscode-api-services.js';
|
|
4
5
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACpG,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACpG,cAAc,6BAA6B,CAAC;AAC5C,YAAY,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,cAAc,iCAAiC,CAAC"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,cAAc,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,cAAc,6BAA6B,CAAC;AAE5C,cAAc,iCAAiC,CAAC"}
|
|
@@ -9,6 +9,8 @@ export type InitializeServiceConfig = {
|
|
|
9
9
|
export declare const wasVscodeApiInitialized: () => boolean;
|
|
10
10
|
export declare const initServices: (config?: InitializeServiceConfig) => Promise<void>;
|
|
11
11
|
export declare const useOpenEditorStub: OpenEditor;
|
|
12
|
+
export declare const reportServiceLoading: (services: editor.IEditorOverrideServices, debugLogging: boolean) => void;
|
|
13
|
+
export declare const mergeServices: (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => void;
|
|
12
14
|
/**
|
|
13
15
|
* monaco-vscode-api automatically loads the following services:
|
|
14
16
|
* - layout
|
|
@@ -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,EAAe,MAAM,eAAe,CAAC;AACpD,OAAO,EAA2B,QAAQ,EAAsB,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAQ9E,MAAM,MAAM,uBAAuB,GAAG;IAClC,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,kBAclE,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAG/B,CAAC;AAEF;;;;;;;;;;;GAWG;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,EAAe,MAAM,eAAe,CAAC;AACpD,OAAO,EAA2B,QAAQ,EAAsB,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAQ9E,MAAM,MAAM,uBAAuB,GAAG;IAClC,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,kBAclE,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAG/B,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,OAAO,uBAAuB,gBAAgB,OAAO,SAMnG,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,OAAO,uBAAuB,oBAAoB,OAAO,uBAAuB,SAIvH,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,YAAmB,uBAAuB,kBA+BvE,CAAC"}
|
|
@@ -27,6 +27,18 @@ export const useOpenEditorStub = async (modelRef, options, sideBySide) => {
|
|
|
27
27
|
console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
|
|
28
28
|
return undefined;
|
|
29
29
|
};
|
|
30
|
+
export const reportServiceLoading = (services, debugLogging) => {
|
|
31
|
+
for (const serviceName of Object.keys(services)) {
|
|
32
|
+
if (debugLogging) {
|
|
33
|
+
console.log(`Loading service: ${serviceName}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
export const mergeServices = (services, overrideServices) => {
|
|
38
|
+
for (const [name, service] of Object.entries(services)) {
|
|
39
|
+
overrideServices[name] = service;
|
|
40
|
+
}
|
|
41
|
+
};
|
|
30
42
|
/**
|
|
31
43
|
* monaco-vscode-api automatically loads the following services:
|
|
32
44
|
* - layout
|
|
@@ -43,18 +55,6 @@ export const importAllServices = async (config) => {
|
|
|
43
55
|
const serviceNames = [];
|
|
44
56
|
const lc = config ?? {};
|
|
45
57
|
const userServices = lc.userServices ?? {};
|
|
46
|
-
const reportServiceLoading = (services, debugLogging) => {
|
|
47
|
-
for (const serviceName of Object.keys(services)) {
|
|
48
|
-
if (debugLogging) {
|
|
49
|
-
console.log(`Loading service: ${serviceName}`);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
};
|
|
53
|
-
const mergeServices = (services, overrideServices) => {
|
|
54
|
-
for (const [name, service] of Object.entries(services)) {
|
|
55
|
-
overrideServices[name] = service;
|
|
56
|
-
}
|
|
57
|
-
};
|
|
58
58
|
const mlcDefautServices = {
|
|
59
59
|
...getLanguagesServiceOverride(),
|
|
60
60
|
...getModelServiceOverride()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-vscode-api-services.js","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,OAAO,EAAE,WAAW,EAAE,UAAU,EAAY,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,UAAU,IAAI,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE7E,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AAYtF,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACxC,OAAQ,MAAM,CAAC,iBAA+C,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAgC,EAAE,EAAE;IACnE,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,MAAM,EAAE,YAAY,KAAK,IAAI,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;KACpD;IACD,MAAM,0BAA0B,EAAE,CAAC;IACnC,IAAI,MAAM,EAAE,YAAY,KAAK,IAAI,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;KACpE;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;QAC3B,MAAM,CAAC,iBAAiB,GAAG,EAAE,CAAC;KACjC;IACA,MAAM,CAAC,iBAA+C,CAAC,oBAAoB,GAAG,IAAI,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAe,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;IACjF,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1F,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"monaco-vscode-api-services.js","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,OAAO,EAAE,WAAW,EAAE,UAAU,EAAY,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,UAAU,IAAI,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE7E,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AAYtF,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACxC,OAAQ,MAAM,CAAC,iBAA+C,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAgC,EAAE,EAAE;IACnE,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,MAAM,EAAE,YAAY,KAAK,IAAI,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;KACpD;IACD,MAAM,0BAA0B,EAAE,CAAC;IACnC,IAAI,MAAM,EAAE,YAAY,KAAK,IAAI,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;KACpE;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;QAC3B,MAAM,CAAC,iBAAiB,GAAG,EAAE,CAAC;KACjC;IACA,MAAM,CAAC,iBAA+C,CAAC,oBAAoB,GAAG,IAAI,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAe,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;IACjF,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1F,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAAwC,EAAE,YAAqB,EAAE,EAAE;IACpG,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC7C,IAAI,YAAY,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,oBAAoB,WAAW,EAAE,CAAC,CAAC;SAClD;KACJ;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAwC,EAAE,gBAAgD,EAAE,EAAE;IACxH,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACpD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;KACpC;AACL,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAAgC,EAAE,EAAE;IACxE,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,EAAE,GAA4B,MAAM,IAAI,EAAE,CAAC;IACjD,MAAM,YAAY,GAAmC,EAAE,CAAC,YAAY,IAAI,EAAE,CAAC;IAE3E,MAAM,iBAAiB,GAAG;QACtB,GAAG,2BAA2B,EAAE;QAChC,GAAG,uBAAuB,EAAE;KAC/B,CAAC;IACF,aAAa,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IAC/C,oBAAoB,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;IAE7D,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC9G,MAAM,mBAAmB,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IACnI,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAE9G,0BAA0B;IAC1B,IAAI,gBAAgB,IAAI,CAAC,mBAAmB,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;KAChG;IAED,yCAAyC;IACzC,IAAI,kBAAkB,IAAI,CAAC,gBAAgB,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;KAC/F;IAED,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC;IAC/B,IAAI,EAAE,CAAC,QAAQ,EAAE;QACb,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;KAC7D;AACL,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient",
|
|
3
|
-
"version": "6.5.0
|
|
3
|
+
"version": "6.5.0",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"monaco-editor": "~0.43.0",
|
|
52
52
|
"vscode": "npm:@codingame/monaco-vscode-api@1.82.2",
|
|
53
|
-
"@codingame/monaco-vscode-languages-service-override": "1.82.2",
|
|
54
|
-
"@codingame/monaco-vscode-model-service-override": "1.82.2",
|
|
53
|
+
"@codingame/monaco-vscode-languages-service-override": "~1.82.2",
|
|
54
|
+
"@codingame/monaco-vscode-model-service-override": "~1.82.2",
|
|
55
55
|
"vscode-jsonrpc": "~8.1.0",
|
|
56
56
|
"vscode-languageclient": "~8.1.0"
|
|
57
57
|
},
|
package/src/index.ts
CHANGED
|
@@ -5,4 +5,5 @@
|
|
|
5
5
|
|
|
6
6
|
export type { IConnectionProvider, MonacoLanguageClientOptions } from './monaco-language-client.js';
|
|
7
7
|
export * from './monaco-language-client.js';
|
|
8
|
+
export type { InitializeServiceConfig } from './monaco-vscode-api-services.js';
|
|
8
9
|
export * from './monaco-vscode-api-services.js';
|
|
@@ -45,6 +45,20 @@ export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySid
|
|
|
45
45
|
return undefined;
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
+
export const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean) => {
|
|
49
|
+
for (const serviceName of Object.keys(services)) {
|
|
50
|
+
if (debugLogging) {
|
|
51
|
+
console.log(`Loading service: ${serviceName}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export const mergeServices = (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => {
|
|
57
|
+
for (const [name, service] of Object.entries(services)) {
|
|
58
|
+
overrideServices[name] = service;
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
|
|
48
62
|
/**
|
|
49
63
|
* monaco-vscode-api automatically loads the following services:
|
|
50
64
|
* - layout
|
|
@@ -62,18 +76,6 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
62
76
|
const lc: InitializeServiceConfig = config ?? {};
|
|
63
77
|
const userServices: editor.IEditorOverrideServices = lc.userServices ?? {};
|
|
64
78
|
|
|
65
|
-
const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean) => {
|
|
66
|
-
for (const serviceName of Object.keys(services)) {
|
|
67
|
-
if (debugLogging) {
|
|
68
|
-
console.log(`Loading service: ${serviceName}`);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
};
|
|
72
|
-
const mergeServices = (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => {
|
|
73
|
-
for (const [name, service] of Object.entries(services)) {
|
|
74
|
-
overrideServices[name] = service;
|
|
75
|
-
}
|
|
76
|
-
};
|
|
77
79
|
const mlcDefautServices = {
|
|
78
80
|
...getLanguagesServiceOverride(),
|
|
79
81
|
...getModelServiceOverride()
|