@marimo-team/islands 0.16.5 → 0.17.1

package/src/core/codemirror/language/__tests__/sql.test.ts

@@ -8,6 +8,12 @@ import { PostgreSQL } from "@codemirror/lang-sql";
 import { EditorState, type Extension } from "@codemirror/state";
 import { DuckDBDialect } from "@marimo-team/codemirror-sql/dialects";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import type { CellId } from "@/core/cells/ids";
+import type {
+  CompletionConfig,
+  DiagnosticsConfig,
+  LSPConfig,
+} from "@/core/config/config-schema";
 import type { DataSourceConnection } from "@/core/datasets/data-source-connections";
 import {
   dataSourceConnectionsAtom,
@@ -16,7 +22,9 @@ import {
 import { type ConnectionName, DUCKDB_ENGINE } from "@/core/datasets/engines";
 import { datasetsAtom } from "@/core/datasets/state";
 import type { DatasetsState } from "@/core/datasets/types";
+import type { HotkeyProvider } from "@/core/hotkeys/hotkeys";
 import { store } from "@/core/state/jotai";
+import type { PlaceholderType } from "../../config/types";
 import { TestSQLCompletionStore } from "../languages/sql/completion-store";
 import {
   SQLLanguageAdapter,
@@ -28,6 +36,16 @@ const adapter = new SQLLanguageAdapter();
 
 const TEST_ENGINE = "test_engine" as ConnectionName;
 
+const TEST_EXTENSION_ARGS = [
+  {} as CellId,
+  {} as CompletionConfig,
+  {} as HotkeyProvider,
+  {} as PlaceholderType,
+  {} as LSPConfig & {
+    diagnostics: DiagnosticsConfig;
+  },
+] as const;
+
 describe("SQLLanguageAdapter", () => {
   describe("defaultMetadata", () => {
     it("should be set", () => {
@@ -1716,7 +1734,7 @@ describe("tablesCompletionSource", () => {
           const ctx = createCompletionContext(state, 14);
 
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();
@@ -1779,7 +1797,7 @@ describe("tablesCompletionSource", () => {
           const ctx = createCompletionContext(state, 15, "u", 14);
 
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();
@@ -1810,7 +1828,7 @@ describe("tablesCompletionSource", () => {
           const ctx = createCompletionContext(state, 15, "d", 14);
 
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();
@@ -1843,7 +1861,7 @@ describe("tablesCompletionSource", () => {
           const ctx = createCompletionContext(state, 3, "SEL", 0);
 
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();
@@ -1874,7 +1892,7 @@ describe("tablesCompletionSource", () => {
           const ctx = createCompletionContext(state, 14, ".n", 12);
 
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();
@@ -1906,7 +1924,7 @@ describe("tablesCompletionSource", () => {
       describe("variableCompletionSource", () => {
         it("should be included in extension overrides", () => {
           const adapter = new SQLLanguageAdapter();
-          const extensions = adapter.getExtension();
+          const extensions = adapter.getExtension(...TEST_EXTENSION_ARGS);
           const completion = getCompletion(extensions);
 
           expect(completion).toBeDefined();

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

@@ -8,7 +8,10 @@ import { languages } from "@codemirror/language-data";
 import { stexMath } from "@codemirror/legacy-modes/mode/stex";
 import type { Extension } from "@codemirror/state";
 import { type EditorView, ViewPlugin } from "@codemirror/view";
-import dedent from "string-dedent";
+import {
+  type MarkdownMetadata,
+  MarkdownParser,
+} from "@marimo-team/smart-cells";
 import type { CellId } from "@/core/cells/ids";
 import type { CompletionConfig } from "@/core/config/config-schema";
 import type { HotkeyProvider } from "@/core/hotkeys/hotkeys";
@@ -22,36 +25,8 @@ import { parsePython } from "../embedded/embedded-python";
 import { parseLatex } from "../embedded/latex";
 import { languageMetadataField } from "../metadata";
 import type { LanguageAdapter } from "../types";
-import {
-  QUOTE_PREFIX_KINDS,
-  type QuotePrefixKind,
-  splitQuotePrefix,
-} from "../utils/quotes";
-
-export interface MarkdownLanguageAdapterMetadata {
-  quotePrefix: QuotePrefixKind;
-}
 
-const quoteKinds = [
-  ['"""', '"""'],
-  ["'''", "'''"],
-  ['"', '"'],
-  ["'", "'"],
-];
-
-// explode into all combinations
-const pairs = QUOTE_PREFIX_KINDS.flatMap((prefix) =>
-  quoteKinds.map(([start, end]) => [prefix + start, end]),
-);
-
-const regexes = pairs.map(
-  ([start, end]) =>
-    // mo.md( + any number of spaces + start + capture + any number of spaces + end)
-    [
-      start,
-      new RegExp(`^mo\\.md\\(\\s*${start}(.*)${end}\\s*\\)$`, "s"),
-    ] as const,
-);
+export type MarkdownLanguageAdapterMetadata = MarkdownMetadata;
 
 /**
  * Language adapter for Markdown.
@@ -59,146 +34,34 @@ const regexes = pairs.map(
 export class MarkdownLanguageAdapter
   implements LanguageAdapter<MarkdownLanguageAdapterMetadata>
 {
+  private parser = new MarkdownParser();
+
   readonly type = "markdown";
-  readonly defaultCode = 'mo.md(r"""\n""")';
-  readonly defaultMetadata: MarkdownLanguageAdapterMetadata = {
-    quotePrefix: "r",
-  };
+  readonly defaultCode = this.parser.defaultCode;
+  readonly defaultMetadata: MarkdownLanguageAdapterMetadata =
+    this.parser.defaultMetadata;
 
   static fromMarkdown(markdown: string) {
-    return `mo.md(r"""\n${markdown}\n""")`;
+    return MarkdownParser.fromMarkdown(markdown);
   }
 
   transformIn(
     pythonCode: string,
   ): [string, number, MarkdownLanguageAdapterMetadata] {
-    pythonCode = pythonCode.trim();
-
-    const metadata = { ...this.defaultMetadata };
-
-    // empty string
-    if (pythonCode === "") {
-      return ["", 0, metadata];
-    }
-
-    for (const [start, regex] of regexes) {
-      const match = pythonCode.match(regex);
-      if (match) {
-        const innerCode = match[1];
-        const [quotePrefix, quoteType] = splitQuotePrefix(start);
-        metadata.quotePrefix = quotePrefix;
-        const unescapedCode = innerCode.replaceAll(`\\${quoteType}`, quoteType);
-
-        const offset = pythonCode.indexOf(innerCode);
-        // string-dedent expects the first and last line to be empty / contain only whitespace, so we pad with \n
-        return [dedent(`\n${unescapedCode}\n`).trim(), offset, metadata];
-      }
-    }
-
-    // no match
-    return [pythonCode, 0, metadata];
+    const result = this.parser.transformIn(pythonCode);
+    return [result.code, result.offset, result.metadata];
   }
 
   transformOut(
     code: string,
     metadata: MarkdownLanguageAdapterMetadata,
   ): [string, number] {
-    // NB. Must be kept consistent with marimo/_convert/utils.py
-    // ::markdown_to_marimo
-
-    // Empty string
-    if (code === "") {
-      // Need at least a space, otherwise the output will be 6 quotes
-      code = " ";
-    }
-
-    const { quotePrefix } = metadata;
-
-    // We always transform back with triple quotes, as to avoid needing to
-    // escape single quotes.
-    const escapedCode = code.replaceAll('"""', String.raw`\"""`);
-
-    // If its one line and not bounded by quotes, write it as single line
-    const isOneLine = !code.includes("\n");
-    const boundedByQuote = code.startsWith('"') || code.endsWith('"');
-    if (isOneLine && !boundedByQuote) {
-      const start = `mo.md(${quotePrefix}"""`;
-      const end = `""")`;
-      return [start + escapedCode + end, start.length];
-    }
-
-    // Multiline code
-    const start = `mo.md(\n    ${quotePrefix}"""\n`;
-    const end = `\n"""\n)`;
-    return [start + escapedCode + end, start.length + 1];
+    const result = this.parser.transformOut(code, metadata);
+    return [result.code, result.offset];
   }
 
   isSupported(pythonCode: string): boolean {
-    pythonCode = pythonCode.trim();
-
-    // Empty strings are supported
-    if (pythonCode === "") {
-      return true;
-    }
-
-    // Must start with mo.md(
-    if (!pythonCode.startsWith("mo.md(")) {
-      return false;
-    }
-
-    // Empty function calls are supported
-    if (pythonCode === "mo.md()") {
-      return true;
-    }
-
-    // Parse the code using Lezer and check for the exact match of mo.md() signature
-    const tree = pythonLanguage.parser.parse(pythonCode);
-
-    // This is the exact match of mo.md() signature
-    const enterOrder: { match: string | RegExp; stop?: boolean }[] = [
-      { match: "Script" },
-      { match: "ExpressionStatement" },
-      { match: "CallExpression" },
-      { match: "MemberExpression" },
-      { match: "VariableName" },
-      { match: "." },
-      { match: "PropertyName" },
-      { match: "ArgList" },
-      { match: "(" },
-      { match: /String|FormatString/, stop: true },
-      { match: ")" },
-    ];
-
-    let isValid = true;
-
-    // Parse the code using Lezer to check for multiple function calls and string content
-    tree.iterate({
-      enter: (node) => {
-        const current = enterOrder.shift();
-        if (current === undefined) {
-          // If our list is empty, but we are still going
-          // then this is not a valid call
-          isValid = false;
-          return false;
-        }
-
-        const match = current.match;
-
-        if (typeof match === "string") {
-          isValid = isValid && match === node.name;
-          return isValid && !current.stop;
-        }
-
-        if (!match.test(node.name)) {
-          isValid = false;
-          return isValid && !current.stop;
-        }
-
-        return isValid && !current.stop;
-      },
-    });
-
-    return isValid;
+    return this.parser.isSupported(pythonCode);
   }
 
   getExtension(

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

@@ -17,6 +17,7 @@ import {
   LanguageServerClient,
   languageServerWithClient,
 } from "@marimo-team/codemirror-languageserver";
+import { PythonParser } from "@marimo-team/smart-cells";
 import type { CellId } from "@/core/cells/ids";
 import { hasCapability } from "@/core/config/capabilities";
 import type {
@@ -128,7 +129,6 @@ const pylspClient = once((lspConfig: LSPConfig) => {
   return new NotebookLanguageServerClient(
     new LanguageServerClient({
       ...lspClientOpts,
-      autoClose: false,
     }),
     settings,
   );
@@ -146,7 +146,6 @@ const tyLspClient = once((_: LSPConfig) => {
   return new NotebookLanguageServerClient(
     new LanguageServerClient({
       ...lspClientOpts,
-      autoClose: false,
       getWorkspaceConfiguration: (_) => [{ disableLanguageServices: true }],
     }),
     {},
@@ -165,7 +164,6 @@ const pyrightClient = once((_: LSPConfig) => {
   return new NotebookLanguageServerClient(
     new LanguageServerClient({
       ...lspClientOpts,
-      autoClose: false,
     }),
     {},
   );
@@ -175,20 +173,24 @@ const pyrightClient = once((_: LSPConfig) => {
  * Language adapter for Python.
  */
 export class PythonLanguageAdapter implements LanguageAdapter<{}> {
+  private parser = new PythonParser();
+
   readonly type = "python";
-  readonly defaultCode = "";
-  readonly defaultMetadata = {};
+  readonly defaultCode = this.parser.defaultCode;
+  readonly defaultMetadata = this.parser.defaultMetadata;
 
   transformIn(code: string): [string, number, {}] {
-    return [code, 0, {}];
+    const result = this.parser.transformIn(code);
+    return [result.code, result.offset, result.metadata];
   }
 
-  transformOut(code: string, _metadata: {}): [string, number] {
-    return [code, 0];
+  transformOut(code: string, metadata: {}): [string, number] {
+    const result = this.parser.transformOut(code, metadata);
+    return [result.code, result.offset];
   }
 
-  isSupported(_code: string): boolean {
-    return true;
+  isSupported(code: string): boolean {
+    return this.parser.isSupported(code);
   }
 
   getExtension(
@@ -242,6 +244,7 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {
             client: client as unknown as LanguageServerClient,
             languageId: "python",
             allowHTMLContent: true,
+            useSnippetOnCompletion: false,
             hoverConfig: hoverOptions,
             completionConfig: autocompleteOptions,
             // Default to false

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

@@ -3,12 +3,17 @@
 import { useAtom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { store } from "@/core/state/jotai";
+import { jotaiJsonStorage } from "@/utils/storage/jotai";
 
 const BASE_KEY = "marimo:notebook-sql-mode";
 
 export type SQLMode = "validate" | "default";
 
-const sqlModeAtom = atomWithStorage<SQLMode>(BASE_KEY, "default");
+const sqlModeAtom = atomWithStorage<SQLMode>(
+  BASE_KEY,
+  "default",
+  jotaiJsonStorage,
+);
 
 export function useSQLMode() {
   const [sqlMode, setSQLMode] = useAtom(sqlModeAtom);