@marimo-team/islands 0.21.1-dev18 → 0.21.1-dev21

package/dist/{any-language-editor-DIUWKyeN.js → any-language-editor-DlsjUw_l.js}

@@ -5,7 +5,7 @@ import { g as Logger } from "./button-BKkuUpZh.js";
 import "./Combination-BBPQRrDo.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-CTBg5pdT.js";
 import "./react-dom-CqtLRVZP.js";
-import { d as CopyClipboardIcon, n as loadLanguage, r as esm_default, t as langs } from "./esm-BxfaUFPY.js";
+import { f as CopyClipboardIcon, n as loadLanguage, r as esm_default, t as langs } from "./esm-BLobyqMs.js";
 import "./dist-DOoqn-VL.js";
 import "./dist-BGZ7TWS9.js";
 import "./dist-BpMlUdNO.js";

package/dist/{esm-BxfaUFPY.js → esm-BLobyqMs.js}

@@ -4374,13 +4374,14 @@ function loadLanguage(e6) {
 export {
   _extends as a,
   setDiagnostics as c,
-  CopyClipboardIcon as d,
+  insertTab as d,
+  CopyClipboardIcon as f,
   minimalSetup as i,
-  historyField as l,
+  history as l,
   loadLanguage as n,
   forEachDiagnostic as o,
   esm_default as r,
   linter as s,
   langs as t,
-  insertTab as u
+  historyField as u
 };

package/dist/main.js

@@ -34,7 +34,7 @@ import { $ as __awaiter, A as custom, B as record, C as ZodUnion$1, D as any, E
 import { t as require_jsx_runtime } from "./jsx-runtime-CTBg5pdT.js";
 import { t as require_react_dom } from "./react-dom-CqtLRVZP.js";
 import { a as TooltipRoot, i as TooltipProvider, n as TooltipContent, o as TooltipTrigger, r as TooltipPortal, s as TooltipProvider$1, t as Tooltip } from "./tooltip-CKG75XQa.js";
-import { a as _extends$5, c as setDiagnostics, d as CopyClipboardIcon, i as minimalSetup, l as historyField, o as forEachDiagnostic, r as esm_default, s as linter, t as langs, u as insertTab } from "./esm-BxfaUFPY.js";
+import { a as _extends$5, c as setDiagnostics, d as insertTab, f as CopyClipboardIcon, i as minimalSetup, l as history, o as forEachDiagnostic, r as esm_default, s as linter, t as langs, u as historyField } from "./esm-BLobyqMs.js";
 import { i as toInteger_default, n as _baseSet_default } from "./_basePickBy-pTDW2_2A.js";
 import { i as get_default } from "./hasIn-B9AbGLj3.js";
 import { n as pick_default, t as range_default } from "./range-BKaWvVUE.js";
@@ -15378,9 +15378,7 @@ ${d.join("\n")}`;
       combine: (e) => e.find((e2) => e2 !== void 0)
     });
   }
-  singleFacet(), singleFacet(), singleFacet();
-  const cellIdState$1 = singleFacet();
-  singleFacet();
+  const completionConfigState = singleFacet(), hotkeysProviderState = singleFacet(), placeholderState = singleFacet(), cellIdState = singleFacet(), lspConfigState = singleFacet(), historyCompartment = new Compartment();
   function notebookIsRunning(e) {
     return Object.values(e.cellRuntime).some((e2) => e2.status === "running");
   }
@@ -15427,7 +15425,7 @@ ${d.join("\n")}`;
   }
   const cellActionsState = Facet$1.define({
     combine: (e) => e[0]
-  }), cellIdState = Facet$1.define({
+  }), cellIdState$1 = Facet$1.define({
     combine: (e) => e[0]
   });
   var BigQuery = {
@@ -24938,7 +24936,7 @@ ${d.join("\n")}`;
       });
       return;
     }
-    let S = f.transformIn(y)[0], w = e.state.facet(cellActionsState), E = e.state.facet(cellIdState$1);
+    let S = f.transformIn(y)[0], w = e.state.facet(cellActionsState), E = e.state.facet(cellIdState);
     w.updateCellCode({
       cellId: E,
       code: S,
@@ -31242,6 +31240,10 @@ ${c.sqlString}
   function updateSQLDialectFromConnection(e, r) {
     updateSQLDialect(e, SCHEMA_CACHE.getDialect(r));
   }
+  function initializeSQLDialect(e) {
+    let r = getSQLMetadata(e.state).engine;
+    updateSQLDialect(e, SCHEMA_CACHE.getDialect(r));
+  }
   function getSQLMetadata(e) {
     return e.field(languageMetadataField);
   }
@@ -31314,7 +31316,7 @@ ${c.sqlString}
   var SQL_VALIDATION_DEBOUNCE_MS = 300;
   function sqlValidationExtension() {
     return ViewPlugin.define((e) => {
-      let r, c = null, d = e.state.facet(cellIdState);
+      let r, c = null, d = e.state.facet(cellIdState$1);
       return {
         update(e2) {
           if (!e2.docChanged) return;
@@ -31956,7 +31958,7 @@ ${c.sqlString}
     let { spanProps: f, inputProps: _ } = useAutoGrowInputProps(d), v;
     r[1] === c.state ? v = r[2] : (v = c.state.field(languageAdapterState), r[1] = c.state, r[2] = v);
     let y = v, S;
-    r[3] === c.state ? S = r[4] : (S = c.state.facet(cellIdState), r[3] = c.state, r[4] = S);
+    r[3] === c.state ? S = r[4] : (S = c.state.facet(cellIdState$1), r[3] = c.state, r[4] = S);
     let w = S, E;
     r[5] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (E = (0, import_jsx_runtime.jsx)("div", {}), r[5] = E) : E = r[5];
     let O = E, M = false, I;
@@ -32188,7 +32190,7 @@ ${c.sqlString}
       })
     }), r[98] = O, r[99] = y.type, r[100] = G, r[101] = q) : q = r[101], q;
   };
-  new Compartment();
+  var languageCompartment = new Compartment();
   const setLanguageAdapter = StateEffect.define(), languageAdapterState = StateField.define({
     create() {
       return LanguageAdapters.python;
@@ -32199,13 +32201,61 @@ ${c.sqlString}
     },
     provide: (e) => showPanel.from(e, (e2) => e2.type === "python" ? null : (e3) => createPanel(e3, LanguagePanelComponent))
   });
+  function updateLanguageAdapterAndCode({ view: e, nextLanguage: r, opts: c }) {
+    let d = e.state.field(languageAdapterState), f = e.state.doc.toString(), _ = e.state.facet(completionConfigState), v = e.state.facet(hotkeysProviderState), y = e.state.facet(placeholderState), S = e.state.facet(cellIdState), w = e.state.facet(lspConfigState), E = e.state.field(languageMetadataField), O = e.state.selection.main.head, M;
+    if (c.keepCodeAsIs) M = f, d.type !== r.type && (E = {
+      ...r.defaultMetadata
+    });
+    else {
+      let [e2, c2] = d.transformOut(f, E), [_2, v2, y2] = r.transformIn(e2);
+      O += c2, O -= v2, O = clamp(O, 0, _2.length), M = _2, E = y2;
+    }
+    e.dispatch({
+      effects: [
+        setLanguageAdapter.of(r),
+        setLanguageMetadata.of(E),
+        languageCompartment.reconfigure(r.getExtension(S, _, v, y, w)),
+        historyCompartment.reconfigure([]),
+        formattingChangeEffect.of(true)
+      ],
+      changes: c.keepCodeAsIs ? void 0 : {
+        from: 0,
+        to: e.state.doc.length,
+        insert: M
+      },
+      selection: c.keepCodeAsIs ? void 0 : EditorSelection.cursor(O)
+    }), e.dispatch({
+      effects: [
+        historyCompartment.reconfigure([
+          history()
+        ])
+      ]
+    }), r.type === "sql" && initializeSQLDialect(e);
+  }
+  function languageAdapterFromCode(e) {
+    return e ? LanguageAdapters.markdown.isSupported(e) ? LanguageAdapters.markdown : LanguageAdapters.sql.isSupported(e) ? LanguageAdapters.sql : LanguageAdapters.python : LanguageAdapters.python;
+  }
+  function switchLanguage(e, r) {
+    e.state.field(languageAdapterState).type !== r.language && updateLanguageAdapterAndCode({
+      view: e,
+      nextLanguage: LanguageAdapters[r.language],
+      opts: {
+        keepCodeAsIs: r.keepCodeAsIs ?? false
+      }
+    });
+  }
   function getEditorCodeAsPython(e, r, c) {
     let d = e.state.field(languageAdapterState), f = e.state.field(languageMetadataField), _ = e.state.doc.toString();
     return r === void 0 ? d.transformOut(_, f)[0] : d.transformOut(_.slice(r, c), f)[0];
   }
   function updateEditorCodeFromPython(e, r) {
-    let [c] = e.state.field(languageAdapterState).transformIn(r);
-    return replaceEditorContent(e, c), c;
+    let c = e.state.field(languageAdapterState), d = languageAdapterFromCode(r);
+    d.type !== c.type && switchLanguage(e, {
+      language: d.type,
+      keepCodeAsIs: true
+    });
+    let [f] = e.state.field(languageAdapterState).transformIn(r);
+    return replaceEditorContent(e, f), f;
   }
   function splitEditor(e) {
     let r = e.state.selection.main.head, c = e.state.doc.toString(), d = c.length > 0 && c[r - 1] === "\n", f = c.length > 0 && c[r] === "\n", _ = d ? r - 1 : r, v = f ? r + 1 : r;
@@ -37063,7 +37113,10 @@ ${c.sqlString}
       return (_a3 = r[e2]) == null ? void 0 : _a3.name;
     }).filter(Boolean);
   };
-  splitAtom(selectAtom(notebookAtom, (e) => e.cellIds.inOrderIds.map((r) => e.cellData[r]))), atom((e) => e(notebookAtom).cellRuntime), atom((e) => notebookIsRunning(e(notebookAtom))), atom((e) => notebookQueueOrRunningCount(e(notebookAtom))), atom((e) => e(notebookAtom).cellIds.colLength), atom((e) => e(notebookAtom).cellIds.idLength > 0), atom((e) => e(notebookAtom).cellIds.getColumnIds());
+  splitAtom(selectAtom(notebookAtom, (e) => e.cellIds.inOrderIds.map((r) => e.cellData[r]))), atom((e) => e(notebookAtom).cellRuntime), atom((e) => notebookIsRunning(e(notebookAtom))), atom((e) => {
+    let { cellRuntime: r } = e(notebookAtom);
+    return Object.entries(r).every(([e2, r2]) => r2.status !== "running" || e2 === "__scratch__");
+  }), atom((e) => notebookQueueOrRunningCount(e(notebookAtom))), atom((e) => e(notebookAtom).cellIds.colLength), atom((e) => e(notebookAtom).cellIds.idLength > 0), atom((e) => e(notebookAtom).cellIds.getColumnIds());
   const cellDataAtom = atomFamily((e) => atom((r) => r(notebookAtom).cellData[e]));
   var cellRuntimeAtom = atomFamily((e) => atom((r) => r(notebookAtom).cellRuntime[e]));
   const cellHandleAtom = atomFamily((e) => atom((r) => r(notebookAtom).cellHandles[e]));
@@ -56358,7 +56411,7 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
       hasConsoleOutput: (v == null ? void 0 : v.consoleOutputs) != null
     };
   }
-  const LazyAnyLanguageCodeMirror = (0, import_react.lazy)(() => import("./any-language-editor-DIUWKyeN.js"));
+  const LazyAnyLanguageCodeMirror = (0, import_react.lazy)(() => import("./any-language-editor-DlsjUw_l.js"));
   var import_compiler_runtime$117 = require_compiler_runtime(), extensions = [
     EditorView.lineWrapping
   ];
@@ -70724,7 +70777,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.21.1-dev18"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.21.1-dev21"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$89 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

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

package/src/components/editor/header/status.tsx

@@ -5,6 +5,7 @@ import { HourglassIcon, LockIcon, UnlinkIcon } from "lucide-react";
 import React from "react";
 import { Tooltip } from "@/components/ui/tooltip";
 import { notebookScrollToRunning } from "@/core/cells/actions";
+import { onlyScratchpadIsRunningAtom } from "@/core/cells/cells";
 import { viewStateAtom } from "@/core/mode";
 import { type ConnectionStatus, WebSocketState } from "@/core/websocket/types";
 import { cn } from "@/utils/cn";
@@ -52,17 +53,24 @@ const LockedIcon = () => (
   </Tooltip>
 );
 
-const RunningIcon = () => (
-  <Tooltip content="Jump to running cell" side="right">
-    <div
-      className={topLeftStatus}
-      data-testid="loading-indicator"
-      onClick={notebookScrollToRunning}
-    >
-      <HourglassIcon className="running-app-icon" size={30} strokeWidth={1} />
-    </div>
-  </Tooltip>
-);
+const RunningIcon = () => {
+  const scratchpadOnly = useAtomValue(onlyScratchpadIsRunningAtom);
+  const tooltip = scratchpadOnly
+    ? "Scratchpad is running"
+    : "Jump to running cell";
+
+  return (
+    <Tooltip content={tooltip} side="right">
+      <div
+        className={topLeftStatus}
+        data-testid="loading-indicator"
+        onClick={scratchpadOnly ? undefined : notebookScrollToRunning}
+      >
+        <HourglassIcon className="running-app-icon" size={30} strokeWidth={1} />
+      </div>
+    </Tooltip>
+  );
+};
 
 const NoiseBackground = () => (
   <>

package/src/core/cells/cells.ts

@@ -1640,6 +1640,12 @@ export const cellsRuntimeAtom = atom((get) => get(notebookAtom).cellRuntime);
 export const notebookIsRunningAtom = atom((get) =>
   notebookIsRunning(get(notebookAtom)),
 );
+export const onlyScratchpadIsRunningAtom = atom((get) => {
+  const { cellRuntime } = get(notebookAtom);
+  return Object.entries(cellRuntime).every(
+    ([id, rt]) => rt.status !== "running" || id === SCRATCH_CELL_ID,
+  );
+});
 export const notebookQueuedOrRunningCountAtom = atom((get) =>
   notebookQueueOrRunningCount(get(notebookAtom)),
 );

package/src/core/cells/utils.ts

@@ -11,6 +11,7 @@ export function notebookIsRunning(state: NotebookState) {
     (cell) => cell.status === "running",
   );
 }
+
 export function notebookQueueOrRunningCount(state: NotebookState) {
   return Object.values(state.cellRuntime).filter(
     (cell) => cell.status === "running" || cell.status === "queued",

package/src/core/codemirror/language/utils.ts

@@ -3,7 +3,11 @@
 import type { EditorState } from "@codemirror/state";
 import type { EditorView } from "@codemirror/view";
 import { replaceEditorContent } from "../replace-editor-content";
-import { languageAdapterState } from "./extension";
+import {
+  languageAdapterFromCode,
+  languageAdapterState,
+  switchLanguage,
+} from "./extension";
 import { languageMetadataField } from "./metadata";
 
 /**
@@ -35,6 +39,17 @@ export function updateEditorCodeFromPython(
   editor: EditorView,
   pythonCode: string,
 ): string {
+  const currentAdapter = editor.state.field(languageAdapterState);
+  const correctAdapter = languageAdapterFromCode(pythonCode);
+
+  // If the language type changed (e.g., markdown → python), switch adapters
+  if (correctAdapter.type !== currentAdapter.type) {
+    switchLanguage(editor, {
+      language: correctAdapter.type,
+      keepCodeAsIs: true,
+    });
+  }
+
   const languageAdapter = editor.state.field(languageAdapterState);
   const [code] = languageAdapter.transformIn(pythonCode);
   // Use replaceEditorContent which preserves cursor position when focused