@marimo-team/islands 0.25.3-dev18 → 0.25.3-dev182

package/src/core/codemirror/language/cell-code.ts

@@ -0,0 +1,114 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { diff } from "@codemirror/merge";
+import {
+  type EditorState,
+  type StateEffect,
+  Transaction,
+  type TransactionSpec,
+} from "@codemirror/state";
+import { suppressSignatureHelp } from "@marimo-team/codemirror-languageserver";
+import { dequal } from "dequal";
+import {
+  languageAdapterFromCode,
+  languageAdapterState,
+  languageConfigurationEffects,
+} from "./extension";
+import { LanguageAdapters } from "./LanguageAdapters";
+import { sqlDialectEffect } from "./languages/sql/sql";
+import { languageMetadataField, setLanguageMetadata } from "./metadata";
+
+/** The Python source represented by the editor's text and language metadata. */
+export function getCellCode(state: EditorState): string {
+  const text = state.doc.toString();
+  const adapter = state.field(languageAdapterState, false);
+  return adapter
+    ? adapter.transformOut(
+        text,
+        state.field(languageMetadataField, false) ?? {},
+      )[0]
+    : text;
+}
+
+/** Account for adapters normalizing quotes and whitespace when reading source. */
+export function editorShowsCellCode(
+  state: EditorState,
+  source: string,
+): boolean {
+  if (getCellCode(state) === source) {
+    return true;
+  }
+  const adapter = state.field(languageAdapterState, false);
+  if (!adapter?.isSupported(source)) {
+    return false;
+  }
+  const [text, , metadata] = adapter.transformIn(source);
+  return (
+    text === state.doc.toString() &&
+    dequal(metadata, state.field(languageMetadataField, false))
+  );
+}
+
+/**
+ * Prepare one update to the editor's text, language, and metadata.
+ * Existing editors keep a compatible mode; only initial loading infers one.
+ * The caller decides whether this is a local edit or a remote synchronization.
+ */
+export function prepareCellCodeUpdate(
+  state: EditorState,
+  source: string,
+  { initialize = false }: { initialize?: boolean } = {},
+): TransactionSpec | null {
+  const current = state.field(languageAdapterState, false);
+  let target = current;
+  if (current) {
+    if (initialize) {
+      target = languageAdapterFromCode(source);
+    } else if (!current.isSupported(source)) {
+      target = LanguageAdapters.python;
+    }
+  }
+  const languageChanged = target?.type !== current?.type;
+  if (!languageChanged && editorShowsCellCode(state, source)) {
+    return null;
+  }
+
+  const effects: StateEffect<unknown>[] = [];
+  let text = source;
+  if (target) {
+    if (languageChanged) {
+      effects.push(...languageConfigurationEffects(state, target));
+    }
+    const [inner, , metadata] = target.transformIn(source);
+    text = inner;
+    const metadataChanged = !dequal(
+      metadata,
+      state.field(languageMetadataField, false),
+    );
+    if (metadataChanged) {
+      effects.push(setLanguageMetadata.of(metadata));
+    }
+    if (target.type === "sql" && (languageChanged || metadataChanged)) {
+      effects.push(sqlDialectEffect(metadata.engine));
+    }
+  }
+
+  // Match the merge view's scan limit so large rewrites stay bounded. The diff
+  // maps selections, folds, and diagnostics through each individual edit.
+  const changes = diff(state.doc.toString(), text, { scanLimit: 500 }).map(
+    (change) => ({
+      from: change.fromA,
+      to: change.toA,
+      insert: text.slice(change.fromB, change.toB),
+    }),
+  );
+  return {
+    changes,
+    effects,
+    annotations: [
+      suppressSignatureHelp.of(true),
+      // History was reset with the language; the previous text uses another representation.
+      ...(languageChanged ? [Transaction.addToHistory.of(false)] : []),
+    ],
+  };
+}

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

@@ -1,11 +1,13 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { history } from "@codemirror/commands";
+import { history, historyField, invertedEffects } from "@codemirror/commands";
 import {
   Compartment,
   EditorSelection,
+  EditorState,
   StateEffect,
   StateField,
+  Transaction,
 } from "@codemirror/state";
 import { type EditorView, keymap, showPanel } from "@codemirror/view";
 import type { CellId } from "@/core/cells/ids";
@@ -25,11 +27,10 @@ import {
   placeholderState,
 } from "../config/extension";
 import type { PlaceholderType } from "../config/types";
