hoist pathChanged concern to plugin level

Author: bollwyvl

packages/jupyterlab-lsp/src/adapters/codemirror/feature.ts

@@ -148,6 +148,7 @@ export abstract class CodeMirrorLSPFeature implements ILSPFeature {
     for (let [event_name, handler] of this.wrapper_handlers) {
       this.wrapper.addEventListener(event_name, handler);
     }
+
     this.is_registered = true;
   }
 

packages/jupyterlab-lsp/src/adapters/codemirror/features/diagnostics_listing.tsx

@@ -270,6 +270,9 @@ export class DiagnosticsListing extends VDomRenderer<DiagnosticsListing.Model> {
 
     let by_document = Array.from(diagnostics_db).map(
       ([virtual_document, diagnostics]) => {
+        if (virtual_document.isDisposed) {
+          return [];
+        }
         return diagnostics.map((diagnostic_data, i) => {
           let cell_number: number = null;
           if (editor.has_cells) {

packages/jupyterlab-lsp/src/adapters/jupyterlab/jl_adapter.ts

@@ -133,7 +133,6 @@ export abstract class JupyterLabWidgetAdapter
     this.connection_manager = connection_manager;
 
     // set up signal connections
-    this.widget.context.pathChanged.connect(this.reload_connection, this);
     this.widget.context.saveState.connect(this.on_save_state, this);
     this.connection_manager.closed.connect(this.on_connection_closed, this);
     this.document_connected.connect(this.connect_completion, this);
@@ -162,7 +161,6 @@ export abstract class JupyterLabWidgetAdapter
       this.disconnect_adapter(this.virtual_editor?.virtual_document);
     }
 
-    this.widget.context.pathChanged.disconnect(this.reload_connection, this);
     this.widget.context.saveState.disconnect(this.on_save_state, this);
     this.connection_manager.closed.disconnect(this.on_connection_closed, this);
     this.document_connected.disconnect(this.connect_completion, this);
@@ -181,7 +179,7 @@ export abstract class JupyterLabWidgetAdapter
     );
     this.virtual_editor.dispose();
 
-    this.current_completion_connector.dispose();
+    this.current_completion_connector?.dispose();
 
     // just to be sure
     this.virtual_editor = null;
@@ -239,6 +237,7 @@ export abstract class JupyterLabWidgetAdapter
     this.connection_manager.unregister_document(
       this.virtual_editor.virtual_document
     );
+
     // recreate virtual document using current path and language
     this.virtual_editor.create_virtual_document();
     // reconnect

packages/jupyterlab-lsp/src/command_manager.ts

@@ -222,7 +222,7 @@ export class NotebookCommandManager extends ContextCommandManager {
       cm_cursor
     );
 
-    return this.current_adapter.get_context(root_position);
+    return this.current_adapter?.get_context(root_position);
   }
 }
 
@@ -243,7 +243,7 @@ export class FileEditorCommandManager extends ContextCommandManager {
     let editor = this.tracker.currentWidget.content.editor;
     let ce_cursor = editor.getCursorPosition();
     let root_position = PositionConverter.ce_to_cm(ce_cursor) as IRootPosition;
-    return this.current_adapter.get_context(root_position);
+    return this.current_adapter?.get_context(root_position);
   }
 }
 

packages/jupyterlab-lsp/src/index.ts

@@ -33,7 +33,10 @@ import {
 import IPaths = JupyterFrontEnd.IPaths;
 import { IStatusBar } from '@jupyterlab/statusbar';
 import { LSPStatus } from './adapters/jupyterlab/components/statusbar';
-import { IDocumentWidget } from '@jupyterlab/docregistry/lib/registry';
+import {
+  IDocumentWidget,
+  DocumentRegistry
+} from '@jupyterlab/docregistry/lib/registry';
 import { DocumentConnectionManager } from './connection_manager';
 
 const lsp_commands: Array<IFeatureCommand> = [].concat(
@@ -116,7 +119,9 @@ const plugin: JupyterFrontEndPlugin<void> = {
       // connection.close();
     });
 
-    fileEditorTracker.widgetAdded.connect((sender, widget) => {
+    const connect_file_editor = (
+      widget: IDocumentWidget<FileEditor, DocumentRegistry.IModel>
+    ) => {
       let fileEditor = widget.content;
 
       if (fileEditor.editor instanceof CodeMirrorEditor) {
@@ -131,17 +136,30 @@ const plugin: JupyterFrontEndPlugin<void> = {
         );
         file_editor_adapters.set(fileEditor.id, adapter);
 
-        file_editor_adapters.set(widget.id, adapter);
         const disconnect = () => {
-          file_editor_adapters.delete(widget.id);
+          file_editor_adapters.delete(fileEditor.id);
           widget.disposed.disconnect(disconnect);
+          widget.context.pathChanged.disconnect(reconnect);
           adapter.dispose();
           if (status_bar_item.model.adapter === adapter) {
             status_bar_item.model.adapter = null;
           }
         };
+
+        const reconnect = () => {
+          disconnect();
+          connect_file_editor(widget);
+        };
+
         widget.disposed.connect(disconnect);
+        widget.context.pathChanged.connect(reconnect);
+
+        status_bar_item.model.adapter = adapter;
       }
+    };
+
+    fileEditorTracker.widgetAdded.connect((sender, widget) => {
+      connect_file_editor(widget);
     });
 
     let command_manager = new FileEditorCommandManager(
@@ -152,7 +170,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     );
     command_manager.add(lsp_commands);
 
-    notebookTracker.widgetAdded.connect(async (sender, widget) => {
+    const connect_notebook = (widget: NotebookPanel) => {
       // NOTE: assuming that the default cells content factory produces CodeMirror editors(!)
       let jumper = new NotebookJumper(widget, documentManager);
       let adapter = new NotebookAdapter(
@@ -164,15 +182,30 @@ const plugin: JupyterFrontEndPlugin<void> = {
         connection_manager
       );
       notebook_adapters.set(widget.id, adapter);
+
       const disconnect = () => {
         notebook_adapters.delete(widget.id);
         widget.disposed.disconnect(disconnect);
+        widget.context.pathChanged.disconnect(reconnect);
         adapter.dispose();
         if (status_bar_item.model.adapter === adapter) {
           status_bar_item.model.adapter = null;
         }
       };
+
+      const reconnect = () => {
+        disconnect();
+        connect_notebook(widget);
+      };
+
+      widget.context.pathChanged.connect(reconnect);
       widget.disposed.connect(disconnect);
+
+      status_bar_item.model.adapter = adapter;
+    };
+
+    notebookTracker.widgetAdded.connect(async (sender, widget) => {
+      connect_notebook(widget);
     });
 
     // position context menu entries after 10th but before 11th default entry