Merge remote-tracking branch 'upstream/master' into fix-gh-403-spaces

Author: bollwyvl

docs/Configuring.ipynb

@@ -62,7 +62,7 @@
     "- `argv`, a list of shell tokens to launch the server in `stdio` mode (as\n",
     "  opposed to `tcp`),\n",
     "- the `languages` which the server will respond to, and\n",
-    "- the schema `version` of the spec (currently only `1`)\n",
+    "- the schema `version` of the spec (currently `2`)\n",
     "\n",
     "```python\n",
     "# ./jupyter_notebook_config.json                 ---------- unique! -----------\n",
@@ -73,7 +73,7 @@
     "  \"LanguageServerManager\": {\n",
     "    \"language_servers\": {\n",
     "      \"a-language-server-implementation\": {\n",
-    "        \"version\": 1,\n",
+    "        \"version\": 2,\n",
     "        \"argv\": [\"/absolute/path/to/a-language-server\", \"--stdio\"],\n",
     "        \"languages\": [\"a-language\"]\n",
     "      }\n",
@@ -106,13 +106,13 @@
     "        # if installed as a binary\n",
     "        \"argv\": [shutil.which(\"a-language-server\")],\n",
     "        \"languages\": [\"a-language\"],\n",
-    "        \"version\": 1\n",
+    "        \"version\": 2\n",
     "    },\n",
     "    \"another-language-implementation\": {\n",
     "        # if run like a script\n",
     "        \"argv\": [shutil.which(\"another-language-interpreter\"), \"another-language-server\"],\n",
     "        \"languages\": [\"another-language\"],\n",
-    "        \"version\": 1\n",
+    "        \"version\": 2\n",
     "    }\n",
     "}\n",
     "```"

packages/jupyterlab-lsp/src/adapter_manager.ts

@@ -46,6 +46,7 @@ export class WidgetAdapterManager implements ILSPAdapterManager {
     type.tracker.widgetAdded.connect((tracker, widget) => {
       this.connectWidget(extension, widget, type);
     });
+    extension.registerAdapterType(this, type);
   }
 
   public registerExtension(extension: LSPExtension) {

packages/jupyterlab-lsp/src/index.ts

@@ -5,6 +5,7 @@ import {
 import { ICommandPalette } from '@jupyterlab/apputils';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IDocumentManager } from '@jupyterlab/docmanager';
+import { IDocumentWidget } from '@jupyterlab/docregistry';
 import { Signal } from '@lumino/signaling';
 import { LanguageServerManager } from './manager';
 import '../style/index.css';
@@ -13,6 +14,7 @@ import { IStatusBar } from '@jupyterlab/statusbar';
 import { LSPStatus } from './components/statusbar';
 import { DocumentConnectionManager } from './connection_manager';
 import {
+  IAdapterTypeOptions,
   ILSPAdapterManager,
   ILSPCodeExtractorsManager,
   ILSPFeatureManager,
@@ -123,7 +125,7 @@ export class LSPExtension implements ILSPExtension {
   constructor(
     public app: JupyterFrontEnd,
     private setting_registry: ISettingRegistry,
-    palette: ICommandPalette,
+    private palette: ICommandPalette,
     documentManager: IDocumentManager,
     paths: IPaths,
     status_bar: IStatusBar,
@@ -167,19 +169,22 @@ export class LSPExtension implements ILSPExtension {
       });
 
     adapterManager.registerExtension(this);
+  }
 
-    adapterManager.adapterTypeAdded.connect((manager, type) => {
-      let command_manger = new ContextCommandManager({
-        adapter_manager: adapterManager,
-        app: app,
-        palette: palette,
-        tracker: type.tracker,
-        suffix: type.name,
-        entry_point: type.entrypoint,
-        ...type.context_menu
-      });
-      this.feature_manager.registerCommandManager(command_manger);
+  registerAdapterType(
+    adapterManager: ILSPAdapterManager,
+    type: IAdapterTypeOptions<IDocumentWidget>
+  ): void {
+    let command_manger = new ContextCommandManager({
+      adapter_manager: adapterManager,
+      app: this.app,
+      palette: this.palette,
+      tracker: type.tracker,
+      suffix: type.name,
+      entry_point: type.entrypoint,
+      ...type.context_menu
     });
+    this.feature_manager.registerCommandManager(command_manger);
   }
 
   get foreign_code_extractors() {