@jupyterlab/lsp 4.5.0-beta.0 → 4.5.0-rc.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/lib/manager.d.ts +5 -1
- package/lib/manager.js +8 -2
- package/lib/manager.js.map +1 -1
- package/package.json +9 -9
- package/src/manager.ts +10 -3
package/lib/manager.d.ts
CHANGED
|
@@ -85,6 +85,10 @@ export declare class LanguageServerManager implements ILanguageServerManager {
|
|
|
85
85
|
* Compare the rank of two servers with the same language.
|
|
86
86
|
*/
|
|
87
87
|
protected compareRanks(a: TLanguageServerId, b: TLanguageServerId): number;
|
|
88
|
+
/**
|
|
89
|
+
* Get the base URL for language server requests.
|
|
90
|
+
*/
|
|
91
|
+
private get _baseUrl();
|
|
88
92
|
/**
|
|
89
93
|
* map of language server sessions.
|
|
90
94
|
*/
|
|
@@ -100,7 +104,7 @@ export declare class LanguageServerManager implements ILanguageServerManager {
|
|
|
100
104
|
/**
|
|
101
105
|
* Base URL to connect to the language server handler.
|
|
102
106
|
*/
|
|
103
|
-
private
|
|
107
|
+
private _baseUrlOverride;
|
|
104
108
|
/**
|
|
105
109
|
* Status code of server response
|
|
106
110
|
*/
|
package/lib/manager.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
import {
|
|
3
|
+
import { URLExt } from '@jupyterlab/coreutils';
|
|
4
4
|
import { ServerConnection } from '@jupyterlab/services';
|
|
5
5
|
import { Signal } from '@lumino/signaling';
|
|
6
6
|
import { ILanguageServerManager } from './tokens';
|
|
@@ -33,7 +33,7 @@ export class LanguageServerManager {
|
|
|
33
33
|
*/
|
|
34
34
|
this._enabled = true;
|
|
35
35
|
this._settings = options.settings || ServerConnection.makeSettings();
|
|
36
|
-
this.
|
|
36
|
+
this._baseUrlOverride = options.baseUrl;
|
|
37
37
|
this._retries = options.retries || 2;
|
|
38
38
|
this._retriesInterval = options.retriesInterval || 10000;
|
|
39
39
|
this._statusCode = -1;
|
|
@@ -244,5 +244,11 @@ export class LanguageServerManager {
|
|
|
244
244
|
// higher rank = higher in the list (descending order)
|
|
245
245
|
return bRank - aRank;
|
|
246
246
|
}
|
|
247
|
+
/**
|
|
248
|
+
* Get the base URL for language server requests.
|
|
249
|
+
*/
|
|
250
|
+
get _baseUrl() {
|
|
251
|
+
return this._baseUrlOverride || this._settings.baseUrl;
|
|
252
|
+
}
|
|
247
253
|
}
|
|
248
254
|
//# sourceMappingURL=manager.js.map
|
package/lib/manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/lsp",
|
|
3
|
-
"version": "4.5.0-
|
|
3
|
+
"version": "4.5.0-rc.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -41,13 +41,13 @@
|
|
|
41
41
|
"watch": "tsc -b --watch"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@jupyterlab/apputils": "^4.6.0-
|
|
45
|
-
"@jupyterlab/codeeditor": "^4.5.0-
|
|
46
|
-
"@jupyterlab/codemirror": "^4.5.0-
|
|
47
|
-
"@jupyterlab/coreutils": "^6.5.0-
|
|
48
|
-
"@jupyterlab/docregistry": "^4.5.0-
|
|
49
|
-
"@jupyterlab/services": "^7.5.0-
|
|
50
|
-
"@jupyterlab/translation": "^4.5.0-
|
|
44
|
+
"@jupyterlab/apputils": "^4.6.0-rc.0",
|
|
45
|
+
"@jupyterlab/codeeditor": "^4.5.0-rc.0",
|
|
46
|
+
"@jupyterlab/codemirror": "^4.5.0-rc.0",
|
|
47
|
+
"@jupyterlab/coreutils": "^6.5.0-rc.0",
|
|
48
|
+
"@jupyterlab/docregistry": "^4.5.0-rc.0",
|
|
49
|
+
"@jupyterlab/services": "^7.5.0-rc.0",
|
|
50
|
+
"@jupyterlab/translation": "^4.5.0-rc.0",
|
|
51
51
|
"@lumino/coreutils": "^2.2.1",
|
|
52
52
|
"@lumino/disposable": "^2.1.4",
|
|
53
53
|
"@lumino/signaling": "^2.1.4",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"vscode-ws-jsonrpc": "~1.0.2"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@jupyterlab/testing": "^4.5.0-
|
|
61
|
+
"@jupyterlab/testing": "^4.5.0-rc.0",
|
|
62
62
|
"@types/jest": "^29.2.0",
|
|
63
63
|
"@types/lodash.mergewith": "^4.6.1",
|
|
64
64
|
"jest": "^29.2.0",
|
package/src/manager.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { URLExt } from '@jupyterlab/coreutils';
|
|
5
5
|
import { ServerConnection } from '@jupyterlab/services';
|
|
6
6
|
import { ISignal, Signal } from '@lumino/signaling';
|
|
7
7
|
|
|
@@ -18,7 +18,7 @@ import { PromiseDelegate } from '@lumino/coreutils';
|
|
|
18
18
|
export class LanguageServerManager implements ILanguageServerManager {
|
|
19
19
|
constructor(options: ILanguageServerManager.IOptions) {
|
|
20
20
|
this._settings = options.settings || ServerConnection.makeSettings();
|
|
21
|
-
this.
|
|
21
|
+
this._baseUrlOverride = options.baseUrl;
|
|
22
22
|
this._retries = options.retries || 2;
|
|
23
23
|
this._retriesInterval = options.retriesInterval || 10000;
|
|
24
24
|
this._statusCode = -1;
|
|
@@ -278,6 +278,13 @@ export class LanguageServerManager implements ILanguageServerManager {
|
|
|
278
278
|
return bRank - aRank;
|
|
279
279
|
}
|
|
280
280
|
|
|
281
|
+
/**
|
|
282
|
+
* Get the base URL for language server requests.
|
|
283
|
+
*/
|
|
284
|
+
private get _baseUrl(): string {
|
|
285
|
+
return this._baseUrlOverride || this._settings.baseUrl;
|
|
286
|
+
}
|
|
287
|
+
|
|
281
288
|
/**
|
|
282
289
|
* map of language server sessions.
|
|
283
290
|
*/
|
|
@@ -296,7 +303,7 @@ export class LanguageServerManager implements ILanguageServerManager {
|
|
|
296
303
|
/**
|
|
297
304
|
* Base URL to connect to the language server handler.
|
|
298
305
|
*/
|
|
299
|
-
private
|
|
306
|
+
private _baseUrlOverride: string | undefined;
|
|
300
307
|
|
|
301
308
|
/**
|
|
302
309
|
* Status code of server response
|