add open queue to connection, trigger from adapter instead of connection manager

Author: bollwyvl

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

@@ -294,21 +294,29 @@ export abstract class JupyterLabWidgetAdapter
       this.on_foreign_document_opened,
       this
     );
-
-    await this.connect(virtual_document).catch(console.warn);
+    return await this.connect(virtual_document).catch(console.warn);
   }
 
   protected async on_foreign_document_opened(
     host: VirtualDocument,
     context: IForeignContext
   ) {
     const { foreign_document } = context;
-    this.connect_document(foreign_document).catch(console.warn);
+
+    const connection_context = await this.connect_document(foreign_document);
 
     foreign_document.foreign_document_closed.connect(
       this.on_foreign_document_closed,
       this
     );
+
+    if (connection_context) {
+      connection_context.connection.sendOpenWhenReady(
+        foreign_document.document_info
+      );
+    } else {
+      console.warn(`Connection for ${foreign_document.path} was not be opened`);
+    }
   }
 
   on_foreign_document_closed(host: VirtualDocument, context: IForeignContext) {
@@ -453,6 +461,8 @@ export abstract class JupyterLabWidgetAdapter
       adapter_features
     );
     console.log('LSP: Adapter for', this.document_path, 'is ready.');
+    // the client is now fully ready: signal to the server that the document is "open"
+    connection.sendOpenWhenReady(virtual_document.document_info);
     return adapter;
   }
 

packages/jupyterlab-lsp/src/connection.ts

@@ -14,8 +14,26 @@ import { until_ready } from './utils';
 interface ILSPOptions extends ILspOptions {}
 
 export class LSPConnection extends LspWsConnection {
+  protected documentsToOpen: IDocumentInfo[];
+
   constructor(options: ILSPOptions) {
     super(options);
+    this.documentsToOpen = [];
+  }
+
+  sendOpenWhenReady(documentInfo: IDocumentInfo) {
+    if (this.isReady) {
+      this.sendOpen(documentInfo);
+    } else {
+      this.documentsToOpen.push(documentInfo);
+    }
+  }
+
+  protected onServerInitialized(params: lsProtocol.InitializeResult) {
+    super.onServerInitialized(params);
+    while (this.documentsToOpen.length) {
+      this.sendOpen(this.documentsToOpen.pop());
+    }
   }
 
   public sendSelectiveChange(

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -145,10 +145,6 @@ export class DocumentConnectionManager {
     // be re-opened and synced
     this.connections.set(virtual_document.id_path, connection);
 
-    if (connection.isReady) {
-      connection.sendOpen(virtual_document.document_info);
-    }
-
     return connection;
   }
 
@@ -183,7 +179,6 @@ export class DocumentConnectionManager {
 
     connection.on('serverInitialized', capabilities => {
       this.forEachDocumentOfConnection(connection, virtual_document => {
-        connection.sendOpen(virtual_document.document_info);
         // TODO: is this still neccessary, e.g. for status bar to update responsively?
         this.initialized.emit({ connection, virtual_document });
       });