Skip to content

Commit 5b431a0

Browse files
committed
[880] reuse app http settings
1 parent eb71ed1 commit 5b431a0

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

packages/jupyterlab-lsp/src/connection_manager.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ export namespace DocumentConnectionManager {
392392
virtual_document: VirtualDocument,
393393
language: string
394394
): IURIs {
395-
const settings = ServerConnection.makeSettings();
395+
const {settings} = Private.getLanguageServerManager();
396396
const wsBase = settings.wsUrl;
397397
const rootUri = PageConfig.getOption('rootUri');
398398
const virtualDocumentsUri = PageConfig.getOption('virtualDocumentsUri');
@@ -492,7 +492,8 @@ namespace Private {
492492
let connection = _connections.get(language_server_id);
493493

494494
if (connection == null) {
495-
const socket = new WebSocket(uris.socket);
495+
const { settings } = Private.getLanguageServerManager();
496+
const socket = new settings.WebSocket(uris.socket);
496497
const connection = new LSPConnection({
497498
languageId: language,
498499
serverUri: uris.server,

packages/jupyterlab-lsp/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ export class LSPExtension implements ILSPExtension {
174174
) {
175175
const trans = (translator || nullTranslator).load('jupyterlab_lsp');
176176
this.language_server_manager = new LanguageServerManager({
177+
settings: app.serviceManager.serverSettings,
177178
console: this.console.scope('LanguageServerManager')
178179
});
179180
this.connection_manager = new DocumentConnectionManager({

packages/jupyterlab-lsp/src/manager.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ export class LanguageServerManager implements ILanguageServerManager {
4040
this.fetchSessions().catch(console.warn);
4141
}
4242

43+
get settings() {
44+
return this._settings;
45+
}
46+
4347
get specs() {
4448
return this._specs;
4549
}

packages/jupyterlab-lsp/src/tokens.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export type TLanguageServerConfigurations = Partial<
5656
export interface ILanguageServerManager {
5757
sessionsChanged: ISignal<ILanguageServerManager, void>;
5858
sessions: TSessionMap;
59+
settings: ServerConnection.ISettings;
5960
/**
6061
* An ordered list of matching >running< sessions, with servers of higher priority higher in the list
6162
*/

0 commit comments

Comments
 (0)