monaco-languageclient 7.0.1 → 7.1.0-next.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 +8 -0
- package/lib/monaco-vscode-api-services.d.ts +2 -2
- package/lib/monaco-vscode-api-services.d.ts.map +1 -1
- package/lib/monaco-vscode-api-services.js +3 -2
- package/lib/monaco-vscode-api-services.js.map +1 -1
- package/package.json +10 -10
- package/src/monaco-vscode-api-services.ts +5 -4
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.1.0] - 2023-11-2x
|
|
6
|
+
|
|
7
|
+
- Updated to `monaco-vscode-api@1.83.10`.
|
|
8
|
+
|
|
9
|
+
## [7.0.2] - 2023-11-15
|
|
10
|
+
|
|
11
|
+
- Updated to `monaco-vscode-api@1.83.7`.
|
|
12
|
+
|
|
5
13
|
## [7.0.1] - 2023-11-10
|
|
6
14
|
|
|
7
15
|
- 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.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { editor, Environment } from 'monaco-editor';
|
|
2
|
-
import {
|
|
2
|
+
import { IWorkbenchConstructionOptions } from 'vscode/services';
|
|
3
3
|
import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
4
4
|
export interface MonacoEnvironmentEnhanced extends Environment {
|
|
5
5
|
vscodeApiInitialised: boolean;
|
|
@@ -7,7 +7,7 @@ export interface MonacoEnvironmentEnhanced extends Environment {
|
|
|
7
7
|
export type InitializeServiceConfig = {
|
|
8
8
|
userServices?: editor.IEditorOverrideServices;
|
|
9
9
|
debugLogging?: boolean;
|
|
10
|
-
|
|
10
|
+
workspaceConfig?: IWorkbenchConstructionOptions;
|
|
11
11
|
};
|
|
12
12
|
export declare const wasVscodeApiInitialized: () => boolean;
|
|
13
13
|
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,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAA2B,
|
|
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,6BAA6B,EAAsB,MAAM,iBAAiB,CAAC;AAE7G,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,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACnD,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,kBAgCvE,CAAC"}
|
|
@@ -87,8 +87,9 @@ export const importAllServices = async (config) => {
|
|
|
87
87
|
throw new Error('"markers" requires "views" service. Please add it to the "userServices".');
|
|
88
88
|
}
|
|
89
89
|
await initialize(userServices);
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
|
|
91
|
+
if (logLevel) {
|
|
92
|
+
StandaloneServices.get(ILogService).setLevel(logLevel);
|
|
92
93
|
}
|
|
93
94
|
};
|
|
94
95
|
//# 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;AAGhG,OAAO,EAAE,WAAW,EAAE,UAAU,
|
|
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.1.0-next.0",
|
|
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.10",
|
|
52
|
+
"@codingame/monaco-vscode-languages-service-override": "~1.83.10",
|
|
53
|
+
"@codingame/monaco-vscode-model-service-override": "~1.83.10",
|
|
54
|
+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
|
|
55
|
+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <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.10 <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.10 <1.84.0",
|
|
76
|
+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
|
|
77
77
|
},
|
|
78
78
|
"scripts": {
|
|
79
79
|
"clean": "shx rm -fr lib *.tsbuildinfo",
|
|
@@ -81,4 +81,4 @@
|
|
|
81
81
|
"build:msg": "echo Building monaco-languageclient:",
|
|
82
82
|
"build": "npm run build:msg && npm run clean && npm run compile"
|
|
83
83
|
}
|
|
84
|
-
}
|
|
84
|
+
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
6
|
import { editor, Environment } from 'monaco-editor';
|
|
7
|
-
import { ILogService, initialize,
|
|
7
|
+
import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services';
|
|
8
8
|
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
|
|
9
9
|
import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
10
10
|
import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
|
|
@@ -17,7 +17,7 @@ export interface MonacoEnvironmentEnhanced extends Environment {
|
|
|
17
17
|
export type InitializeServiceConfig = {
|
|
18
18
|
userServices?: editor.IEditorOverrideServices;
|
|
19
19
|
debugLogging?: boolean;
|
|
20
|
-
|
|
20
|
+
workspaceConfig?: IWorkbenchConstructionOptions;
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
export const wasVscodeApiInitialized = () => {
|
|
@@ -112,7 +112,8 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
|
|
|
112
112
|
}
|
|
113
113
|
|
|
114
114
|
await initialize(userServices);
|
|
115
|
-
|
|
116
|
-
|
|
115
|
+
const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
|
|
116
|
+
if (logLevel) {
|
|
117
|
+
StandaloneServices.get(ILogService).setLevel(logLevel);
|
|
117
118
|
}
|
|
118
119
|
};
|