-import { historyCompartment } from "../editing/extensions";
 import { formattingChangeEffect } from "../format";
 import { createPanel } from "../react-dom/createPanel";
 import { getLanguageAdapters, LanguageAdapters } from "./LanguageAdapters";
-import { initializeSQLDialect } from "./languages/sql/sql";
+import { sqlDialectEffect } from "./languages/sql/sql";
 import type { LanguageMetadata } from "./metadata";
 import { languageMetadataField, setLanguageMetadata } from "./metadata";
 import { LanguagePanelComponent } from "./panel/panel";
@@ -42,6 +43,32 @@ import { getEditorCodeAsPython } from "./utils";
  */
 const languageCompartment = new Compartment();
 
+/** Reconfigure a language and discard history written in its previous representation. */
+export function languageConfigurationEffects(
+  state: EditorState,
+  language: LanguageAdapter,
+): StateEffect<unknown>[] {
+  const extensions = language.getExtension({
+    cellId: state.facet(cellIdState),
+    completionConfig: state.facet(completionConfigState),
+    hotkeys: state.facet(hotkeysProviderState),
+    placeholderType: state.facet(placeholderState),
+    lspConfig: state.facet(lspConfigState),
+  });
+  if (state.field(historyField, false) !== undefined) {
+    // A fresh initializer resets the history in the same transaction as the language.
+    extensions.push(
+      historyField.init(() =>
+        EditorState.create({ extensions: [history()] }).field(historyField),
+      ),
+    );
+  }
+  return [
+    setLanguageAdapter.of(language),
+    languageCompartment.reconfigure(extensions),
+  ];
+}
+
 /**
  * State effect to set the language adapter.
  */
