@jupyterlab/lsp 4.1.0-alpha.1 → 4.1.0-alpha.3

package/src/virtual/document.ts

@@ -241,7 +241,6 @@ export class VirtualDocument implements IDisposable {
     );
     this._remainingLifetime = 6;
 
-    this.unusedDocuments = new Set();
     this.documentInfo = new VirtualDocumentInfo(this);
     this.updateManager = new UpdateManager(this);
     this.updateManager.updateBegan.connect(this._updateBeganSlot, this);
@@ -446,7 +445,6 @@ export class VirtualDocument implements IDisposable {
 
     this.foreignDocuments.clear();
     this.sourceLines.clear();
-    this.unusedDocuments.clear();
     this.unusedStandaloneDocuments.clear();
     this.virtualLines.clear();
 
@@ -463,14 +461,16 @@ export class VirtualDocument implements IDisposable {
    * Clear the virtual document and all related stuffs
    */
   clear(): void {
+    this.unusedStandaloneDocuments.clear();
+
     for (let document of this.foreignDocuments.values()) {
       document.clear();
+      if (document.standalone) {
+        let set = this.unusedStandaloneDocuments.get(document.language);
+        set.push(document);
+      }
     }
 
-    // TODO - deep clear (assure that there is no memory leak)
-    this.unusedStandaloneDocuments.clear();
-
-    this.unusedDocuments = new Set();
     this.virtualLines.clear();
     this.sourceLines.clear();
     this.lastVirtualLine = 0;
@@ -742,7 +742,7 @@ export class VirtualDocument implements IDisposable {
             );
             continue;
           }
-          let foreignDocument = this.chooseForeignDocument(extractor);
+          let foreignDocument = this._chooseForeignDocument(extractor);
           foreignDocumentsMap.set(result.range, {
             virtualLine: foreignDocument.lastVirtualLine,
             virtualDocument: foreignDocument,
@@ -806,10 +806,34 @@ export class VirtualDocument implements IDisposable {
    * Close all expired documents.
    */
   closeExpiredDocuments(): void {
-    for (let document of this.unusedDocuments.values()) {
+    const usedDocuments = new Set<VirtualDocument>();
+    for (const line of this.sourceLines.values()) {
+      for (const block of line.foreignDocumentsMap.values()) {
+        usedDocuments.add(block.virtualDocument);
+      }
+    }
+
+    const documentIDs = new Map<VirtualDocument, string[]>();
+    for (const [id, document] of this.foreignDocuments.entries()) {
+      const ids = documentIDs.get(document);
+      if (typeof ids !== 'undefined') {
+        documentIDs.set(document, [...ids, id]);
+      }
+      documentIDs.set(document, [id]);
+    }
+    const allDocuments = new Set<VirtualDocument>(documentIDs.keys());
+    const unusedVirtualDocuments = new Set(
+      [...allDocuments].filter(x => !usedDocuments.has(x))
+    );
+
+    for (let document of unusedVirtualDocuments.values()) {
       document.remainingLifetime -= 1;
       if (document.remainingLifetime <= 0) {
         document.dispose();
+        const ids = documentIDs.get(document)!;
+        for (const id of ids) {
+          this.foreignDocuments.delete(id);
+        }
       }
     }
   }
@@ -867,6 +891,19 @@ export class VirtualDocument implements IDisposable {
     } as ISourcePosition;
   }
 
+  /**
+   * Compute the position in root document from the position of
+   * a virtual document.
+   */
+  transformVirtualToRoot(position: IVirtualPosition): IRootPosition | null {
+    const editor = this.virtualLines.get(position.line)?.editor;
+    const editorPosition = this.transformVirtualToEditor(position);
+    if (!editor || !editorPosition) {
+      return null;
+    }
+    return this.root.transformFromEditorToRoot(editor, editorPosition);
+  }
+
   /**
    * Get the corresponding editor of the virtual line.
    */
@@ -901,7 +938,7 @@ export class VirtualDocument implements IDisposable {
 
   /**
    * When this counter goes down to 0, the document will be destroyed and the associated connection will be closed;
-   * This is meant to reduce the number of open connections when a a foreign code snippet was removed from the document.
+   * This is meant to reduce the number of open connections when a foreign code snippet was removed from the document.
    *
    * Note: top level virtual documents are currently immortal (unless killed by other means); it might be worth
    * implementing culling of unused documents, but if and only if JupyterLab will also implement culling of
@@ -927,7 +964,6 @@ export class VirtualDocument implements IDisposable {
   protected sourceLines: Map<number, ISourceLine>;
   protected lineBlocks: Array<string>;
 
-  protected unusedDocuments: Set<VirtualDocument>;
   protected unusedStandaloneDocuments: DefaultMap<
     language,
     Array<VirtualDocument>
@@ -945,7 +981,7 @@ export class VirtualDocument implements IDisposable {
   /**
    * Get the foreign document that can be opened with the input extractor.
    */
-  private chooseForeignDocument(
+  private _chooseForeignDocument(
     extractor: IForeignCodeExtractor
   ): VirtualDocument {
     let foreignDocument: VirtualDocument;
@@ -956,11 +992,18 @@ export class VirtualDocument implements IDisposable {
     } else {
       // if (previous document does not exists) or (extractor produces standalone documents
       // and no old standalone document could be reused): create a new document
-      foreignDocument = this.openForeign(
-        extractor.language,
-        extractor.standalone,
-        extractor.fileExtension
+      let unusedStandalone = this.unusedStandaloneDocuments.get(
+        extractor.language
       );
+      if (extractor.standalone && unusedStandalone.length > 0) {
+        foreignDocument = unusedStandalone.pop()!;
+      } else {
+        foreignDocument = this.openForeign(
+          extractor.language,
+          extractor.standalone,
+          extractor.fileExtension
+        );
+      }
     }
     return foreignDocument;
   }
@@ -977,13 +1020,16 @@ export class VirtualDocument implements IDisposable {
     standalone: boolean,
     fileExtension: string
   ): VirtualDocument {
-    let document = new VirtualDocument({
+    let document = new (this.constructor as new (
+      ...args: ConstructorParameters<typeof VirtualDocument>
+    ) => VirtualDocument)({
       ...this.options,
       parent: this,
       standalone: standalone,
       fileExtension: fileExtension,
       language: language
     });
+
     const context: Document.IForeignContext = {
       foreignDocument: document,
       parentHost: this

package/style/index.css

@@ -4,6 +4,8 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
+@import url('~@lumino/widgets/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/codeeditor/style/index.css');
+@import url('~@jupyterlab/codemirror/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');

package/style/index.js

@@ -4,6 +4,8 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
+import '@lumino/widgets/style/index.js';
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/codeeditor/style/index.js';
+import '@jupyterlab/codemirror/style/index.js';
 import '@jupyterlab/docregistry/style/index.js';