File tree Expand file tree Collapse file tree 4 files changed +9
-2
lines changed
packages/jupyterlab-lsp/src Expand file tree Collapse file tree 4 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -392,7 +392,7 @@ export namespace DocumentConnectionManager {
392
392
virtual_document : VirtualDocument ,
393
393
language : string
394
394
) : IURIs {
395
- const settings = ServerConnection . makeSettings ( ) ;
395
+ const { settings} = Private . getLanguageServerManager ( ) ;
396
396
const wsBase = settings . wsUrl ;
397
397
const rootUri = PageConfig . getOption ( 'rootUri' ) ;
398
398
const virtualDocumentsUri = PageConfig . getOption ( 'virtualDocumentsUri' ) ;
@@ -492,7 +492,8 @@ namespace Private {
492
492
let connection = _connections . get ( language_server_id ) ;
493
493
494
494
if ( connection == null ) {
495
- const socket = new WebSocket ( uris . socket ) ;
495
+ const { settings } = Private . getLanguageServerManager ( ) ;
496
+ const socket = new settings . WebSocket ( uris . socket ) ;
496
497
const connection = new LSPConnection ( {
497
498
languageId : language ,
498
499
serverUri : uris . server ,
Original file line number Diff line number Diff line change @@ -174,6 +174,7 @@ export class LSPExtension implements ILSPExtension {
174
174
) {
175
175
const trans = ( translator || nullTranslator ) . load ( 'jupyterlab_lsp' ) ;
176
176
this . language_server_manager = new LanguageServerManager ( {
177
+ settings : app . serviceManager . serverSettings ,
177
178
console : this . console . scope ( 'LanguageServerManager' )
178
179
} ) ;
179
180
this . connection_manager = new DocumentConnectionManager ( {
Original file line number Diff line number Diff line change @@ -40,6 +40,10 @@ export class LanguageServerManager implements ILanguageServerManager {
40
40
this . fetchSessions ( ) . catch ( console . warn ) ;
41
41
}
42
42
43
+ get settings ( ) {
44
+ return this . _settings ;
45
+ }
46
+
43
47
get specs ( ) {
44
48
return this . _specs ;
45
49
}
Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ export type TLanguageServerConfigurations = Partial<
56
56
export interface ILanguageServerManager {
57
57
sessionsChanged : ISignal < ILanguageServerManager , void > ;
58
58
sessions : TSessionMap ;
59
+ settings : ServerConnection . ISettings ;
59
60
/**
60
61
* An ordered list of matching >running< sessions, with servers of higher priority higher in the list
61
62
*/
You can’t perform that action at this time.
0 commit comments