@marimo-team/islands 0.19.3-dev23 → 0.19.3-dev24

package/dist/main.js

@@ -30382,7 +30382,7 @@ ${c.sqlString}
       });
       return c;
     }
-  }), import_Transport = require_Transport();
+  });
   function adaptForLocalStorage(e) {
     let r = e.storage || availableStorage;
     return {
@@ -30632,6 +30632,33 @@ ${c.sqlString}
   const documentationAtom = atom({
     documentation: null
   });
+  var reactiveVariableDecoration = Decoration.mark({
+    class: "mo-cm-reactive-reference"
+  });
+  Decoration.mark({
+    class: "mo-cm-reactive-reference-hover"
+  });
+  var updateReactiveVariables = StateEffect.define();
+  const reactiveReferencesField = StateField.define({
+    create() {
+      return {
+        decorations: Decoration.none,
+        ranges: []
+      };
+    },
+    update(e, r) {
+      let c = {
+        decorations: e.decorations.map(r.changes),
+        ranges: e.ranges
+      };
+      for (let e2 of r.effects) e2.is(updateReactiveVariables) && (c = {
+        decorations: Decoration.set(e2.value.map((e3) => reactiveVariableDecoration.range(e3.from, e3.to))),
+        ranges: e2.value
+      });
+      return c;
+    },
+    provide: (e) => EditorView.decorations.from(e, (e2) => e2.decorations)
+  });
   function generateUUID() {
     return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replaceAll(/[xy]/g, (e) => {
       let r = Math.trunc(Math.random() * 16);
@@ -30725,6 +30752,63 @@ ${c.sqlString}
       if (r) return e.find((e2) => e2.name === r);
     }
   }
+  async function requestDocumentation({ view: e, pos: r, excludeTypes: c }) {
+    var _a2;
+    let d = HTMLCellId.findElement(e.dom);
+    if (!d) return Logger.error("Failed to find active cell."), null;
+    let f = HTMLCellId.parse(d.id), { startToken: h, endToken: _ } = getPositionAtWordBounds(e.state.doc, r), v = ((_a2 = e.state.field(reactiveReferencesField, false)) == null ? void 0 : _a2.ranges.some((e2) => r >= e2.from && r <= e2.to)) ?? false, y = await AUTOCOMPLETER.request({
+      document: e.state.doc.slice(0, _).toString(),
+      cellId: f
+    });
+    if (!y) return "cancelled";
+    let S = e.state.doc.slice(h, _).toString();
+    return Autocompleter.asHoverTooltip({
+      position: _,
+      message: y,
+      exactName: S,
+      excludeTypes: c,
+      showGoToDefinitionHint: v
+    }) ?? null;
+  }
+  function getPositionAtWordBounds(e, r) {
+    let c = r, d = c > 0 ? e.sliceString(c - 1, c) : "", f = c < e.length ? e.sliceString(c, c + 1) : "";
+    d === "(" && f === ")" && --c;
+    let h = c, _ = c;
+    for (; h > 0; ) {
+      let r2 = e.sliceString(h - 1, h);
+      if (!/\w/.test(r2)) break;
+      h--;
+    }
+    for (; _ < e.length; ) {
+      let r2 = e.sliceString(_, _ + 1);
+      if (!/\w/.test(r2)) break;
+      _++;
+    }
+    return {
+      startToken: h,
+      endToken: _
+    };
+  }
+  function isCursorInText(e) {
+    let { head: r } = e.selection.main, c = e.doc.sliceString(r - 1, r);
+    return /\w/.test(c);
+  }
+  var debouncedAutocomplete = debounce_default(async (e, r) => {
+    if (store.get(chromeAtom).selectedPanel !== "documentation") return;
+    let c = await requestDocumentation({
+      view: e,
+      pos: r
+    });
+    c !== "cancelled" && store.set(documentationAtom, {
+      documentation: (c == null ? void 0 : c.html) ?? null
+    });
+  }, 300);
+  EditorView.updateListener.of((e) => {
+    if (e.selectionSet && isCursorInText(e.state)) {
+      let r = e.state.selection.main.head;
+      debouncedAutocomplete(e.view, r);
+    }
+  });
   function goToPosition(e, r) {
     e.focus(), requestAnimationFrame(() => {
       e.dispatch({
@@ -32257,6 +32341,9 @@ ${c.sqlString}
   function isClientWithNotify(e) {
     return "notify" in e;
   }
+  function isPrivateVariable(e) {
+    return e.startsWith("_") && !e.startsWith("__");
+  }
   var Snapshotter = class {
     constructor(e) {
       __publicField(this, "documentVersion", 0);
@@ -32457,10 +32544,15 @@ ${c.sqlString}
       let y = d.getEditsForNewText(v.newText), S = new Map(y.map((e2) => [
         e2.cellId,
         e2.text
-      ])), w = this.getNotebookEditors();
+      ])), w = this.getNotebookEditors(), E = w[c], O = false;
+      if (E) {
+        let r2 = E.state.doc.line(e.position.line + 1).from + e.position.character, { startToken: c2, endToken: d2 } = getPositionAtWordBounds(E.state.doc, r2), f2 = E.state.doc.sliceString(c2, d2);
+        O = isPrivateVariable(f2), O && Logger.debug("[lsp] Private variable rename detected, limiting to current cell", f2);
+      }
       for (let [e2, r2] of Objects.entries(w)) {
-        let c2 = S.get(e2);
-        if (c2 == null) {
+        if (O && e2 !== c) continue;
+        let d2 = S.get(e2);
+        if (d2 == null) {
           Logger.warn("No new code for cell", e2);
           continue;
         }
@@ -32468,7 +32560,7 @@ ${c.sqlString}
           Logger.warn("No view for plugin", e2);
           continue;
         }
-        getEditorCodeAsPython(r2) !== c2 && updateEditorCodeFromPython(r2, c2);
+        getEditorCodeAsPython(r2) !== d2 && updateEditorCodeFromPython(r2, d2);
       }
       return {
         ...h,
@@ -32571,7 +32663,7 @@ ${c.sqlString}
       };
       this.client.processNotification = c;
     }
-  }, __publicField(_a, "SEEN_CELL_DOCUMENT_URIS", /* @__PURE__ */ new Set()), _a), import_build = require_build(), ReconnectingWebSocketTransport = class extends import_Transport.Transport {
+  }, __publicField(_a, "SEEN_CELL_DOCUMENT_URIS", /* @__PURE__ */ new Set()), _a), import_build = require_build(), import_Transport = require_Transport(), ReconnectingWebSocketTransport = class extends import_Transport.Transport {
     constructor(e) {
       super();
       __publicField(this, "isClosed", false);
@@ -101069,7 +101161,7 @@ Defaulting to \`null\`.`;
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.3-dev23"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.3-dev24"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.3-dev23",
+  "version": "0.19.3-dev24",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/app-config/__tests__/get-dirty-values.test.ts

@@ -1,4 +1,4 @@
-/* Copyright 2024 Marimo. All rights reserved. */
+/* Copyright 2026 Marimo. All rights reserved. */
 
 import { describe, expect, test } from "vitest";
 import { getDirtyValues } from "../user-config-form";

package/src/components/app-config/user-config-form.tsx

@@ -69,7 +69,7 @@ export function getDirtyValues<T extends FieldValues>(
   dirtyFields: Partial<Record<keyof T, unknown>>,
 ): Partial<T> {
   const result: Partial<T> = {};
-  for (const key of Object.keys(dirtyFields) as Array<keyof T>) {
+  for (const key of Object.keys(dirtyFields) as (keyof T)[]) {
     const dirty = dirtyFields[key];
     if (dirty === true) {
       result[key] = values[key];

package/src/components/editor/chrome/types.ts

@@ -194,10 +194,8 @@ export function isPanelHidden(
   if (panel.hidden) {
     return true;
   }
-  if (panel.requiredCapability) {
-    if (!capabilities[panel.requiredCapability]) {
-      return true;
-    }
+  if (panel.requiredCapability && !capabilities[panel.requiredCapability]) {
+    return true;
   }
   return false;
 }

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

@@ -756,6 +756,129 @@ describe("NotebookLanguageServerClient", () => {
       // Verify that the import cell was not changed
       expect(mockView1.state.doc.toString()).toBe("import marimo as mo");
     });
+
+    it("should only rename private variables in the current cell (issue #7810)", async () => {
+      const props = {
+        workspaceFolders: null,
+        capabilities: {
+          textDocument: {
+            rename: {
+              prepareSupport: true,
+            },
+          },
+        },
+        languageId: "python",
+        transport: {
+          sendData: vi.fn(),
+          subscribe: vi.fn(),
+          connect: vi.fn(),
+          transportRequestManager: {
+            send: vi.fn(),
+          },
+        } as any,
+      };
+
+      // Setup editor views - both cells have a private variable _x
+      const cell1Code = "_x = 1\nprint(_x)";
+      const cell2Code = "_x = 2\nprint(_x)";
+
+      const mockView1 = new EditorView({
+        doc: cell1Code,
+        extensions: [
+          languageAdapterState.init(() => new PythonLanguageAdapter()),
+          languageMetadataField.init(() => ({})),
+          languageServerWithClient({
+            client: mockClient as unknown as LanguageServerClient,
+            documentUri: CellDocumentUri.of(Cells.cell1),
+            ...props,
+          }),
+        ],
+      });
+
+      const mockView2 = new EditorView({
+        doc: cell2Code,
+        extensions: [
+          languageAdapterState.init(() => new PythonLanguageAdapter()),
+          languageMetadataField.init(() => ({})),
+          languageServerWithClient({
+            client: mockClient as unknown as LanguageServerClient,
+            documentUri: CellDocumentUri.of(Cells.cell2),
+            ...props,
+          }),
+        ],
+      });
+
+      (notebookClient as any).getNotebookEditors = () => ({
+        [Cells.cell1]: mockView1,
+        [Cells.cell2]: mockView2,
+      });
+
+      // Update the mock to return the correct codes
+      vi.spyOn(store, "get").mockImplementation((atom) => {
+        if (atom === topologicalCodesAtom) {
+          return {
+            cellIds: [Cells.cell1, Cells.cell2],
+            codes: {
+              [Cells.cell1]: cell1Code,
+              [Cells.cell2]: cell2Code,
+            },
+          };
+        }
+        return undefined;
+      });
+
+      // Setup rename params - renaming _x in cell1
+      const renameParams: LSP.RenameParams = {
+        textDocument: { uri: CellDocumentUri.of(Cells.cell1) },
+        position: { line: 0, character: 0 }, // position of '_x'
+        newName: "_y",
+      };
+
+      // Open a document first to set up the lens
+      await notebookClient.textDocumentDidOpen({
+        textDocument: {
+          uri: CellDocumentUri.of(Cells.cell1),
+          languageId: "python",
+          version: 1,
+          text: cell1Code,
+        },
+      });
+
+      // Mock the response from the language server
+      // The LSP server would rename _x in BOTH cells (since it sees the merged doc)
+      const mockRenameResponse: LSP.WorkspaceEdit = {
+        documentChanges: [
+          {
+            textDocument: {
+              uri: "file:///__marimo_notebook__.py",
+              version: 1,
+            },
+            edits: [
+              {
+                range: {
+                  start: { line: 0, character: 0 },
+                  end: { line: 3, character: 10 },
+                },
+                // LSP renames _x to _y in both cells
+                newText: "_y = 1\nprint(_y)\n_y = 2\nprint(_y)",
+              },
+            ],
+          },
+        ],
+      };
+
+      mockClient.textDocumentRename = vi
+        .fn()
+        .mockResolvedValue(mockRenameResponse);
+
+      // Call rename
+      await notebookClient.textDocumentRename(renameParams);
+
+      // The fix: only cell1 should be renamed, cell2 should remain unchanged
+      // because private variables are cell-local in marimo
+      expect(mockView1.state.doc.toString()).toBe("_y = 1\nprint(_y)");
+      expect(mockView2.state.doc.toString()).toBe("_x = 2\nprint(_x)");
+    });
   });
 
   describe("diagnostics handling", () => {

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

@@ -9,6 +9,7 @@ import { invariant } from "@/utils/invariant";
 import { Logger } from "@/utils/Logger";
 import { LRUCache } from "@/utils/lru";
 import { Objects } from "@/utils/objects";
+import { getPositionAtWordBounds } from "../completion/hints";
 import { topologicalCodesAtom } from "../copilot/getCodes";
 import {
   getEditorCodeAsPython,
@@ -22,6 +23,14 @@ import {
 } from "./types";
 import { getLSPDocument } from "./utils";
 
+/**
+ * Check if a variable name is private (starts with underscore but not dunder).
+ * Private variables in marimo are cell-local and should not be renamed across cells.
+ */
+function isPrivateVariable(name: string): boolean {
+  return name.startsWith("_") && !name.startsWith("__");
+}
+
 class Snapshotter {
   private documentVersion = 0;
   private readonly getNotebookCode: () => {
@@ -433,15 +442,46 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
 
     // Update the code in the plugins manually
     const editors = this.getNotebookEditors();
-    for (const [cellId, ev] of Objects.entries(editors)) {
-      const newCode = editsToNewCode.get(cellId);
+
+    // Check if this is a private variable rename (should only affect current cell)
+    // Private variables in marimo are cell-local and should not be renamed across cells
+    const originEditor = editors[cellId];
+    let isPrivateRename = false;
+    if (originEditor) {
+      // Convert LSP position (line, character) to CodeMirror position
+      const line = originEditor.state.doc.line(params.position.line + 1);
+      const cmPosition = line.from + params.position.character;
+      const { startToken, endToken } = getPositionAtWordBounds(
+        originEditor.state.doc,
+        cmPosition,
+      );
+      const originalName = originEditor.state.doc.sliceString(
+        startToken,
+        endToken,
+      );
+      isPrivateRename = isPrivateVariable(originalName);
+      if (isPrivateRename) {
+        Logger.debug(
+          "[lsp] Private variable rename detected, limiting to current cell",
+          originalName,
+        );
+      }
+    }
+
+    for (const [currentCellId, ev] of Objects.entries(editors)) {
+      // For private variable renames, only update the originating cell
+      if (isPrivateRename && currentCellId !== cellId) {
+        continue;
+      }
+
+      const newCode = editsToNewCode.get(currentCellId);
       if (newCode == null) {
-        Logger.warn("No new code for cell", cellId);
+        Logger.warn("No new code for cell", currentCellId);
         continue;
       }
 
       if (!ev) {
-        Logger.warn("No view for plugin", cellId);
+        Logger.warn("No view for plugin", currentCellId);
         continue;
       }
 

package/src/core/kernel/__tests__/handlers.test.ts

@@ -142,8 +142,8 @@ describe("buildCellData", () => {
         cell2: "y = 2",
       },
       last_execution_time: {
-        cell1: 1234567890,
-        cell2: 1234567891,
+        cell1: 1_234_567_890,
+        cell2: 1_234_567_891,
       },
       app_config: {
         width: "normal",

package/src/core/kernel/state.ts

@@ -1,3 +1,4 @@
+/* Copyright 2026 Marimo. All rights reserved. */
 import { atom } from "jotai";
 import { waitFor } from "../state/jotai";
 

package/src/core/network/__tests__/requests-lazy.test.ts

@@ -1,4 +1,4 @@
-/* Copyright 2024 Marimo. All rights reserved. */
+/* Copyright 2026 Marimo. All rights reserved. */
 
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { RuntimeManager } from "../../runtime/runtime";

package/src/core/network/requests-lazy.ts

@@ -1,4 +1,4 @@
-/* Copyright 2024 Marimo. All rights reserved. */
+/* Copyright 2026 Marimo. All rights reserved. */
 
 import { NoKernelConnectedError } from "@/utils/errors";
 import { Logger } from "@/utils/Logger";
@@ -152,7 +152,7 @@ export function createLazyRequests(
             `Dropping request: ${key}, since not connected to a kernel.`,
           );
           // Silently drop the request
-          return Promise.resolve();
+          return;
 
         case "throwError":
           throw new NoKernelConnectedError();

package/src/css/globals.css

@@ -184,8 +184,10 @@
   --shadow-2xl-solid: 10px 12px 0px 0px var(--base-shadow-darker), 0 0px 8px 0px hsl(0deg 0% 90% / 50%);
 
   /* Solid shadows with lighter shade color */
+
   /* biome-ignore format: definition needs to be oneline or breaks variants */
   --shadow-sm-solid-shade: 2px 2px 0px 0px var(--base-shadow), 0px 0px 2px 0px hsl(0deg 0% 50% / 20%);
+
   /* biome-ignore format: definition needs to be oneline or breaks variants */
   --shadow-md-solid-shade: 4px 4px 0px 0px var(--base-shadow), 0 0px 2px 0px hsl(0deg 0% 60% / 50%);
 }