Fix failing test, update changelog, add serverIdentifier

Author: krassowski

CHANGELOG.md

@@ -1,8 +1,14 @@
 ## Changelog
 
-### (unreleased)
+### `@krassowski/jupyterlab-lsp 3.7.0` (unreleased)
 
-- Add ability to deactivate Kernel completions or LSP completion through the settings.
+- features:
+
+  - add ability to deactivate Kernel completions or LSP completion through the settings ([#586], thanks @Carreau)
+  - allow to set a priority for LSP server, allowing to choose which server to use when multiple servers are installed ([#588])
+
+[#586]: https://github.com/krassowski/jupyterlab-lsp/pull/586
+[#588]: https://github.com/krassowski/jupyterlab-lsp/pull/588
 
 ### `jupyter-lsp 1.2.0` (2021-04-26)
 

packages/jupyterlab-lsp/src/components/statusbar.tsx

@@ -493,7 +493,7 @@ export namespace LSPStatus {
         });
         // TODO server.status === "started" ?
         // TODO update once multiple servers are allowed
-        if (matchedServers[0] === id) {
+        if (matchedServers.length && matchedServers[0] === id) {
           return true;
         }
       }
@@ -590,10 +590,11 @@ export namespace LSPStatus {
 
       detected_documents.forEach((document, uri) => {
         let connection = this._connection_manager.connections.get(uri);
-        let server_id = this._connection_manager.language_server_manager.getMatchingServers(
+        let server_ids = this._connection_manager.language_server_manager.getMatchingServers(
           { language: document.language }
         );
-        if (server_id !== null) {
+
+        if (server_ids.length !== 0) {
           documents_with_known_servers.add(document);
         }
         if (!connection) {

packages/jupyterlab-lsp/src/connection.ts

@@ -12,13 +12,17 @@ import * as lsProtocol from 'vscode-languageserver-protocol';
 
 import { until_ready } from './utils';
 
-interface ILSPOptions extends ILspOptions {}
+interface ILSPOptions extends ILspOptions {
+  serverIdentifier?: string;
+}
 
 export class LSPConnection extends LspWsConnection {
   protected documentsToOpen: IDocumentInfo[];
+  public serverIdentifier: string;
 
   constructor(options: ILSPOptions) {
     super(options);
+    this.serverIdentifier = options?.serverIdentifier;
     this.documentsToOpen = [];
   }
 

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -444,7 +444,8 @@ namespace Private {
       const connection = new LSPConnection({
         languageId: language,
         serverUri: uris.server,
-        rootUri: uris.base
+        rootUri: uris.base,
+        serverIdentifier: language_server_id
       });
       // TODO: remove remaining unbounded users of connection.on
       connection.setMaxListeners(999);

packages/jupyterlab-lsp/src/editor_integration/testutils.ts

@@ -242,7 +242,8 @@ function FeatureSupport<TBase extends TestEnvironmentConstructor>(Base: TBase) {
       return new LSPConnection({
         languageId: this.document_options.language,
         serverUri: 'ws://localhost:8080',
-        rootUri: 'file:///unit-test'
+        rootUri: 'file:///unit-test',
+        serverIdentifier: 'pylsp'
       });
     }