@jupyterlab/lsp 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.
Files changed (22) hide show
  1. package/lib/connection.d.ts +4 -4
  2. package/lib/connection.js +5 -5
  3. package/lib/connection.js.map +1 -1
  4. package/lib/connection_manager.d.ts +2 -2
  5. package/lib/connection_manager.js +20 -9
  6. package/lib/connection_manager.js.map +1 -1
  7. package/lib/manager.d.ts +5 -0
  8. package/lib/manager.js +7 -1
  9. package/lib/manager.js.map +1 -1
  10. package/lib/tokens.d.ts +27 -1
  11. package/lib/tokens.js.map +1 -1
  12. package/lib/ws-connection/ws-connection.d.ts +2 -2
  13. package/package.json +8 -8
  14. package/src/connection.ts +5 -5
  15. package/src/connection_manager.ts +25 -12
  16. package/src/manager.ts +9 -1
  17. package/src/tokens.ts +32 -1
  18. package/src/ws-connection/ws-connection.ts +2 -2
  19. package/lib/adapters/statusmessage.d.ts +0 -47
  20. package/lib/adapters/statusmessage.js +0 -74
  21. package/lib/adapters/statusmessage.js.map +0 -1
  22. package/src/adapters/statusmessage.ts +0 -94
package/lib/connection.d.ts CHANGED
@@ -54,7 +54,7 @@ export declare class LSPConnection extends LspWsConnection implements ILSPConnec
54
54
  get closeSignal(): ISignal<ILSPConnection, boolean>;
55
55
  /**
56
56
  * Signal emitted when the connection receives an error
57
- * message..
57
+ * message.
58
58
  */
59
59
  get errorSignal(): ISignal<ILSPConnection, any>;
60
60
  /**
@@ -84,15 +84,15 @@ export declare class LSPConnection extends LspWsConnection implements ILSPConnec
84
84
  */
85
85
  sendFullTextChange(text: string, documentInfo: IDocumentInfo): void;
86
86
  /**
87
- * Check if a provider is available in the registered capabilities.
87
+ * Check if a capability is available in the server capabilities.
88
88
  */
89
- provides(provider: keyof lsp.ServerCapabilities): boolean;
89
+ provides(capability: keyof lsp.ServerCapabilities): boolean;
90
90
  /**
91
91
  * Close the connection to the server.
92
92
  */
93
93
  close(): void;
94
94
  /**
95
- * initialize a connection over a web socket that speaks the LSP
95
+ * Initialize a connection over a web socket that speaks the LSP.
96
96
  */
97
97
  connect(socket: WebSocket): void;
98
98
  /**
package/lib/connection.js CHANGED
@@ -139,7 +139,7 @@ export class LSPConnection extends LspWsConnection {
139
139
  }
140
140
  /**
141
141
  * Signal emitted when the connection receives an error
142
- * message..
142
+ * message.
143
143
  */
