@jupyterlab/lsp-extension 4.0.2 → 4.0.3
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/lib/index.d.ts +1 -1
- package/lib/index.js +32 -11
- package/lib/index.js.map +1 -1
- package/package.json +7 -7
- package/src/index.ts +47 -19
package/lib/index.d.ts
CHANGED
|
@@ -23,5 +23,5 @@ export declare class RunningLanguageServer implements IRunningSessions.IRunningI
|
|
|
23
23
|
/**
|
|
24
24
|
* Export the plugin as default.
|
|
25
25
|
*/
|
|
26
|
-
declare const _default: (JupyterFrontEndPlugin<ILSPDocumentConnectionManager> | JupyterFrontEndPlugin<ILSPFeatureManager> | JupyterFrontEndPlugin<ILSPCodeExtractorsManager>)[];
|
|
26
|
+
declare const _default: (JupyterFrontEndPlugin<void> | JupyterFrontEndPlugin<ILSPDocumentConnectionManager> | JupyterFrontEndPlugin<ILSPFeatureManager> | JupyterFrontEndPlugin<ILSPCodeExtractorsManager>)[];
|
|
27
27
|
export default _default;
|
package/lib/index.js
CHANGED
|
@@ -15,8 +15,8 @@ const plugin = {
|
|
|
15
15
|
activate,
|
|
16
16
|
id: '@jupyterlab/lsp-extension:plugin',
|
|
17
17
|
description: 'Provides the language server connection manager.',
|
|
18
|
-
requires: [
|
|
19
|
-
optional: [IRunningSessionManagers
|
|
18
|
+
requires: [ITranslator],
|
|
19
|
+
optional: [IRunningSessionManagers],
|
|
20
20
|
provides: ILSPDocumentConnectionManager,
|
|
21
21
|
autoStart: true
|
|
22
22
|
};
|
|
@@ -27,6 +27,14 @@ const featurePlugin = {
|
|
|
27
27
|
provides: ILSPFeatureManager,
|
|
28
28
|
autoStart: true
|
|
29
29
|
};
|
|
30
|
+
const settingsPlugin = {
|
|
31
|
+
activate: activateSettings,
|
|
32
|
+
id: '@jupyterlab/lsp-extension:settings',
|
|
33
|
+
description: 'Provides the language server settings.',
|
|
34
|
+
requires: [ILSPDocumentConnectionManager, ISettingRegistry, ITranslator],
|
|
35
|
+
optional: [IFormRendererRegistry],
|
|
36
|
+
autoStart: true
|
|
37
|
+
};
|
|
30
38
|
const codeExtractorManagerPlugin = {
|
|
31
39
|
id: ILSPCodeExtractorsManager.name,
|
|
32
40
|
description: 'Provides the code extractor manager.',
|
|
@@ -54,12 +62,25 @@ const codeExtractorManagerPlugin = {
|
|
|
54
62
|
/**
|
|
55
63
|
* Activate the lsp plugin.
|
|
56
64
|
*/
|
|
57
|
-
function activate(app,
|
|
58
|
-
const
|
|
59
|
-
|
|
65
|
+
function activate(app, translator, runningSessionManagers) {
|
|
66
|
+
const languageServerManager = new LanguageServerManager({
|
|
67
|
+
settings: app.serviceManager.serverSettings
|
|
68
|
+
});
|
|
60
69
|
const connectionManager = new DocumentConnectionManager({
|
|
61
70
|
languageServerManager
|
|
62
71
|
});
|
|
72
|
+
// Add a sessions manager if the running extension is available
|
|
73
|
+
if (runningSessionManagers) {
|
|
74
|
+
addRunningSessionManager(runningSessionManagers, connectionManager, translator);
|
|
75
|
+
}
|
|
76
|
+
return connectionManager;
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Activate the lsp settings plugin.
|
|
80
|
+
*/
|
|
81
|
+
function activateSettings(app, connectionManager, settingRegistry, translator, settingRendererRegistry) {
|
|
82
|
+
const LANGUAGE_SERVERS = 'languageServers';
|
|
83
|
+
const languageServerManager = connectionManager.languageServerManager;
|
|
63
84
|
const updateOptions = (settings) => {
|
|
64
85
|
const options = settings.composite;
|
|
65
86
|
const languageServerSettings = (options.languageServers ||
|
|
@@ -128,10 +149,6 @@ function activate(app, settingRegistry, translator, runningSessionManagers, sett
|
|
|
128
149
|
.catch((reason) => {
|
|
129
150
|
console.error(reason.message);
|
|
130
151
|
});
|
|
131
|
-
// Add a sessions manager if the running extension is available
|
|
132
|
-
if (runningSessionManagers) {
|
|
133
|
-
addRunningSessionManager(runningSessionManagers, connectionManager, translator);
|
|
134
|
-
}
|
|
135
152
|
if (settingRendererRegistry) {
|
|
136
153
|
const renderer = {
|
|
137
154
|
fieldRenderer: (props) => {
|
|
@@ -140,7 +157,6 @@ function activate(app, settingRegistry, translator, runningSessionManagers, sett
|
|
|
140
157
|
};
|
|
141
158
|
settingRendererRegistry.addRenderer(`${plugin.id}.${LANGUAGE_SERVERS}`, renderer);
|
|
142
159
|
}
|
|
143
|
-
return connectionManager;
|
|
144
160
|
}
|
|
145
161
|
export class RunningLanguageServer {
|
|
146
162
|
constructor(connection, manager) {
|
|
@@ -207,5 +223,10 @@ function addRunningSessionManager(managers, lsManager, translator) {
|
|
|
207
223
|
/**
|
|
208
224
|
* Export the plugin as default.
|
|
209
225
|
*/
|
|
210
|
-
export default [
|
|
226
|
+
export default [
|
|
227
|
+
plugin,
|
|
228
|
+
featurePlugin,
|
|
229
|
+
settingsPlugin,
|
|
230
|
+
codeExtractorManagerPlugin
|
|
231
|
+
];
|
|
211
232
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAMH,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,cAAc,EACd,yBAAyB,EAEzB,6BAA6B,EAC7B,kBAAkB,EAClB,qBAAqB,EAErB,wBAAwB,EAGzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,uBAAuB,EAAoB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAEL,qBAAqB,EAErB,UAAU,EACX,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/lsp-extension",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
"watch": "tsc -b --watch"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@jupyterlab/application": "^4.0.
|
|
40
|
-
"@jupyterlab/lsp": "^4.0.
|
|
41
|
-
"@jupyterlab/running": "^4.0.
|
|
42
|
-
"@jupyterlab/settingregistry": "^4.0.
|
|
43
|
-
"@jupyterlab/translation": "^4.0.
|
|
44
|
-
"@jupyterlab/ui-components": "^4.0.
|
|
39
|
+
"@jupyterlab/application": "^4.0.3",
|
|
40
|
+
"@jupyterlab/lsp": "^4.0.3",
|
|
41
|
+
"@jupyterlab/running": "^4.0.3",
|
|
42
|
+
"@jupyterlab/settingregistry": "^4.0.3",
|
|
43
|
+
"@jupyterlab/translation": "^4.0.3",
|
|
44
|
+
"@jupyterlab/ui-components": "^4.0.3",
|
|
45
45
|
"@lumino/coreutils": "^2.1.1",
|
|
46
46
|
"@lumino/polling": "^2.1.1",
|
|
47
47
|
"@lumino/signaling": "^2.1.1",
|
package/src/index.ts
CHANGED
|
@@ -38,12 +38,13 @@ import { Signal } from '@lumino/signaling';
|
|
|
38
38
|
import { renderServerSetting } from './renderer';
|
|
39
39
|
|
|
40
40
|
import type { FieldProps } from '@rjsf/utils';
|
|
41
|
+
|
|
41
42
|
const plugin: JupyterFrontEndPlugin<ILSPDocumentConnectionManager> = {
|
|
42
43
|
activate,
|
|
43
44
|
id: '@jupyterlab/lsp-extension:plugin',
|
|
44
45
|
description: 'Provides the language server connection manager.',
|
|
45
|
-
requires: [
|
|
46
|
-
optional: [IRunningSessionManagers
|
|
46
|
+
requires: [ITranslator],
|
|
47
|
+
optional: [IRunningSessionManagers],
|
|
47
48
|
provides: ILSPDocumentConnectionManager,
|
|
48
49
|
autoStart: true
|
|
49
50
|
};
|
|
@@ -56,6 +57,15 @@ const featurePlugin: JupyterFrontEndPlugin<ILSPFeatureManager> = {
|
|
|
56
57
|
autoStart: true
|
|
57
58
|
};
|
|
58
59
|
|
|
60
|
+
const settingsPlugin: JupyterFrontEndPlugin<void> = {
|
|
61
|
+
activate: activateSettings,
|
|
62
|
+
id: '@jupyterlab/lsp-extension:settings',
|
|
63
|
+
description: 'Provides the language server settings.',
|
|
64
|
+
requires: [ILSPDocumentConnectionManager, ISettingRegistry, ITranslator],
|
|
65
|
+
optional: [IFormRendererRegistry],
|
|
66
|
+
autoStart: true
|
|
67
|
+
};
|
|
68
|
+
|
|
59
69
|
const codeExtractorManagerPlugin: JupyterFrontEndPlugin<ILSPCodeExtractorsManager> =
|
|
60
70
|
{
|
|
61
71
|
id: ILSPCodeExtractorsManager.name,
|
|
@@ -88,17 +98,41 @@ const codeExtractorManagerPlugin: JupyterFrontEndPlugin<ILSPCodeExtractorsManage
|
|
|
88
98
|
*/
|
|
89
99
|
function activate(
|
|
90
100
|
app: JupyterFrontEnd,
|
|
91
|
-
settingRegistry: ISettingRegistry,
|
|
92
101
|
translator: ITranslator,
|
|
93
|
-
runningSessionManagers: IRunningSessionManagers | null
|
|
94
|
-
settingRendererRegistry: IFormRendererRegistry | null
|
|
102
|
+
runningSessionManagers: IRunningSessionManagers | null
|
|
95
103
|
): ILSPDocumentConnectionManager {
|
|
96
|
-
const
|
|
97
|
-
|
|
104
|
+
const languageServerManager = new LanguageServerManager({
|
|
105
|
+
settings: app.serviceManager.serverSettings
|
|
106
|
+
});
|
|
98
107
|
const connectionManager = new DocumentConnectionManager({
|
|
99
108
|
languageServerManager
|
|
100
109
|
});
|
|
101
110
|
|
|
111
|
+
// Add a sessions manager if the running extension is available
|
|
112
|
+
if (runningSessionManagers) {
|
|
113
|
+
addRunningSessionManager(
|
|
114
|
+
runningSessionManagers,
|
|
115
|
+
connectionManager,
|
|
116
|
+
translator
|
|
117
|
+
);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
return connectionManager;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* Activate the lsp settings plugin.
|
|
125
|
+
*/
|
|
126
|
+
function activateSettings(
|
|
127
|
+
app: JupyterFrontEnd,
|
|
128
|
+
connectionManager: ILSPDocumentConnectionManager,
|
|
129
|
+
settingRegistry: ISettingRegistry,
|
|
130
|
+
translator: ITranslator,
|
|
131
|
+
settingRendererRegistry: IFormRendererRegistry | null
|
|
132
|
+
): void {
|
|
133
|
+
const LANGUAGE_SERVERS = 'languageServers';
|
|
134
|
+
const languageServerManager = connectionManager.languageServerManager;
|
|
135
|
+
|
|
102
136
|
const updateOptions = (settings: ISettingRegistry.ISettings) => {
|
|
103
137
|
const options = settings.composite as Required<LanguageServersExperimental>;
|
|
104
138
|
const languageServerSettings = (options.languageServers ||
|
|
@@ -177,15 +211,6 @@ function activate(
|
|
|
177
211
|
console.error(reason.message);
|
|
178
212
|
});
|
|
179
213
|
|
|
180
|
-
// Add a sessions manager if the running extension is available
|
|
181
|
-
if (runningSessionManagers) {
|
|
182
|
-
addRunningSessionManager(
|
|
183
|
-
runningSessionManagers,
|
|
184
|
-
connectionManager,
|
|
185
|
-
translator
|
|
186
|
-
);
|
|
187
|
-
}
|
|
188
|
-
|
|
189
214
|
if (settingRendererRegistry) {
|
|
190
215
|
const renderer: IFormRenderer = {
|
|
191
216
|
fieldRenderer: (props: FieldProps) => {
|
|
@@ -197,8 +222,6 @@ function activate(
|
|
|
197
222
|
renderer
|
|
198
223
|
);
|
|
199
224
|
}
|
|
200
|
-
|
|
201
|
-
return connectionManager;
|
|
202
225
|
}
|
|
203
226
|
|
|
204
227
|
export class RunningLanguageServer implements IRunningSessions.IRunningItem {
|
|
@@ -282,4 +305,9 @@ function addRunningSessionManager(
|
|
|
282
305
|
/**
|
|
283
306
|
* Export the plugin as default.
|
|
284
307
|
*/
|
|
285
|
-
export default [
|
|
308
|
+
export default [
|
|
309
|
+
plugin,
|
|
310
|
+
featurePlugin,
|
|
311
|
+
settingsPlugin,
|
|
312
|
+
codeExtractorManagerPlugin
|
|
313
|
+
];
|