monaco-languageclient 7.0.0 → 7.0.2
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 +8 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.d.ts +6 -1
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +21 -8
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +9 -9
- package/src/index.ts +1 -1
- package/src/monaco-vscode-api-services.ts +23 -10
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this npm module are documented in this file.
|
|
4
4
|
|
|
5
|
+
## [7.0.2] - 2023-11-15
|
|
6
|
+
|
|
7
|
+
- Updated to `monaco-vscode-api` `1.83.7`.
|
|
8
|
+
|
|
9
|
+
## [7.0.1] - 2023-11-10
|
|
10
|
+
|
|
11
|
+
- Split `initServices` into two functions `initVscodeServices` and `initVscodeExtensions`. extension init is no longer blocked by service init in case and service init will only performed once.
|
|
12
|
+
|
|
5
13
|
## [7.0.0] - 2023-11-02
|
|
6
14
|
|
|
7
15
|
- **BREAKING:** Changed the treemending approach:
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +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
|
+
export type { InitializeServiceConfig, MonacoEnvironmentEnhanced } from './monaco-vscode-api-services.js';
|
|
4
4
|
export * from './monaco-vscode-api-services.js';
|
|
5
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,YAAY,EAAE,uBAAuB,EAAE,MAAM,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,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAC1G,cAAc,iCAAiC,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { editor } from 'monaco-editor';
|
|
1
|
+
import { editor, Environment } from 'monaco-editor';
|
|
2
2
|
import { LogLevel } from 'vscode/services';
|
|
3
3
|
import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
4
|
+
export interface MonacoEnvironmentEnhanced extends Environment {
|
|
5
|
+
vscodeApiInitialised: boolean;
|
|
6
|
+
}
|
|
4
7
|
export type InitializeServiceConfig = {
|
|
5
8
|
userServices?: editor.IEditorOverrideServices;
|
|
6
9
|
debugLogging?: boolean;
|
|
@@ -8,6 +11,8 @@ export type InitializeServiceConfig = {
|
|
|
8
11
|
};
|
|
9
12
|
export declare const wasVscodeApiInitialized: () => boolean;
|
|
10
13
|
export declare const initServices: (config?: InitializeServiceConfig) => Promise<void>;
|
|
14
|
+
export declare const initVscodeServices: (config?: InitializeServiceConfig) => Promise<void>;
|
|
15
|
+
export declare const initVscodeExtensions: (config?: InitializeServiceConfig) => Promise<void>;
|
|
11
16
|
export declare const useOpenEditorStub: OpenEditor;
|
|
12
17
|
export declare const reportServiceLoading: (services: editor.IEditorOverrideServices, debugLogging: boolean) => void;
|
|
13
18
|
export declare const mergeServices: (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => 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,
|
|
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,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAA2B,QAAQ,EAAsB,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAI9E,MAAM,WAAW,yBAA0B,SAAQ,WAAW;IAC1D,oBAAoB,EAAE,OAAO,CAAC;CACjC;AAED,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,kBAGlE,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAmB,uBAAuB,kBAexE,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAmB,uBAAuB,kBAK1E,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"}
|
|
@@ -10,18 +10,31 @@ export const wasVscodeApiInitialized = () => {
|
|
|
10
10
|
return window.MonacoEnvironment?.vscodeApiInitialised === true;
|
|
11
11
|
};
|
|
12
12
|
export const initServices = async (config) => {
|
|
13
|
-
await
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
await initVscodeServices(config);
|
|
14
|
+
await initVscodeExtensions(config);
|
|
15
|
+
};
|
|
16
|
+
export const initVscodeServices = async (config) => {
|
|
17
|
+
if (!wasVscodeApiInitialized()) {
|
|
18
|
+
await importAllServices(config);
|
|
19
|
+
if (config?.debugLogging === true) {
|
|
20
|
+
console.log('Initialization of vscode services completed successfully.');
|
|
21
|
+
}
|
|
22
|
+
if (!window.MonacoEnvironment) {
|
|
23
|
+
window.MonacoEnvironment = {};
|
|
24
|
+
}
|
|
25
|
+
window.MonacoEnvironment.vscodeApiInitialised = true;
|
|
16
26
|
}
|
|
27
|
+
else {
|
|
28
|
+
if (config?.debugLogging === true) {
|
|
29
|
+
console.log('Initialization of vscode services can only performed once!');
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
export const initVscodeExtensions = async (config) => {
|
|
17
34
|
await initializeVscodeExtensions();
|
|
18
35
|
if (config?.debugLogging === true) {
|
|
19
|
-
console.log('
|
|
20
|
-
}
|
|
21
|
-
if (!window.MonacoEnvironment) {
|
|
22
|
-
window.MonacoEnvironment = {};
|
|
36
|
+
console.log('Initialization of vscode extensions completed successfully.');
|
|
23
37
|
}
|
|
24
|
-
window.MonacoEnvironment.vscodeApiInitialised = true;
|
|
25
38
|
};
|
|
26
39
|
export const useOpenEditorStub = async (modelRef, options, sideBySide) => {
|
|
27
40
|
console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
|
|
@@ -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;
|
|
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": "7.0.
|
|
3
|
+
"version": "7.0.2",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -48,16 +48,16 @@
|
|
|
48
48
|
"License.txt"
|
|
49
49
|
],
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@codingame/monaco-vscode-editor-service-override": "~1.83.
|
|
52
|
-
"@codingame/monaco-vscode-languages-service-override": "~1.83.
|
|
53
|
-
"@codingame/monaco-vscode-model-service-override": "~1.83.
|
|
54
|
-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.
|
|
55
|
-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.
|
|
51
|
+
"@codingame/monaco-vscode-editor-service-override": "~1.83.7",
|
|
52
|
+
"@codingame/monaco-vscode-languages-service-override": "~1.83.7",
|
|
53
|
+
"@codingame/monaco-vscode-model-service-override": "~1.83.7",
|
|
54
|
+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
|
|
55
|
+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
|
|
56
56
|
"vscode-languageclient": "~9.0.1"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
59
|
"monaco-editor": "0.44.0",
|
|
60
|
-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.
|
|
60
|
+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
|
|
61
61
|
},
|
|
62
62
|
"peerDependenciesMeta": {
|
|
63
63
|
"monaco-editor": {
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"vscode": "$vscode"
|
|
73
73
|
},
|
|
74
74
|
"resolutions": {
|
|
75
|
-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.
|
|
76
|
-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.
|
|
75
|
+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
|
|
76
|
+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
|
|
77
77
|
},
|
|
78
78
|
"scripts": {
|
|
79
79
|
"clean": "shx rm -fr lib *.tsbuildinfo",
|
package/src/index.ts
CHANGED
|
@@ -5,5 +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
|
+
export type { InitializeServiceConfig, MonacoEnvironmentEnhanced } from './monaco-vscode-api-services.js';
|
|
9
9
|
export * from './monaco-vscode-api-services.js';
|
|
@@ -10,7 +10,7 @@ import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
|
10
10
|
import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
|
|
11
11
|
import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
|
|
12
12
|
|
|
13
|
-
interface MonacoEnvironmentEnhanced extends Environment {
|
|
13
|
+
export interface MonacoEnvironmentEnhanced extends Environment {
|
|
14
14
|
vscodeApiInitialised: boolean;
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -25,19 +25,32 @@ export const wasVscodeApiInitialized = () => {
|
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export const initServices = async (config?: InitializeServiceConfig) => {
|
|
28
|
-
await
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
await initVscodeServices(config);
|
|
29
|
+
await initVscodeExtensions(config);
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
export const initVscodeServices = async (config?: InitializeServiceConfig) => {
|
|
33
|
+
if (!wasVscodeApiInitialized()) {
|
|
34
|
+
await importAllServices(config);
|
|
35
|
+
if (config?.debugLogging === true) {
|
|
36
|
+
console.log('Initialization of vscode services completed successfully.');
|
|
37
|
+
}
|
|
38
|
+
if (!window.MonacoEnvironment) {
|
|
39
|
+
window.MonacoEnvironment = {};
|
|
40
|
+
}
|
|
41
|
+
(window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true;
|
|
42
|
+
} else {
|
|
43
|
+
if (config?.debugLogging === true) {
|
|
44
|
+
console.log('Initialization of vscode services can only performed once!');
|
|
45
|
+
}
|
|
31
46
|
}
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export const initVscodeExtensions = async (config?: InitializeServiceConfig) => {
|
|
32
50
|
await initializeVscodeExtensions();
|
|
33
51
|
if (config?.debugLogging === true) {
|
|
34
|
-
console.log('
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
if (!window.MonacoEnvironment) {
|
|
38
|
-
window.MonacoEnvironment = {};
|
|
52
|
+
console.log('Initialization of vscode extensions completed successfully.');
|
|
39
53
|
}
|
|
40
|
-
(window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true;
|
|
41
54
|
};
|
|
42
55
|
|
|
43
56
|
export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide) => {
|