some cleanup of completion, document updating

Author: bollwyvl

packages/jupyterlab-lsp/src/adapters/jupyterlab/components/completion.ts

@@ -112,8 +112,6 @@ export class LSPConnector extends DataConnector<
   ): Promise<CompletionHandler.IReply> {
     let editor = this._editor;
 
-    console.error('NRB: editor', (editor as any)._editor.display.lineDiv);
-
     const cursor = editor.getCursorPosition();
     const token = editor.getTokenForPosition(cursor);
 

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

@@ -1,4 +1,3 @@
-import { PathExt } from '@jupyterlab/coreutils';
 import * as CodeMirror from 'codemirror';
 import { CodeMirrorAdapter } from '../codemirror/cm_adapter';
 import { JupyterFrontEnd } from '@jupyterlab/application';
@@ -29,7 +28,8 @@ import { ICommandContext } from '../../command_manager';
 import { JSONObject } from '@phosphor/coreutils';
 import {
   DocumentConnectionManager,
-  IDocumentConnectionData
+  IDocumentConnectionData,
+  ISocketConnectionOptions
 } from '../../connection_manager';
 import { Rename } from '../codemirror/features/rename';
 
@@ -227,12 +227,6 @@ export abstract class JupyterLabWidgetAdapter
 
   abstract get language_file_extension(): string;
 
-  get root_path() {
-    // TODO: serverRoot may need to be included for Hub or Windows, requires testing.
-    // let root = PageConfig.getOption('serverRoot');
-    return PathExt.dirname(this.document_path);
-  }
-
   // equivalent to triggering didClose and didOpen, as per syncing specification,
   // but also reloads the connection; used during file rename (or when it was moved)
   protected reload_connection() {
@@ -402,14 +396,11 @@ export abstract class JupyterLabWidgetAdapter
   private async connect(virtual_document: VirtualDocument) {
     let language = virtual_document.language;
 
-    console.log(
-      `LSP: will connect using root path: ${this.root_path} and language: ${language}`
-    );
+    console.log(`LSP: will connect using language: ${language}`);
 
-    let options = {
+    let options: ISocketConnectionOptions = {
       virtual_document,
       language,
-      root_path: this.root_path,
       document_path: this.document_path
     };
 

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

@@ -197,10 +197,6 @@ export class NotebookAdapter extends JupyterLabWidgetAdapter {
     if (cell == null) {
       return;
     }
-    console.error(
-      'NRB: on_completions',
-      (cell.editor as any)._editor.display.lineDiv
-    );
     this.set_completion_connector(cell);
     this.current_completion_handler.editor = cell.editor;
     this.current_completion_handler.connector = this.current_completion_connector;

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -13,16 +13,12 @@ export interface IDocumentConnectionData {
   connection: LSPConnection;
 }
 
-interface ISocketConnectionOptions {
+export interface ISocketConnectionOptions {
   virtual_document: VirtualDocument;
   /**
    * The language identifier, corresponding to the API endpoint on the LSP proxy server.
    */
   language: string;
-  /**
-   * The root path in the JupyterLab (virtual) path space
-   */
-  root_path: string;
   /**
    * Path to the document in the JupyterLab space
    */
@@ -257,6 +253,7 @@ export class DocumentConnectionManager {
 
   public unregister_document(virtual_document: VirtualDocument) {
     this.connections.delete(virtual_document.id_path);
+    this.documents_changed.emit(this.documents);
   }
 }