144
144
  get errorSignal() {
145
145
  return this._errorSignal;
@@ -195,10 +195,10 @@ export class LSPConnection extends LspWsConnection {
195
195
  this._sendChange([{ text }], documentInfo);
196
196
  }
197
197
  /**
198
- * Check if a provider is available in the registered capabilities.
198
+ * Check if a capability is available in the server capabilities.
199
199
  */
200
- provides(provider) {
201
- return !!(this.serverCapabilities && this.serverCapabilities[provider]);
200
+ provides(capability) {
201
+ return !!(this.serverCapabilities && this.serverCapabilities[capability]);
202
202
  }
203
203
  /**
204
204
  * Close the connection to the server.
@@ -213,7 +213,7 @@ export class LSPConnection extends LspWsConnection {
213
213
  }
214
214
  }
215
215
  /**
216
- * initialize a connection over a web socket that speaks the LSP
216
+ * Initialize a connection over a web socket that speaks the LSP.
217
217
  */
218
218
  connect(socket) {
219
219
  super.connect(socket);
package/lib/connection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
package/lib/connection_manager.d.ts CHANGED
@@ -130,11 +130,11 @@ export declare class DocumentConnectionManager implements ILSPDocumentConnection
130
130
  */
131
131
  connect(options: ISocketConnectionOptions, firstTimeoutSeconds?: number, secondTimeoutMinutes?: number): Promise<ILSPConnection | undefined>;
132
132
  /**
133
- * Disconnect the signals of requested virtual document uri.
133
+ * Disconnect the signals of requested virtual document URI.
134
134
  */
135
135
  unregisterDocument(uri: string, emit?: boolean): void;
136
136
  /**
137
- * Enable or disable the logging feature of the language servers
137
+ * Enable or disable the logging of language server communication.
138
138
  */
139
139
  updateLogging(logAllCommunication: boolean, setTrace: AskServersToSendTraceNotifications): void;
140
140
  /**
package/lib/connection_manager.js CHANGED
@@ -267,7 +267,7 @@ export class DocumentConnectionManager {
267
267
  return connection;
268
268
  }
269
269
  /**
270
- * Disconnect the signals of requested virtual document uri.
270
+ * Disconnect the signals of requested virtual document URI.
271
271
  */
272
272
  unregisterDocument(uri, emit = true) {
273
273
  const connection = this.connections.get(uri);
@@ -284,7 +284,7 @@ export class DocumentConnectionManager {
284
284
  }
285
285
  }
286
286
  /**
287
- * Enable or disable the logging feature of the language servers
287
+ * Enable or disable the logging of language server communication.
288
288
  */
289
289
  updateLogging(logAllCommunication, setTrace) {
290
290
  for (const connection of this.connections.values()) {
@@ -340,20 +340,30 @@ export class DocumentConnectionManager {
340
340
  * @param language - language of the document
341
341
  */
342
342
  function solveUris(virtualDocument, language) {
343
- const wsBase = PageConfig.getBaseUrl().replace(/^http/, 'ws');
343
+ var _a;
344
+ const serverManager = Private.getLanguageServerManager();
345
+ const wsBase = serverManager.settings.wsUrl;
344
346
  const rootUri = PageConfig.getOption('rootUri');
345
347
  const virtualDocumentsUri = PageConfig.getOption('virtualDocumentsUri');
346
- const baseUri = virtualDocument.hasLspSupportedFile
347
- ? rootUri
348
- : virtualDocumentsUri;
349
348
  // for now take the best match only
350
- const matchingServers = Private.getLanguageServerManager().getMatchingServers({
349
+ const serverOptions = {
351
350
  language
352
- });
351
+ };
352
+ const matchingServers = serverManager.getMatchingServers(serverOptions);
353
353
  const languageServerId = matchingServers.length === 0 ? null : matchingServers[0];
354
354
  if (languageServerId === null) {
355
355
  return;
356
356
  }
357
+ const specs = serverManager.getMatchingSpecs(serverOptions);
358
+ const spec = specs.get(languageServerId);
359
+ if (!spec) {
360
+ console.warn(`Specification not available for server ${languageServerId}`);
361
+ }
362
+ const requiresOnDiskFiles = (_a = spec === null || spec === void 0 ? void 0 : spec.requires_documents_on_disk) !== null && _a !== void 0 ? _a : true;
363
+ const supportsInMemoryFiles = !requiresOnDiskFiles;
364
+ const baseUri = virtualDocument.hasLspSupportedFile || supportsInMemoryFiles
365
+ ? rootUri
366
+ : virtualDocumentsUri;
357
367
  // workaround url-parse bug(s) (see https://github.com/jupyter-lsp/jupyterlab-lsp/issues/595)
358
368
  let documentUri = URLExt.join(baseUri, virtualDocument.uri);
359
369
  if (!documentUri.startsWith('file:///') &&
@@ -402,7 +412,8 @@ var Private;
402
412
  async function connection(language, languageServerId, uris, onCreate, capabilities) {
403
413
  let connection = _connections.get(languageServerId);
404
414
  if (!connection) {
405
- const socket = new WebSocket(uris.socket);
415
+ const { settings } = Private.getLanguageServerManager();
416
+ const socket = new settings.WebSocket(uris.socket);
406
417
  const connection = new LSPConnection({
407
418
  languageId: language,
408
419
  serverUri: uris.server,
package/lib/connection_manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connection_manager.js","sourceRoot":"","sources":["../src/connection_manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection_manager.js","sourceRoot":"","sources":["../src/connection_manager.ts"],"names":[],"mappings":"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"}
package/lib/manager.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { ServerConnection } from '@jupyterlab/services';
1
2
  import { ISignal } from '@lumino/signaling';
2
3
  import { ILanguageServerManager, TLanguageServerConfigurations, TLanguageServerId, TSessionMap, TSpecsMap } from './tokens';
3
4
  import { ServerSpecProperties } from './schema';
@@ -11,6 +12,10 @@ export declare class LanguageServerManager implements ILanguageServerManager {
11
12
  * Check if the manager is disposed.
12
13
  */
13
14
  get isDisposed(): boolean;
15
+ /**
16
+ * Get server connection settings.
17
+ */
18
+ get settings(): ServerConnection.ISettings;
14
19
  /**
15
20
  * Get the language server specs.
16
21
  */
package/lib/manager.js CHANGED
@@ -52,6 +52,12 @@ export class LanguageServerManager {
52
52
  get isDisposed() {
53
53
  return this._isDisposed;
54
54
  }
55
+ /**
56
+ * Get server connection settings.
57
+ */
58
+ get settings() {
59
+ return this._settings;
60
+ }
55
61
  /**
56
62
  * Get the language server specs.
57
63
  */
@@ -188,7 +194,7 @@ export class LanguageServerManager {
188
194
  for (let key of Object.keys(sessions)) {
189
195
  let id = key;
190
196
  if (this._sessions.has(id)) {
191
- Object.assign(this._sessions.get(id), sessions[key]);
197
+ Object.assign(this._sessions.get(id) || {}, sessions[key]);
192
198
  }
193
199
  else {
194
200
  this._sessions.set(id, sessions[key]);
package/lib/manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
package/lib/tokens.d.ts CHANGED
@@ -56,6 +56,12 @@ export interface ILanguageServerManager extends IDisposable {
56
56
  * The current session information of running language servers.
57
57
  */
58
58
  readonly sessions: TSessionMap;
59
+ /**
60
+ * @alpha
61
+ *
62
+ * Get server connection settings.
63
+ */
64
+ readonly settings: ServerConnection.ISettings;
59
65
  /**
60
66
  * @alpha
61
67
  *
@@ -85,7 +91,7 @@ export interface ILanguageServerManager extends IDisposable {
85
91
  *
86
92
  * Enable the language server services
87
93
  */
88
- enable(): void;
94
+ enable(): Promise<void>;
89
95
  /**
90
96
  * @alpha
91
97
  *
@@ -318,6 +324,10 @@ export interface ILSPDocumentConnectionManager {
318
324
  * A promise that is fulfilled when the connection manager is ready.
319
325
  */
320
326
  readonly ready: Promise<void>;
327
+ /**
328
+ * Initial configuration for the language servers.
329
+ */
330
+ initialConfigurations: TLanguageServerConfigurations;
321
331
  /**
322
332
  * Handles the settings that do not require an existing connection
323
333
  * with a language server (or can influence to which server the
@@ -326,6 +336,10 @@ export interface ILSPDocumentConnectionManager {
326
336
  * This function should be called **before** initialization of servers.
327
337
  */
328
338
  updateConfiguration(allServerSettings: TLanguageServerConfigurations): void;
339
+ /**
340
+ * Enable or disable the logging of language server communication.
341
+ */
342
+ updateLogging(logAllCommunication: boolean, setTrace: lsp.TraceValues): void;
329
343
  /**
330
344
  * Handles the settings that the language servers accept using
331
345
  * `onDidChangeConfiguration` messages, which should be passed under
@@ -674,6 +688,18 @@ export interface ILSPConnection extends ILspConnection, IObservableDisposable {
674
688
  * message..
675
689
  */
676
690
  errorSignal: ISignal<ILSPConnection, any>;
691
+ /**
692
+ * @alpha
693
+ *
694
+ * Check if a capability is available in the server capabilities.
695
+ */
696
+ provides(capability: keyof lsp.ServerCapabilities): boolean;
697
+ /**
698
+ * @alpha
699
+ *
700
+ * Lists server capabilities.
701
+ */
702
+ serverCapabilities: lsp.ServerCapabilities;
677
703
  /**
678
704
  * @alpha
679
705
  *
package/lib/tokens.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AA6P1C,MAAM,KAAW,sBAAsB,CA0CtC;AA1CD,WAAiB,sBAAsB;IACrC;;OAEG;IACU,6BAAM,GAAG,KAAK,CAAC;AAsC9B,CAAC,EA1CgB,sBAAsB,KAAtB,sBAAsB,QA0CtC;AA4OD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,IAAI,KAAK,CACP,+CAA+C,EAC/C,yEAAyE,CAC1E,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,KAAK,CACzC,oCAAoC,EACpC,2GAA2G,CAC5G,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,KAAK,CAChD,2CAA2C,EAC3C,sLAAsL,CACvL,CAAC;AAiBF;;;GAGG;AACH,MAAM,KAAW,MAAM,CA0CtB;AA1CD,WAAiB,MAAM;IACrB,2BAA2B;IAC3B,IAAY,kBAKX;IALD,WAAY,kBAAkB;QAC5B,6EAAuD,CAAA;QACvD,yDAAmC,CAAA;QACnC,8CAAwB,CAAA;QACxB,uDAAiC,CAAA;IACnC,CAAC,EALW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAK7B;IAED,2BAA2B;IAC3B,IAAY,kBAOX;IAPD,WAAY,kBAAkB;QAC5B,2DAAqC,CAAA;QACrC,mFAA6D,CAAA;QAC7D,uDAAiC,CAAA;QACjC,uDAAiC,CAAA;QACjC,iDAA2B,CAAA;QAC3B,8CAAwB,CAAA;IAC1B,CAAC,EAPW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAO7B;IAED,sBAAsB;IACtB,IAAY,aAKX;IALD,WAAY,aAAa;QACvB,kEAAiD,CAAA;QACjD,mEAAkD,CAAA;QAClD,sEAAqD,CAAA;QACrD,oEAAmD,CAAA;IACrD,CAAC,EALW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAKxB;IAED,sBAAsB;IACtB,IAAY,aAaX;IAbD,WAAY,aAAa;QACvB,uDAAsC,CAAA;QACtC,mEAAkD,CAAA;QAClD,uDAAsC,CAAA;QACtC,sEAAqD,CAAA;QACrD,gEAA+C,CAAA;QAC/C,6CAA4B,CAAA;QAC5B,+DAA8C,CAAA;QAC9C,0CAAyB,CAAA;QACzB,uDAAsC,CAAA;QACtC,+CAA8B,CAAA;QAC9B,8DAA6C,CAAA;QAC7C,gEAA+C,CAAA;IACjD,CAAC,EAbW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAaxB;AACH,CAAC,EA1CgB,MAAM,KAAN,MAAM,QA0CtB"}
1
+ {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAoQ1C,MAAM,KAAW,sBAAsB,CA0CtC;AA1CD,WAAiB,sBAAsB;IACrC;;OAEG;IACU,6BAAM,GAAG,KAAK,CAAC;AAsC9B,CAAC,EA1CgB,sBAAsB,KAAtB,sBAAsB,QA0CtC;AAsPD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,IAAI,KAAK,CACP,+CAA+C,EAC/C,yEAAyE,CAC1E,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,KAAK,CACzC,oCAAoC,EACpC,2GAA2G,CAC5G,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,KAAK,CAChD,2CAA2C,EAC3C,sLAAsL,CACvL,CAAC;AAiBF;;;GAGG;AACH,MAAM,KAAW,MAAM,CA0CtB;AA1CD,WAAiB,MAAM;IACrB,2BAA2B;IAC3B,IAAY,kBAKX;IALD,WAAY,kBAAkB;QAC5B,6EAAuD,CAAA;QACvD,yDAAmC,CAAA;QACnC,8CAAwB,CAAA;QACxB,uDAAiC,CAAA;IACnC,CAAC,EALW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAK7B;IAED,2BAA2B;IAC3B,IAAY,kBAOX;IAPD,WAAY,kBAAkB;QAC5B,2DAAqC,CAAA;QACrC,mFAA6D,CAAA;QAC7D,uDAAiC,CAAA;QACjC,uDAAiC,CAAA;QACjC,iDAA2B,CAAA;QAC3B,8CAAwB,CAAA;IAC1B,CAAC,EAPW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAO7B;IAED,sBAAsB;IACtB,IAAY,aAKX;IALD,WAAY,aAAa;QACvB,kEAAiD,CAAA;QACjD,mEAAkD,CAAA;QAClD,sEAAqD,CAAA;QACrD,oEAAmD,CAAA;IACrD,CAAC,EALW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAKxB;IAED,sBAAsB;IACtB,IAAY,aAaX;IAbD,WAAY,aAAa;QACvB,uDAAsC,CAAA;QACtC,mEAAkD,CAAA;QAClD,uDAAsC,CAAA;QACtC,sEAAqD,CAAA;QACrD,gEAA+C,CAAA;QAC/C,6CAA4B,CAAA;QAC5B,+DAA8C,CAAA;QAC9C,0CAAyB,CAAA;QACzB,uDAAsC,CAAA;QACtC,+CAA8B,CAAA;QAC9B,8DAA6C,CAAA;QAC7C,gEAA+C,CAAA;IACjD,CAAC,EAbW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAaxB;AACH,CAAC,EA1CgB,MAAM,KAAN,MAAM,QA0CtB"}
package/lib/ws-connection/ws-connection.d.ts CHANGED
@@ -69,9 +69,9 @@ export declare class LspWsConnection implements ILspConnection {
69
69
  */
70
70
  protected openedUris: Map<string, boolean>;
71
71
  /**
72
- * Server capabilities provider.
72
+ * Lists server capabilities.
73
73
  */
74
- protected serverCapabilities: protocol.ServerCapabilities;
74
+ serverCapabilities: protocol.ServerCapabilities;
75
75
  /**
76
76
  * The connection is connected?
77
77
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/lsp",
3
- "version": "4.0.2",
3
+ "version": "4.0.3",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -44,12 +44,12 @@
44
44
  "vscode-languageserver-protocol": "^3.17.0"
45
45
  },
46
46
  "dependencies": {
47
- "@jupyterlab/apputils": "^4.1.2",
48
- "@jupyterlab/codeeditor": "^4.0.2",
49
- "@jupyterlab/coreutils": "^6.0.2",
50
- "@jupyterlab/docregistry": "^4.0.2",
51
- "@jupyterlab/services": "^7.0.2",
52
- "@jupyterlab/translation": "^4.0.2",
47
+ "@jupyterlab/apputils": "^4.1.3",
48
+ "@jupyterlab/codeeditor": "^4.0.3",
49
+ "@jupyterlab/coreutils": "^6.0.3",
50
+ "@jupyterlab/docregistry": "^4.0.3",
51
+ "@jupyterlab/services": "^7.0.3",
52
+ "@jupyterlab/translation": "^4.0.3",
53
53
  "@lumino/coreutils": "^2.1.1",
54
54
  "@lumino/disposable": "^2.1.1",
55
55
  "@lumino/signaling": "^2.1.1",
@@ -59,7 +59,7 @@
59
59
  "vscode-ws-jsonrpc": "~1.0.2"
60
60
  },
61
61
  "devDependencies": {
62
- "@jupyterlab/testing": "^4.0.2",
62
+ "@jupyterlab/testing": "^4.0.3",
63
63
  "@types/jest": "^29.2.0",
64
64
  "@types/lodash.mergewith": "^4.6.1",
65
65
  "jest": "^29.2.0",
package/src/connection.ts CHANGED
@@ -245,7 +245,7 @@ export class LSPConnection extends LspWsConnection implements ILSPConnection {
245
245
 
246
246
  /**
247
247
  * Signal emitted when the connection receives an error
248
- * message..
248
+ * message.
249
249
  */
250
250
  get errorSignal(): ISignal<ILSPConnection, any> {
251
251
  return this._errorSignal;
@@ -315,10 +315,10 @@ export class LSPConnection extends LspWsConnection implements ILSPConnection {
315
315
  }
316
316
 
317
317
  /**
318
- * Check if a provider is available in the registered capabilities.
318
+ * Check if a capability is available in the server capabilities.
319
319
  */
320
- provides(provider: keyof lsp.ServerCapabilities): boolean {
321
- return !!(this.serverCapabilities && this.serverCapabilities[provider]);
320
+ provides(capability: keyof lsp.ServerCapabilities): boolean {
321
+ return !!(this.serverCapabilities && this.serverCapabilities[capability]);
322
322
  }
323
323
 
324
324
  /**
@@ -334,7 +334,7 @@ export class LSPConnection extends LspWsConnection implements ILSPConnection {
334
334
  }
335
335
 
336
336
  /**
337
- * initialize a connection over a web socket that speaks the LSP
337
+ * Initialize a connection over a web socket that speaks the LSP.
338
338
  */
339
339
  connect(socket: WebSocket): void {
340
340
  super.connect(socket);
package/src/connection_manager.ts CHANGED
@@ -404,7 +404,7 @@ export class DocumentConnectionManager
404
404
  }
405
405
 
406
406
  /**
407
- * Disconnect the signals of requested virtual document uri.
407
+ * Disconnect the signals of requested virtual document URI.
408
408
  */
409
409
  unregisterDocument(uri: string, emit: boolean = true): void {
410
410
  const connection = this.connections.get(uri);
@@ -423,7 +423,7 @@ export class DocumentConnectionManager
423
423
  }
424
424
 
425
425
  /**
426
- * Enable or disable the logging feature of the language servers
426
+ * Enable or disable the logging of language server communication.
427
427
  */
428
428
  updateLogging(
429
429
  logAllCommunication: boolean,
@@ -547,19 +547,16 @@ export namespace DocumentConnectionManager {
547
547
  virtualDocument: VirtualDocument,
548
548
  language: string
549
549
  ): IURIs | undefined {
550
- const wsBase = PageConfig.getBaseUrl().replace(/^http/, 'ws');
550
+ const serverManager = Private.getLanguageServerManager();
551
+ const wsBase = serverManager.settings.wsUrl;
551
552
  const rootUri = PageConfig.getOption('rootUri');
552
553
  const virtualDocumentsUri = PageConfig.getOption('virtualDocumentsUri');
553
554
 
554
- const baseUri = virtualDocument.hasLspSupportedFile
555
- ? rootUri
556
- : virtualDocumentsUri;
557
-
558
555
  // for now take the best match only
559
- const matchingServers =
560
- Private.getLanguageServerManager().getMatchingServers({
561
- language
562
- });
556
+ const serverOptions: ILanguageServerManager.IGetServerIdOptions = {
557
+ language
558
+ };
559
+ const matchingServers = serverManager.getMatchingServers(serverOptions);
563
560
  const languageServerId =
564
561
  matchingServers.length === 0 ? null : matchingServers[0];
565
562
 
@@ -567,6 +564,21 @@ export namespace DocumentConnectionManager {
567
564
  return;
568
565
  }
569
566
 
567
+ const specs = serverManager.getMatchingSpecs(serverOptions);
568
+ const spec = specs.get(languageServerId);
569
+ if (!spec) {
570
+ console.warn(
571
+ `Specification not available for server ${languageServerId}`
572
+ );
573
+ }
574
+ const requiresOnDiskFiles = spec?.requires_documents_on_disk ?? true;
575
+ const supportsInMemoryFiles = !requiresOnDiskFiles;
576
+
577
+ const baseUri =
578
+ virtualDocument.hasLspSupportedFile || supportsInMemoryFiles
579
+ ? rootUri
580
+ : virtualDocumentsUri;
581
+
570
582
  // workaround url-parse bug(s) (see https://github.com/jupyter-lsp/jupyterlab-lsp/issues/595)
571
583
  let documentUri = URLExt.join(baseUri, virtualDocument.uri);
572
584
  if (
@@ -653,7 +665,8 @@ namespace Private {
653
665
  ): Promise<LSPConnection> {
654
666
  let connection = _connections.get(languageServerId);
655
667
  if (!connection) {
656
- const socket = new WebSocket(uris.socket);
668
+ const { settings } = Private.getLanguageServerManager();
669
+ const socket = new settings.WebSocket(uris.socket);
657
670
  const connection = new LSPConnection({
658
671
  languageId: language,
659
672
  serverUri: uris.server,
package/src/manager.ts CHANGED
@@ -33,6 +33,7 @@ export class LanguageServerManager implements ILanguageServerManager {
33
33
  get isEnabled(): boolean {
34
34
  return this._enabled;
35
35
  }
36
+
36
37
  /**
37
38
  * Check if the manager is disposed.
38
39
  */
@@ -40,6 +41,13 @@ export class LanguageServerManager implements ILanguageServerManager {
40
41
  return this._isDisposed;
41
42
  }
42
43
 
44
+ /**
45
+ * Get server connection settings.
46
+ */
47
+ get settings() {
48
+ return this._settings;
49
+ }
50
+
43
51
  /**
44
52
  * Get the language server specs.
45
53
  */
@@ -204,7 +212,7 @@ export class LanguageServerManager implements ILanguageServerManager {
204
212
  for (let key of Object.keys(sessions)) {
205
213
  let id: TLanguageServerId = key as TLanguageServerId;
206
214
  if (this._sessions.has(id)) {
207
- Object.assign(this._sessions.get(id)!, sessions[key]);
215
+ Object.assign(this._sessions.get(id) || {}, sessions[key]);
208
216
  } else {
209
217
  this._sessions.set(id, sessions[key]);
210
218
  }
package/src/tokens.ts CHANGED
@@ -91,6 +91,13 @@ export interface ILanguageServerManager extends IDisposable {
91
91
  */
92
92
  readonly sessions: TSessionMap;
93
93
 
94
+ /**
95
+ * @alpha
96
+ *
97
+ * Get server connection settings.
98
+ */
99
+ readonly settings: ServerConnection.ISettings;
100
+
94
101
  /**
95
102
  * @alpha
96
103
  *
@@ -124,7 +131,7 @@ export interface ILanguageServerManager extends IDisposable {
124
131
  *
125
132
  * Enable the language server services
126
133
  */
127
- enable(): void;
134
+ enable(): Promise<void>;
128
135
 
129
136
  /**
130
137
  * @alpha
@@ -402,6 +409,11 @@ export interface ILSPDocumentConnectionManager {
402
409
  */
403
410
  readonly ready: Promise<void>;
404
411
 
412
+ /**
413
+ * Initial configuration for the language servers.
414
+ */
415
+ initialConfigurations: TLanguageServerConfigurations;
416
+
405
417
  /**
406
418
  * Handles the settings that do not require an existing connection
407
419
  * with a language server (or can influence to which server the
@@ -411,6 +423,11 @@ export interface ILSPDocumentConnectionManager {
411
423
  */
412
424
  updateConfiguration(allServerSettings: TLanguageServerConfigurations): void;
413
425
 
426
+ /**
427
+ * Enable or disable the logging of language server communication.
428
+ */
429
+ updateLogging(logAllCommunication: boolean, setTrace: lsp.TraceValues): void;
430
+
414
431
  /**
415
432
  * Handles the settings that the language servers accept using
416
433
  * `onDidChangeConfiguration` messages, which should be passed under
@@ -851,6 +868,20 @@ export interface ILSPConnection extends ILspConnection, IObservableDisposable {
851
868
  */
852
869
  errorSignal: ISignal<ILSPConnection, any>;
853
870
 
871
+ /**
872
+ * @alpha
873
+ *
874
+ * Check if a capability is available in the server capabilities.
875
+ */
876
+ provides(capability: keyof lsp.ServerCapabilities): boolean;
877
+
878
+ /**
879
+ * @alpha
880
+ *
881
+ * Lists server capabilities.
882
+ */
883
+ serverCapabilities: lsp.ServerCapabilities;
884
+
854
885
  /**
855
886
  * @alpha
856
887
  *
package/src/ws-connection/ws-connection.ts CHANGED
@@ -261,9 +261,9 @@ export class LspWsConnection implements ILspConnection {
261
261
  protected openedUris = new Map<string, boolean>();
262
262
 
263
263
  /**
264
- * Server capabilities provider.
264
+ * Lists server capabilities.
265
265
  */
266
- protected serverCapabilities: protocol.ServerCapabilities;
266
+ serverCapabilities: protocol.ServerCapabilities;
267
267
 
268
268
  /**
269
269
  * The connection is connected?
package/lib/adapters/statusmessage.d.ts DELETED
@@ -1,47 +0,0 @@
1
- import { IDisposable } from '@lumino/disposable';
2
- import { ISignal } from '@lumino/signaling';
3
- export declare class StatusMessage implements IDisposable {
4
- constructor();
5
- /**
6
- * Signal emitted on status changed event.
7
- */
8
- get changed(): ISignal<StatusMessage, void>;
9
- /**
10
- * Test whether the object is disposed.
11
- */
12
- get isDisposed(): boolean;
13
- /**
14
- * Dispose the object.
15
- */
16
- dispose(): void;
17
- /**
18
- * The text message to be shown on the statusbar.
19
- */
20
- get message(): string;
21
- /**
22
- * Set the text message and (optionally) the timeout to remove it.
23
- * @param message
24
- * @param timeout - number of ms to until the message is cleaned;
25
- * -1 if the message should stay up indefinitely;
26
- * defaults to 3000ms (3 seconds)
27
- */
28
- set(message: string, timeout?: number): void;
29
- /**
30
- * Clear the status message.
31
- */
32
- clear(): void;
33
- /**
34
- * Timeout reference used to clear the previous `setTimeout` call.
35
- */
36
- private _timer;
37
- /**
38
- * Clear the previous `setTimeout` call.
39
- */
40
- private _expireTimer;
41
- /**
42
- * The text message to be shown on the statusbar
43
- */
44
- private _message;
45
- private _changed;
46
- private _isDisposed;
47
- }
package/lib/adapters/statusmessage.js DELETED
@@ -1,74 +0,0 @@
1
- // Copyright (c) Jupyter Development Team.
2
- // Distributed under the terms of the Modified BSD License.
3
- import { Signal } from '@lumino/signaling';
4
- export class StatusMessage {
5
- constructor() {
6
- this._changed = new Signal(this);
7
- this._isDisposed = false;
8
- this._message = '';
9
- this._timer = null;
10
- }
11
- /**
12
- * Signal emitted on status changed event.
13
- */
14
- get changed() {
15
- return this._changed;
16
- }
17
- /**
18
- * Test whether the object is disposed.
19
- */
20
- get isDisposed() {
21
- return this._isDisposed;
22
- }
23
- /**
24
- * Dispose the object.
25
- */
26
- dispose() {
27
- if (this.isDisposed) {
28
- return;
29
- }
30
- this._isDisposed = true;
31
- if (this._timer) {
32
- window.clearTimeout(this._timer);
33
- }
34
- Signal.clearData(this);
35
- }
36
- /**
37
- * The text message to be shown on the statusbar.
38
- */
39
- get message() {
40
- return this._message;
41
- }
42
- /**
43
- * Set the text message and (optionally) the timeout to remove it.
44
- * @param message
45
- * @param timeout - number of ms to until the message is cleaned;
46
- * -1 if the message should stay up indefinitely;
47
- * defaults to 3000ms (3 seconds)
48
- */
49
- set(message, timeout = 1000 * 3) {
50
- this._expireTimer();
51
- this._message = message;
52
- this._changed.emit();
53
- if (timeout !== -1) {
54
- this._timer = window.setTimeout(this.clear.bind(this), timeout);
55
- }
56
- }
57
- /**
58
- * Clear the status message.
59
- */
60
- clear() {
61
- this._message = '';
62
- this._changed.emit();
63
- }
64
- /**
65
- * Clear the previous `setTimeout` call.
66
- */
67
- _expireTimer() {
68
- if (this._timer !== null) {
69
- window.clearTimeout(this._timer);
70
- this._timer = null;
71
- }
72
- }
73
- }
74
- //# sourceMappingURL=statusmessage.js.map
package/lib/adapters/statusmessage.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"statusmessage.js","sourceRoot":"","sources":["../../src/adapters/statusmessage.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,OAAO,aAAa;IACxB;QAmFQ,aAAQ,GAAG,IAAI,MAAM,CAAsB,IAAI,CAAC,CAAC;QAEjD,gBAAW,GAAG,KAAK,CAAC;QApF1B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClC;QACD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,OAAe,EAAE,UAAkB,IAAI,GAAG,CAAC;QAC7C,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE;YAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;SACjE;IACH,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAMD;;OAEG;IACK,YAAY;QAClB,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE;YACxB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACpB;IACH,CAAC;CAUF"}
package/src/adapters/statusmessage.ts DELETED
@@ -1,94 +0,0 @@
1
- // Copyright (c) Jupyter Development Team.
2
- // Distributed under the terms of the Modified BSD License.
3
-
4
- import { IDisposable } from '@lumino/disposable';
5
- import { ISignal, Signal } from '@lumino/signaling';
6
-
7
- export class StatusMessage implements IDisposable {
8
- constructor() {
9
- this._message = '';
10
- this._timer = null;
11
- }
12
-
13
- /**
14
- * Signal emitted on status changed event.
15
- */
16
- get changed(): ISignal<StatusMessage, void> {
17
- return this._changed;
18
- }
19
-
20
- /**
21
- * Test whether the object is disposed.
22
- */
23
- get isDisposed(): boolean {
24
- return this._isDisposed;
25
- }
26
-
27
- /**
28
- * Dispose the object.
29
- */
30
- dispose(): void {
31
- if (this.isDisposed) {
32
- return;
33
- }
34
- this._isDisposed = true;
35
- if (this._timer) {
36
- window.clearTimeout(this._timer);
37
- }
38
- Signal.clearData(this);
39
- }
40
-
41
- /**
42
- * The text message to be shown on the statusbar.
43
- */
44
- get message(): string {
45
- return this._message;
46
- }
47
-
48
- /**
49
- * Set the text message and (optionally) the timeout to remove it.
50
- * @param message
51
- * @param timeout - number of ms to until the message is cleaned;
52
- * -1 if the message should stay up indefinitely;
53
- * defaults to 3000ms (3 seconds)
54
- */
55
- set(message: string, timeout: number = 1000 * 3): void {
56
- this._expireTimer();
57
- this._message = message;
58
- this._changed.emit();
59
- if (timeout !== -1) {
60
- this._timer = window.setTimeout(this.clear.bind(this), timeout);
61
- }
62
- }
63
-
64
- /**
65
- * Clear the status message.
66
- */
67
- clear(): void {
68
- this._message = '';
69
- this._changed.emit();
70
- }
71
- /**
72
- * Timeout reference used to clear the previous `setTimeout` call.
73
- */
74
- private _timer: number | null;
75
-
76
- /**
77
- * Clear the previous `setTimeout` call.
78
- */
79
- private _expireTimer(): void {
80
- if (this._timer !== null) {
81
- window.clearTimeout(this._timer);
82
- this._timer = null;
83
- }
84
- }
85
-
86
- /**
87
- * The text message to be shown on the statusbar
88
- */
89
- private _message: string;
90
-
91
- private _changed = new Signal<StatusMessage, void>(this);
92
-
93
- private _isDisposed = false;
94
- }