@@ -129,11 +156,6 @@ function updateLanguageAdapterAndCode({
 }) {
   const currentLanguage = view.state.field(languageAdapterState);
   const code = view.state.doc.toString();
-  const completionConfig = view.state.facet(completionConfigState);
-  const hotkeysProvider = view.state.facet(hotkeysProviderState);
-  const placeholderType = view.state.facet(placeholderState);
-  const cellId = view.state.facet(cellIdState);
-  const lspConfig = view.state.facet(lspConfigState);
   let metadata = view.state.field(languageMetadataField);
   let cursor = view.state.selection.main.head;
 
@@ -164,22 +186,15 @@ function updateLanguageAdapterAndCode({
   // Update the state
   view.dispatch({
     effects: [
-      setLanguageAdapter.of(nextLanguage),
+      ...languageConfigurationEffects(view.state, nextLanguage),
       setLanguageMetadata.of(metadata),
-      languageCompartment.reconfigure(
-        nextLanguage.getExtension(
-          cellId,
-          completionConfig,
-          hotkeysProvider,
-          placeholderType,
-          lspConfig,
-        ),
-      ),
-      // Clear history
-      historyCompartment.reconfigure([]),
+      ...(nextLanguage.type === "sql"
+        ? [sqlDialectEffect(metadata.engine)]
+        : []),
       // Let downstream extensions know that this is a formatting change
       formattingChangeEffect.of(true),
     ],
+    annotations: Transaction.addToHistory.of(false),
     changes: opts.keepCodeAsIs
       ? undefined
       : {
@@ -189,16 +204,6 @@ function updateLanguageAdapterAndCode({
         },
     selection: opts.keepCodeAsIs ? undefined : EditorSelection.cursor(cursor),
   });
-
-  // Add history back
-  view.dispatch({
-    effects: [historyCompartment.reconfigure([history()])],
-  });
-
-  // Initialize SQL dialect if switching to SQL
-  if (nextLanguage.type === "sql") {
-    initializeSQLDialect(view);
-  }
 }
 
 /**
@@ -218,16 +223,28 @@ export function adaptiveLanguageConfiguration(opts: {
     // Language adapter
     languageToggleKeymaps(),
     languageCompartment.of(
-      LanguageAdapters.python.getExtension(
+      LanguageAdapters.python.getExtension({
         cellId,
         completionConfig,
         hotkeys,
         placeholderType,
         lspConfig,
-      ),
+      }),
     ),
     languageAdapterState,
     languageMetadataField,
+    invertedEffects.of((tr) => {
+      if (!tr.effects.some((effect) => effect.is(setLanguageMetadata))) {
+        return [];
+      }
+      const metadata = tr.startState.field(languageMetadataField);
+      return [
+        setLanguageMetadata.of(metadata),
+        ...(tr.startState.field(languageAdapterState).type === "sql"
+          ? [sqlDialectEffect(metadata.engine)]
+          : []),
+      ];
+    }),
   ];
 }
 
@@ -323,12 +340,12 @@ export function reconfigureLanguageEffect(
   }
 
   return languageCompartment.reconfigure(
-    language.getExtension(
+    language.getExtension({
       cellId,
       completionConfig,
-      hotkeysProvider,
+      hotkeys: hotkeysProvider,
       placeholderType,
       lspConfig,
-    ),
+    }),
   );
 }

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

@@ -69,12 +69,14 @@ export class MarkdownLanguageAdapter implements LanguageAdapter<MarkdownLanguage
     return this.parser.isSupported(pythonCode);
   }
 
-  public getExtension(
-    _cellId: CellId,
-    _completionConfig: CompletionConfig,
-    hotkeys: HotkeyProvider,
-    _: PlaceholderType,
-  ): Extension[] {
+  public getExtension({
+    hotkeys,
+  }: {
+    cellId: CellId;
+    completionConfig: CompletionConfig;
+    hotkeys: HotkeyProvider;
+    placeholderType: PlaceholderType;
+  }): Extension[] {
     const markdownLanguageData = markdown().language.data;
     let view: EditorView | undefined;
 

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

@@ -157,7 +157,7 @@ const pylspClient = once((lspConfig: LSPConfig) => {
   return notebookClient;
 });
 
-const tyLspClient = once((_: LSPConfig) => {
+const tyLspClient = once((_config: LSPConfig) => {
   // oxlint-disable-next-line prefer-const -- reassigned after closure capture
   let resyncCallback: (() => Promise<void>) | undefined;
 
@@ -176,7 +176,7 @@ const tyLspClient = once((_: LSPConfig) => {
   const notebookClient = new NotebookLanguageServerClient(
     new LanguageServerClient({
       ...lspClientOpts,
-      getWorkspaceConfiguration: (_) => [{ disableLanguageServices: true }],
+      getWorkspaceConfiguration: () => [{ disableLanguageServices: true }],
     }),
     {},
   );
@@ -226,7 +226,7 @@ const pyreflyClient = once(
   },
 );
 
-const pyrightClient = once((_: LSPConfig) => {
+const pyrightClient = once((_config: LSPConfig) => {
   // oxlint-disable-next-line prefer-const -- reassigned after closure capture
   let resyncCallback: (() => Promise<void>) | undefined;
 
@@ -279,13 +279,19 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {
     return this.parser.isSupported(code);
   }
 
-  public getExtension(
-    cellId: CellId,
-    completionConfig: CompletionConfig,
-    hotkeys: HotkeyProvider,
-    placeholderType: PlaceholderType,
-    lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig },
-  ): Extension[] {
+  public getExtension({
+    cellId,
+    completionConfig,
+    hotkeys,
+    placeholderType,
+    lspConfig,
+  }: {
+    cellId: CellId;
+    completionConfig: CompletionConfig;
+    hotkeys: HotkeyProvider;
+    placeholderType: PlaceholderType;
+    lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig };
+  }): Extension[] {
     const getCompletionsExtension = () => {
       const autocompleteOptions = {
         // We remove the default keymap because we use our own which

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

@@ -2,7 +2,7 @@
 
 import { acceptCompletion, autocompletion } from "@codemirror/autocomplete";
 import { insertTab } from "@codemirror/commands";
-import { type SQLDialect, type SQLNamespace, sql } from "@codemirror/lang-sql";
+import { type SQLNamespace, sql } from "@codemirror/lang-sql";
 import type { EditorState, Extension } from "@codemirror/state";
 import { Compartment } from "@codemirror/state";
 import {
@@ -155,13 +155,15 @@ export class SQLLanguageAdapter implements LanguageAdapter<SQLLanguageAdapterMet
     return this.parser.isSupported(pythonCode);
   }
 
-  public getExtension(
-    _cellId: CellId,
-    _completionConfig: CompletionConfig,
-    _hotkeys: HotkeyProvider,
-    _placeholderType: PlaceholderType,
-    lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig },
-  ): Extension[] {
+  public getExtension({
+    lspConfig,
+  }: {
+    cellId: CellId;
+    completionConfig: CompletionConfig;
+    hotkeys: HotkeyProvider;
+    placeholderType: PlaceholderType;
+    lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig };
+  }): Extension[] {
     const analysis = createSQLAnalysis();
     const extensions = [
       // This can be updated with a dispatch effect
@@ -495,12 +497,12 @@ function isDuckDBConnection(
 }
 
 /**
- * Update the SQL dialect in the editor view.
+ * The effect that reconfigures the SQL language for the connection's dialect.
+ * Callers dispatch it, alone or with the change that selected the connection.
  */
-function updateSQLDialect(view: EditorView, dialect: SQLDialect) {
-  view.dispatch({
-    effects: sqlConfigCompartment.reconfigure(sql({ dialect })),
-  });
+export function sqlDialectEffect(connectionName: ConnectionName) {
+  const dialect = SCHEMA_CACHE.getDialect(connectionName);
+  return sqlConfigCompartment.reconfigure(sql({ dialect }));
 }
 
 // Helper functions to update the SQL dialect
@@ -509,17 +511,7 @@ export function updateSQLDialectFromConnection(
   view: EditorView,
   connectionName: ConnectionName,
 ) {
-  const dialect = SCHEMA_CACHE.getDialect(connectionName);
-  updateSQLDialect(view, dialect);
-}
-
-export function initializeSQLDialect(view: EditorView) {
-  // Get current engine and update dialect
-  const metadata = getSQLMetadata(view.state);
-  const connectionName = metadata.engine;
-  const dialect = SCHEMA_CACHE.getDialect(connectionName);
-
-  updateSQLDialect(view, dialect);
+  view.dispatch({ effects: sqlDialectEffect(connectionName) });
 }
 
 function getSQLMetadata(state: EditorState): SQLLanguageAdapterMetadata {

package/src/core/codemirror/language/panel/panel.tsx

@@ -101,6 +101,7 @@ export const LanguagePanelComponent: React.FC<{
           {metadata.engine === DUCKDB_ENGINE && <SQLModeSelect />}
           <Tooltip content="Format SQL">
             <Button
+              aria-label="Format SQL"
               variant="text"
               size="icon"
               onClick={async () => {

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

@@ -26,13 +26,13 @@ export interface LanguageAdapter<M = Record<string, any>> {
   transformIn(code: string): [string, number, M];
   transformOut(code: string, metadata: M): [string, number];
   isSupported(code: string): boolean;
-  getExtension(
-    cellId: CellId,
-    completionConfig: CompletionConfig,
-    hotkeys: HotkeyProvider,
-    placeholderType: PlaceholderType,
-    lspConfig: LSPConfig & { diagnostics?: DiagnosticsConfig },
-  ): Extension[];
+  getExtension(options: {
+    cellId: CellId;
+    completionConfig: CompletionConfig;
+    hotkeys: HotkeyProvider;
+    placeholderType: PlaceholderType;
+    lspConfig: LSPConfig & { diagnostics?: DiagnosticsConfig };
+  }): Extension[];
 }
 
 export type LanguageMetadataOf<T extends LanguageAdapter> =

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

@@ -2,12 +2,8 @@
 
 import type { EditorState } from "@codemirror/state";
 import type { EditorView } from "@codemirror/view";
-import { replaceEditorContent } from "../replace-editor-content";
-import {
-  languageAdapterFromCode,
-  languageAdapterState,
-  switchLanguage,
-} from "./extension";
+import { getCellCode } from "./cell-code";
+import { languageAdapterState } from "./extension";
 import { languageMetadataField } from "./metadata";
 
 /**
@@ -19,42 +15,16 @@ export function getEditorCodeAsPython(
   fromPos?: number,
   toPos?: number,
 ): string {
+  if (fromPos === undefined) {
+    return getCellCode(editor.state);
+  }
   const languageAdapter = editor.state.field(languageAdapterState);
   const metadata = editor.state.field(languageMetadataField);
   const editorText = editor.state.doc.toString();
-  if (fromPos !== undefined) {
-    return languageAdapter.transformOut(
-      editorText.slice(fromPos, toPos),
-      metadata,
-    )[0];
-  }
-  return languageAdapter.transformOut(editorText, metadata)[0];
-}
-
-/**
- * Update the editor code from Python code
- * Handles when the editor is showing a different language (e.g. markdown)
- */
-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
-  replaceEditorContent(editor, code);
-  return code;
+  return languageAdapter.transformOut(
+    editorText.slice(fromPos, toPos),
+    metadata,
+  )[0];
 }
 
 /**

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

@@ -12,10 +12,8 @@ import { Objects } from "@/utils/objects";
 import { isRecord } from "@/utils/records";
 import { getPositionAtWordBounds } from "../completion/hints";
 import { topologicalCodesAtom } from "../copilot/getCodes";
-import {
-  getEditorCodeAsPython,
-  updateEditorCodeFromPython,
-} from "../language/utils";
+import { prepareCellCodeUpdate } from "../language/cell-code";
+import { getEditorCodeAsPython } from "../language/utils";
 import { createNotebookLens, type NotebookLens } from "./lens";
 import { normalizeLspDocumentation } from "./normalize-markdown-math";
 import {
@@ -770,7 +768,10 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
       // Only update if it has changed
       const code = getEditorCodeAsPython(ev);
       if (code !== newCode) {
-        updateEditorCodeFromPython(ev, newCode);
+        const update = prepareCellCodeUpdate(ev.state, newCode);
+        if (update) {
+          ev.dispatch(update);
+        }
         updatedCount++;
       }
     }

package/src/core/codemirror/readonly/__tests__/extension.test.ts

@@ -4,7 +4,7 @@ import { EditorState } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { createStore } from "jotai";
 import { describe, expect, it } from "vitest";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { connectionAtom } from "../../../network/connection";
 import { dynamicReadonly, isEditorReadonly } from "../extension";
 

package/src/core/codemirror/readonly/extension.ts

@@ -5,9 +5,9 @@ import type { createStore } from "jotai";
 import {
   isAppConnected,
   isAppConnecting,
-} from "@/core/websocket/connection-utils";
+} from "@/core/session/connection-utils";
 import { connectionAtom } from "../../network/connection";
-import { ConnectionState } from "../../websocket/types";
+import { ConnectionState } from "../../session/types";
 
 /**
  * State effect for updating readonly status based on connection

package/src/core/codemirror/rtc/extension.ts

@@ -172,7 +172,6 @@ awareness.addListener((updates, origin) => {
 
 export function realTimeCollaboration(
   cellId: CellId,
-  _updateCellCode: (code: string) => void,
   initialCode = "",
 ): { extension: Extension; code: string } {
   if (isWasm()) {
@@ -207,7 +206,13 @@ export function realTimeCollaboration(
     extension: [
       languageObserverExtension(cellId),
       languageListenerExtension(cellId),
-      loroAwarenessPlugin(doc, awareness, userState, () => loroText, cellId),
+      loroAwarenessPlugin({
+        doc,
+        awareness,
+        user: userState,
+        getTextFromDoc: () => loroText,
+        cellId,
+      }),
       loroSyncPlugin(doc, ["codes", cellId], () => {
         return loroText;
       }),
@@ -419,14 +424,21 @@ function languageListenerExtension(cellId: CellId) {
 /**
  * Create a plugin to observe awareness changes
  */
-function loroAwarenessPlugin(
-  doc: LoroDoc,
-  awareness: Awareness<AwarenessState>,
-  user: UserState,
-  getTextFromDoc: (doc: LoroDoc) => LoroText,
-  cellId: CellId,
-  getUserId?: () => Uid,
-): Extension[] {
+function loroAwarenessPlugin({
+  doc,
+  awareness,
+  user,
+  getTextFromDoc,
+  cellId,
+  getUserId,
+}: {
+  doc: LoroDoc;
+  awareness: Awareness<AwarenessState>;
+  user: UserState;
+  getTextFromDoc: (doc: LoroDoc) => LoroText;
+  cellId: CellId;
+  getUserId?: () => Uid;
+}): Extension[] {
   const scopeId = `loro:cell:${cellId}` as ScopeId;
 
   return [
@@ -435,15 +447,14 @@ function loroAwarenessPlugin(
     createSelectionLayer(),
     ViewPlugin.define(
       (view) =>
-        new AwarenessPlugin(
-          view,
+        new AwarenessPlugin(view, {
           doc,
           user,
           awareness,
           getTextFromDoc,
           scopeId,
           getUserId,
-        ),
+        }),
     ),
     ViewPlugin.define(
       (view) => new RemoteAwarenessPlugin(view, doc, awareness, scopeId),