Address review comments, back down on lowercase

Author: krassowski

docs/Configuring.ipynb

@@ -66,8 +66,7 @@
     "    `mkdir \"new directory\"` should be split into `[\"mkdir\", \"new directory\"]`;\n",
     "    If you have Python installed, you can use `shlex.split(\"your command\")` to\n",
     "    get such an array.\n",
-    "- the `languages` which the language server will respond to (language names\n",
-    "  should be given in lowercase), and\n",
+    "- the `languages` which the language server will respond to, and\n",
     "- the schema `version` of the spec (currently `2`)\n",
     "- `mime_types` by which the notebooks and files will be matched to the language\n",
     "  server:\n",

packages/jupyterlab-lsp/schema/plugin.json

@@ -19,7 +19,7 @@
         },
         "priority": {
           "title": "Priority of the server",
-          "description": "When multiple servers match specific document/language, the server with higher priority will be used",
+          "description": "When multiple servers match specific document/language, the server with the highest priority will be used",
           "type": "number",
           "default": 50
         }

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

@@ -54,6 +54,8 @@ import { EditorAdapter } from './editor_adapter';
 import createNotebookPanel = NBTestUtils.createNotebookPanel;
 import IEditor = CodeEditor.IEditor;
 
+const DEFAULT_SERVER_ID = 'pylsp';
+
 export interface ITestEnvironment {
   document_options: VirtualDocument.IOptions;
 
@@ -71,7 +73,7 @@ export interface ITestEnvironment {
 export class MockLanguageServerManager extends LanguageServerManager {
   async fetchSessions() {
     this._sessions = new Map();
-    this._sessions.set('pylsp', {
+    this._sessions.set(DEFAULT_SERVER_ID, {
       spec: {
         languages: ['python']
       }
@@ -243,7 +245,7 @@ function FeatureSupport<TBase extends TestEnvironmentConstructor>(Base: TBase) {
         languageId: this.document_options.language,
         serverUri: 'ws://localhost:8080',
         rootUri: 'file:///unit-test',
-        serverIdentifier: 'pylsp'
+        serverIdentifier: DEFAULT_SERVER_ID
       });
     }
 

packages/jupyterlab-lsp/src/manager.ts

@@ -52,40 +52,45 @@ export class LanguageServerManager implements ILanguageServerManager {
     this._configuration = configuration;
   }
 
+  protected _comparePriorities(a: TLanguageServerId, b: TLanguageServerId) {
+    const DEFAULT_PRIORITY = 50;
+    const a_priority = this._configuration[a]?.priority ?? DEFAULT_PRIORITY;
+    const b_priority = this._configuration[b]?.priority ?? DEFAULT_PRIORITY;
+    if (a_priority == b_priority) {
+      this.console.warn(
+        `Two matching servers: ${a} and ${b} have the same priority; choose which one to use by changing the priority in Advanced Settings Editor`
+      );
+      return a.localeCompare(b);
+    }
+    // higher priority = higher in the list (descending order)
+    return b_priority - a_priority;
+  }
+
   getMatchingServers(options: ILanguageServerManager.IGetServerIdOptions) {
+    if (!options.language) {
+      this.console.error(
+        'Cannot match server by language: language not available; ensure that kernel and specs provide language and MIME type'
+      );
+      return [];
+    }
+
     const matchingSessionsKeys: TLanguageServerId[] = [];
-    const config = this._configuration;
+    const lowerCaseLanguage = options.language.toLocaleLowerCase();
 
     // most things speak language
     // if language is not known, it is guessed based on MIME type earlier
     // so some language should be available by now (which can be not obvious, e.g. "plain" for txt documents)
     for (const [key, session] of this._sessions.entries()) {
-      if (options.language) {
-        if (
-          session.spec.languages.indexOf(
-            options.language.toLocaleLowerCase()
-          ) !== -1
-        ) {
-          matchingSessionsKeys.push(key);
-        }
-      } else {
-        this.console.error(
-          'Cannot match server by language: language not available; ensure that kernel and specs provide language and MIME type'
-        );
+      if (
+        session.spec.languages.some(
+          language => language.toLocaleLowerCase() == lowerCaseLanguage
+        )
+      ) {
+        matchingSessionsKeys.push(key);
       }
     }
 
-    return matchingSessionsKeys.sort((a, b) => {
-      const a_priority = config[a]?.priority ?? 50;
-      const b_priority = config[b]?.priority ?? 50;
-      if (a_priority == b_priority) {
-        this.console.warn(
-          `Two matching servers: ${a} and ${b} have the same priority; choose which one to use by changing the priority in Advanced Settings Editor`
-        );
-      }
-      // higher priority = higher in the list (descending order)
-      return b_priority - a_priority;
-    });
+    return matchingSessionsKeys.sort(this._comparePriorities);
   }
 
   get statusCode(): number {

python_packages/jupyter_lsp/jupyter_lsp/schema/schema.json

@@ -34,7 +34,7 @@
       "type": "string"
     },
     "language-list": {
-      "description": "languages supported by this Language Server; lowercase names",
+      "description": "languages supported by this Language Server",
       "items": {
         "type": "string"
       },