@marimo-team/frontend 0.23.7-dev50 → 0.23.7-dev51

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-DTnzKdRs.js"></script>
+    <script type="module" crossorigin src="./assets/index-uDKD04Qe.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-DdZsAcJe.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
     <link rel="modulepreload" crossorigin href="./assets/react-Bj1aDYRI.js">
@@ -133,7 +133,7 @@
     <link rel="modulepreload" crossorigin href="./assets/debounce-DhnxH9Rh.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-kIkTfzTX.js">
     <link rel="modulepreload" crossorigin href="./assets/main-B0OX4z33.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-CJWUXz1v.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-DbE28H1u.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DyYDV0HI.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-BJB2rf7K.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-hKfTes-m.js">
@@ -147,34 +147,34 @@
     <link rel="modulepreload" crossorigin href="./assets/usePress-jH2RfcUG.js">
     <link rel="modulepreload" crossorigin href="./assets/input-CVE-gIjt.js">
     <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-DEC1mXgV.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-DqucEHxF.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-pRI-YfIp.js">
     <link rel="modulepreload" crossorigin href="./assets/multi-map-CUuNtzHt.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-DrHguQlr.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-CG5QYXYk.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-CR7cnzLX.js">
     <link rel="modulepreload" crossorigin href="./assets/links-B8WzCnbo.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-DX2yB43w.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-CfHlqXY6.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-Ch48HVPK.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-BwrPA9zQ.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-BdZPgXgo.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-GX_O9tyW.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-DTg26i09.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-QBvZnVYO.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-Dz1OIbOh.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-Prn_GWOB.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-1SbOXCLX.js">
     <link rel="modulepreload" crossorigin href="./assets/package-B8oXOUM-.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-CC9Bko6a.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-C_s2Utqa.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-YGhIA85d.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-UuZAUjoP.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CS4X2edG.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-CmJ1iwZ3.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CIu-0LbU.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-0RBjdtZw.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-C5i0IRVM.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-B2pl_WA3.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-P--XWZhg.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-DILIU9Rm.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-C_hNGAKl.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-DGqYztXR.js">
     <link rel="modulepreload" crossorigin href="./assets/command-2NPJCYDa.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-Bz_0Vkyf.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-iwK4b4VF.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-DHh51UwN.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-DEJbA1IY.js">
     <link rel="modulepreload" crossorigin href="./assets/table-DUSsaCYD.js">
     <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-DPVTppnD.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-CLO6LFll.js">
@@ -193,27 +193,27 @@
     <link rel="modulepreload" crossorigin href="./assets/message-circle-1YLdnr8A.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-BJLYnZpG.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-CgWOEYeG.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-eeHUhz4_.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-Dxol3ZtH.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-nqk474t8.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-blYaQso8.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-D1ptWKg6.js">
     <link rel="modulepreload" crossorigin href="./assets/ellipsis-vertical-CkwWkOQL.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-a_9k9BK7.js">
     <link rel="modulepreload" crossorigin href="./assets/tree-actions-D9i3o3Zk.js">
-    <link rel="modulepreload" crossorigin href="./assets/components-BxcnsrL3.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-qXG5O_LC.js">
+    <link rel="modulepreload" crossorigin href="./assets/components-Cj3Al1Y6.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-CNeXQtKn.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-Ol38nIbL.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-DkplF0z9.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-n07aHtSF.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-BS2PIEzV.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-uy6dAsIe.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-DoKw85w0.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-DLYpPRvw.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-BT-KOYV5.js">
     <link rel="modulepreload" crossorigin href="./assets/plus-CxkHs8QM.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CiB7SZvF.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-C5JNX2fu.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-B3fuktN0.js">
     <link rel="modulepreload" crossorigin href="./assets/file-HTLbeC2b.js">
     <link rel="modulepreload" crossorigin href="./assets/image-BIibSXT6.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-BQOxwp7s.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-BjTIuMQg.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-CTn-kJzM.js">
     <link rel="modulepreload" crossorigin href="./assets/events-CBm-hwqS.js">
     <link rel="modulepreload" crossorigin href="./assets/globals-DI5QlXvl.js">
