Virtual concat document with extra lines

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vscode/jupyter-lsp-middleware",
-    "version": "0.2.23",
+    "version": "0.2.24",
     "description": "VS Code Python Language Server Middleware for Jupyter Notebook",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -19,6 +19,7 @@
     "author": "Visual Studio Code Team",
     "license": "MIT",
     "dependencies": {
+        "fast-myers-diff": "^3.0.1",
         "sha.js": "^2.4.11",
         "vscode-languageclient": "7.0.0"
     },

src/common/utils.ts

@@ -48,20 +48,20 @@ export function isInteractiveCell(cellUri: Uri): boolean {
     );
 }
 
-export function splitLines(
-    str: string,
-    splitOptions: { trim?: boolean; removeEmptyEntries?: boolean } = { removeEmptyEntries: true, trim: true }
-): string[] {
+export function splitLines(str: string): string[] {
     let lines = str.split(/\r?\n/g);
-    if (splitOptions && splitOptions.trim) {
-        lines = lines.map((line) => line.trim());
-    }
-    if (splitOptions && splitOptions.removeEmptyEntries) {
-        lines = lines.filter((line) => line.length > 0);
-    }
-    return lines;
+    return lines.slice(0, lines.length - 1); // Skip last empty item
 }
 
 export function score(document: TextDocument, selector: DocumentSelector): number {
     return languages.match(selector, document);
 }
+
+export function findLastIndex<T>(array: Array<T>, predicate: (e: T) => boolean) {
+    for (let i = array.length - 1; i >= 0; i--) {
+        if (predicate(array[i])) {
+            return i;
+        }
+    }
+    return -1;
+}

src/notebookConcatLine.ts

@@ -10,7 +10,7 @@ export class NotebookConcatLine implements vscode.TextLine {
     private _firstNonWhitespaceIndex: number | undefined;
     private _isEmpty: boolean | undefined;
 
-    constructor(private _contents: string, private _line: number, private _offset: number) {
+    constructor(public cellUri: vscode.Uri, private _contents: string, private _line: number, private _offset: number) {
         this._range = new vscode.Range(new vscode.Position(_line, 0), new vscode.Position(_line, _contents.length));
         this._rangeWithLineBreak = new vscode.Range(this.range.start, new vscode.Position(_line, _contents.length + 1));
     }

src/notebookWrapper.ts

@@ -85,25 +85,25 @@ export class NotebookWrapper implements vscode.Disposable {
     public getText(range?: vscode.Range) {
         return this.concatDocument.getText(range);
     }
-    public locationAt(positionOrRange: vscode.Range | vscode.Position) {
-        return this.concatDocument.locationAt(positionOrRange);
+    public notebookLocationAt(positionOrRange: vscode.Range | vscode.Position) {
+        return this.concatDocument.notebookLocationAt(positionOrRange);
     }
-    public positionAt(offsetOrPosition: number | vscode.Position | vscode.Location) {
-        return this.concatDocument.positionAt(offsetOrPosition);
-    }
-    public offsetAt(position: vscode.Position | vscode.Location) {
-        return this.concatDocument.offsetAt(position);
+    public concatPositionAt(location: vscode.Location) {
+        return this.concatDocument.concatPositionAt(location);
     }
     public getConcatDocument(): vscode.TextDocument {
         return this.concatDocument;
     }
     public contains(cellUri: vscode.Uri) {
         return this.concatDocument.contains(cellUri);
     }
-    public rangeOf(cellUri: vscode.Uri) {
-        return this.concatDocument.rangeOf(cellUri);
+    public concatRangeOf(cellUri: vscode.Uri) {
+        return this.concatDocument.concatRangeOf(cellUri);
+    }
+    public realRangeOf(cellUri: vscode.Uri) {
+        return this.concatDocument.realRangeOf(cellUri);
     }
-    public cellOffsetAt(offset: number) {
-        return this.concatDocument.cellOffsetAt(offset);
+    public notebookOffsetAt(cellUri: vscode.Uri, offset: number) {
+        return this.concatDocument.notebookOffsetAt(cellUri, offset);
     }
 }