@marimo-team/islands 0.19.7-dev45 → 0.19.7-dev46

package/dist/main.js

@@ -17762,7 +17762,7 @@ ${JSON.stringify(e2, null, 4)}`);
       label: f,
       detail: (d == null ? void 0 : d.detail) || c,
       apply(e2, c2, d2, _2) {
-        if (v && isLSPTextEdit(v) ? e2.dispatch(insertCompletionText(e2.state, v.newText, posToOffsetOrZero(e2.state.doc, v.range.start), posToOffsetOrZero(e2.state.doc, v.range.end))) : y && E === InsertTextFormat.Snippet && r.useSnippetOnCompletion ? snippet(convertSnippet(y))(e2, null, d2, _2) : e2.dispatch(insertCompletionText(e2.state, f, d2, _2)), !w) return;
+        if (v && isLSPTextEdit(v) ? e2.dispatch(insertCompletionText(e2.state, v.newText, posToOffsetOrZero(e2.state.doc, v.range.start), posToOffsetOrZero(e2.state.doc, v.range.end))) : y && E === InsertTextFormat.Snippet && r.useSnippetOnCompletion ? snippet(convertSnippet(y))(e2, null, d2, _2) : e2.dispatch(insertCompletionText(e2.state, y || f, d2, _2)), !w) return;
         let S2 = w.sort(({ range: { end: r2 } }, { range: { end: c3 } }) => posToOffsetOrZero(e2.state.doc, r2) < posToOffsetOrZero(e2.state.doc, c3) ? 1 : posToOffsetOrZero(e2.state.doc, r2) > posToOffsetOrZero(e2.state.doc, c3) ? -1 : 0);
         for (let r2 of S2) e2.dispatch(e2.state.update({
           changes: {
@@ -32350,7 +32350,6 @@ ${c.sqlString}
   var Snapshotter = class {
     constructor(e) {
       __publicField(this, "documentVersion", 0);
-      __publicField(this, "versionToCellNumberAndVersion", new LRUCache(20));
       __publicField(this, "lastSnapshot", null);
       this.getNotebookCode = e;
     }
@@ -32367,11 +32366,6 @@ ${c.sqlString}
         version: this.documentVersion
       };
     }
-    getSnapshot(e) {
-      let r = this.versionToCellNumberAndVersion.get(e);
-      if (!r) throw Error(`No snapshot for version ${e}`);
-      return r;
-    }
     getLatestSnapshot() {
       if (!this.lastSnapshot) throw Error("No snapshots");
       return {
@@ -32611,13 +32605,26 @@ ${c.sqlString}
       }), d.contents === "" ? null : (d.range && (d.range = r.reverseRange(d.range, c)), d)) : (Logger.debug("[lsp] no hover result"), d);
     }
     async textDocumentCompletion(e) {
-      let { lens: r } = this.snapshotter.getLatestSnapshot(), c = CellDocumentUri.parse(e.textDocument.uri);
+      let { lens: r } = this.snapshotter.getLatestSnapshot();
+      if (!CellDocumentUri.is(e.textDocument.uri)) return Logger.error("[lsp] Invalid cell document URI in completion request", e.textDocument.uri), null;
+      let c = CellDocumentUri.parse(e.textDocument.uri);
+      if (!c || c === "undefined") return Logger.error("[lsp] Invalid cellId 'undefined' in completion request", {
+        cellId: c,
+        uri: e.textDocument.uri,
+        availableCellIds: r.cellIds
+      }), null;
+      r.cellIds.includes(c) || Logger.warn("[lsp] CellId in completion request not found in current lens", {
+        cellId: c,
+        uri: e.textDocument.uri,
+        availableCellIds: r.cellIds
+      });
+      let d = r.transformPosition(e.position, c);
       return this.client.textDocumentCompletion({
         ...e,
         textDocument: {
           uri: this.documentUri
         },
-        position: r.transformPosition(e.position, c)
+        position: d
       });
     }
     patchProcessNotification() {
@@ -32944,7 +32951,7 @@ ${c.sqlString}
                 client: r2,
                 languageId: "python",
                 allowHTMLContent: true,
-                useSnippetOnCompletion: false,
+                useSnippetOnCompletion: true,
                 hoverConfig: _,
                 completionConfig: d2,
                 diagnosticsEnabled: ((_d2 = f.diagnostics) == null ? void 0 : _d2.enabled) ?? false,
@@ -73168,7 +73175,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev45"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev46"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.7-dev45",
+  "version": "0.19.7-dev46",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -55,7 +55,7 @@
     "@lezer/markdown": "^1.6.2",
     "@lezer/python": "^1.1.18",
     "@marimo-team/codemirror-ai": "^0.3.5",
-    "@marimo-team/codemirror-languageserver": "^1.16.10",
+    "@marimo-team/codemirror-languageserver": "^1.16.11",
     "@marimo-team/codemirror-mcp": "^0.1.5",
     "@marimo-team/codemirror-sql": "^0.2.4",
     "@marimo-team/llm-info": "workspace:*",

package/src/core/codemirror/language/languages/python.ts

@@ -293,7 +293,7 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {
             client: client as unknown as LanguageServerClient,
             languageId: "python",
             allowHTMLContent: true,
-            useSnippetOnCompletion: false,
+            useSnippetOnCompletion: true,
             hoverConfig: hoverOptions,
             completionConfig: autocompleteOptions,
             // Default to false

package/src/core/codemirror/lsp/notebook-lsp.ts

@@ -47,13 +47,6 @@ class Snapshotter {
     this.getNotebookCode = getNotebookCode;
   }
 
-  /**
-   * Map from the global document version to the cell id and version.
-   */
-  private versionToCellNumberAndVersion = new LRUCache<number, NotebookLens>(
-    20,
-  );
-
   private lastSnapshot: NotebookLens | null = null;
 
   public snapshot() {
@@ -78,14 +71,6 @@ class Snapshotter {
     };
   }
 
-  public getSnapshot(version: number) {
-    const snapshot = this.versionToCellNumberAndVersion.get(version);
-    if (!snapshot) {
-      throw new Error(`No snapshot for version ${version}`);
-    }
-    return snapshot;
-  }
-
   public getLatestSnapshot() {
     if (!this.lastSnapshot) {
       throw new Error("No snapshots");
@@ -657,14 +642,49 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
 
   public async textDocumentCompletion(params: LSP.CompletionParams) {
     const { lens } = this.snapshotter.getLatestSnapshot();
+
+    // Check if URI is valid
+    if (!CellDocumentUri.is(params.textDocument.uri)) {
+      Logger.error(
+        "[lsp] Invalid cell document URI in completion request",
+        params.textDocument.uri,
+      );
+      return null;
+    }
+
     const cellId = CellDocumentUri.parse(params.textDocument.uri);
 
+    // Check if cellId is valid (not undefined string)
+    if (!cellId || cellId === "undefined") {
+      Logger.error("[lsp] Invalid cellId 'undefined' in completion request", {
+        cellId,
+        uri: params.textDocument.uri,
+        availableCellIds: lens.cellIds,
+      });
+      // Return null to fail gracefully instead of sending wrong position
+      return null;
+    }
+
+    // Warn if cellId not found in lens (might be okay if cell was just added)
+    if (!lens.cellIds.includes(cellId)) {
+      Logger.warn(
+        "[lsp] CellId in completion request not found in current lens",
+        {
+          cellId,
+          uri: params.textDocument.uri,
+          availableCellIds: lens.cellIds,
+        },
+      );
+    }
+
+    const transformedPosition = lens.transformPosition(params.position, cellId);
+
     return this.client.textDocumentCompletion({
       ...params,
       textDocument: {
         uri: this.documentUri,
       },
-      position: lens.transformPosition(params.position, cellId),
+      position: transformedPosition,
     });
   }