@@ -222,11 +222,11 @@
     <link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
     <link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-CxV9N1bc.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-DQ_uHgcD.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-Fa6RzVTL.js">
     <link rel="modulepreload" crossorigin href="./assets/label-xHqFtfdz.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-WSbqzqT1.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-wgoQLrBS.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-DLc784Sj.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-CHy-k6AI.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-DNa2VnwU.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-D7FYCtYQ.js">
     <link rel="modulepreload" crossorigin href="./assets/field-CQGpbXj3.js">
     <link rel="modulepreload" crossorigin href="./assets/RSPContexts-Bk1r00gJ.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.23.7-dev50",
+  "version": "0.23.7-dev51",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/codemirror/go-to-definition/__tests__/commands.test.ts

@@ -101,6 +101,158 @@ print(x)`);
     `);
   });
 
+  test("selects the nearest in-scope local definition", async () => {
+    const code = `\
+a = 10
+
+def my_func():
+    a = 20
+    print(a)`;
+    view = createEditor(code);
+    const result = goToVariableDefinition(view, "a", code.lastIndexOf("a"));
+
+    expect(result).toBe(true);
+    await tick();
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      a = 10
+
+      def my_func():
+          a = 20
+          ^
+          print(a)
+      "
+    `);
+  });
+
+  test("selects the nearest in-scope parameter definition", async () => {
+    const code = `\
+a = 10
+
+def my_func(a):
+    print(a)`;
+    view = createEditor(code);
+    const result = goToVariableDefinition(view, "a", code.lastIndexOf("a"));
+
+    expect(result).toBe(true);
+    await tick();
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      a = 10
+
+      def my_func(a):
+                  ^
+          print(a)
+      "
+    `);
+  });
+
+  test("selects the comprehension target inside a set comprehension", async () => {
+    const code = `\
+x = 100
+s = {x for x in range(10)}`;
+    view = createEditor(code);
+    // Go-to-definition on the `x` before `for` (the expression part of the
+    // comprehension).
+    const usagePosition = code.indexOf("{x") + 1;
+    const result = goToVariableDefinition(view, "x", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    // Should jump to the comprehension target `x` (after `for`), not the
+    // outer `x = 100`. The Lezer Python grammar emits
+    // `SetComprehensionExpression`, and we now correctly match it in
+    // SCOPE_CREATING_NODES, so the comprehension creates a scope and the
+    // for-target is collected correctly.
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      x = 100
+      s = {x for x in range(10)}
+                 ^
+      "
+    `);
+  });
+
+  test("selects the comprehension target inside a dict comprehension", async () => {
+    const code = `\
+x = 100
+d = {x: x for x in range(10)}`;
+    view = createEditor(code);
+    const usagePosition = code.indexOf("{x") + 1;
+    const result = goToVariableDefinition(view, "x", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    // Positive control: `DictionaryComprehensionExpression` matches the grammar
+    // and is in SCOPE_CREATING_NODES, so this should jump to the comprehension
+    // target `x` (after `for`).
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      x = 100
+      d = {x: x for x in range(10)}
+                    ^
+      "
+    `);
+  });
+
+  test("skips enclosing class scope when resolving from inside a method", async () => {
+    const code = `\
+x = 100
+class Foo:
+    x = 10
+    def method(self):
+        return x`;
+    view = createEditor(code);
+    // Go-to-definition on the `x` inside `return x`.
+    const usagePosition = code.lastIndexOf("x");
+    const result = goToVariableDefinition(view, "x", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    // Should jump to `x = 100` at module scope. In Python, methods do NOT see
+    // their enclosing class body's names — class scopes are skipped in LEGB
+    // lookup once a function boundary has been crossed. We now correctly skip
+    // ClassDefinition in getScopeChain once a function boundary is crossed.
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      x = 100
+      ^
+      class Foo:
+          x = 10
+          def method(self):
+              return x
+      "
+    `);
+  });
+
+  test("resolves a global forward-reference from inside a function", async () => {
+    const code = `\
+def foo():
+    return a
+
+a = 10`;
+    view = createEditor(code);
+    // Go-to-definition on the `a` inside `return a`.
+    const usagePosition = code.indexOf("return a") + "return ".length;
+    const result = goToVariableDefinition(view, "a", usagePosition);
+
+    expect(result).toBe(true);
+    await tick();
+    // Should jump to `a = 10` at the bottom. Python allows forward references
+    // from within nested functions to module-level names. We now correctly omit
+    // "global" from POSITION_SENSITIVE_SCOPES, allowing forward references to
+    // global-level definitions declared after the usage position.
+    expect(renderEditorView(view)).toMatchInlineSnapshot(`
+      "
+      def foo():
+          return a
+
+      a = 10
+      ^
+      "
+    `);
+  });
+
   test("selects outer-scope function declaration", async () => {
     view = createEditor(`\
 def x():

package/src/core/codemirror/go-to-definition/__tests__/utils.test.ts

@@ -0,0 +1,99 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { python } from "@codemirror/lang-python";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import { afterEach, describe, expect, test } from "vitest";
+import { cellId, variableName } from "@/__tests__/branded";
+import { initialNotebookState, notebookAtom } from "@/core/cells/cells";
+import { store } from "@/core/state/jotai";
+import { variablesAtom } from "@/core/variables/state";
+import { goToDefinitionAtCursorPosition } from "../utils";
+
+async function tick(): Promise<void> {
+  await new Promise((resolve) => requestAnimationFrame(resolve));
+}
+
+function createEditor(content: string, selection: number) {
+  const state = EditorState.create({
+    doc: content,
+    selection: { anchor: selection },
+    extensions: [python()],
+  });
+
+  return new EditorView({
+    state,
+    parent: document.body,
+  });
+}
+
+const views: EditorView[] = [];
+
+afterEach(() => {
+  for (const view of views.splice(0)) {
+    view.destroy();
+  }
+
+  store.set(notebookAtom, initialNotebookState());
+  store.set(variablesAtom, {});
+});
+
+describe("goToDefinitionAtCursorPosition", () => {
+  test("prefers the current-cell local definition over a reactive global", async () => {
+    const globalCell = cellId("global-cell");
+    const localCell = cellId("local-cell");
+    const globalCode = `\
+a = 10
+print(a)`;
+    const localCode = `\
+def test():
+    a = 20
+    print(a)`;
+
+    const globalView = createEditor(globalCode, globalCode.length);
+    const localView = createEditor(localCode, localCode.lastIndexOf("a"));
+    views.push(globalView, localView);
+
+    const notebook = initialNotebookState();
+    notebook.cellHandles[globalCell] = {
+      current: { editorView: globalView, editorViewOrNull: globalView },
+    };
+    notebook.cellHandles[localCell] = {
+      current: { editorView: localView, editorViewOrNull: localView },
+    };
+
+    store.set(notebookAtom, notebook);
+    store.set(variablesAtom, {
+      [variableName("a")]: {
+        dataType: "int",
+        declaredBy: [globalCell],
+        name: variableName("a"),
+        usedBy: [localCell],
+        value: "10",
+      },
+    });
+
+    const result = goToDefinitionAtCursorPosition(localView);
+
+    expect(result).toBe(true);
+    await tick();
+    expect(localView.state.selection.main.head).toBe(
+      localCode.indexOf("a = 20"),
+    );
+    expect(globalView.state.selection.main.head).toBe(globalCode.length);
+  });
+
+  test("keeps private variables within the current cell", async () => {
+    const code = `\
+_x = 10
+output = _x + 10`;
+    const view = createEditor(code, code.lastIndexOf("_x"));
+    views.push(view);
+
+    const result = goToDefinitionAtCursorPosition(view);
+
+    expect(result).toBe(true);
+    await tick();
+    expect(view.state.selection.main.head).toBe(code.indexOf("_x = 10"));
+  });
+});