Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

prevent new language adapter instances being created on keypress (#6459)

Shahmir Varqha27b829a35d98
diff --git a/frontend/src/components/editor/cell/CreateCellButton.tsx b/frontend/src/components/editor/cell/CreateCellButton.tsx
index e3100e0644..f133e3a79a 100644
--- a/frontend/src/components/editor/cell/CreateCellButton.tsx
+++ b/frontend/src/components/editor/cell/CreateCellButton.tsx
@@ -9,8 +9,7 @@ import {
} from "@/components/ui/context-menu";
import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
import { useCellActions } from "@/core/cells/cells";
-import { MarkdownLanguageAdapter } from "@/core/codemirror/language/languages/markdown";
-import { SQLLanguageAdapter } from "@/core/codemirror/language/languages/sql/sql";
+import { LanguageAdapters } from "@/core/codemirror/language/LanguageAdapters";
import {
getConnectionTooltip,
isAppInteractionDisabled,
@@ -103,7 +102,7 @@ const CreateCellButtonContextMenu = (props: {
evt.stopPropagation();
maybeAddMarimoImport({ autoInstantiate: true, createNewCell });
onClick({
- code: new MarkdownLanguageAdapter().defaultCode,
+ code: LanguageAdapters.markdown.defaultCode,
hideCode: true,
});
}}
@@ -118,7 +117,7 @@ const CreateCellButtonContextMenu = (props: {
onSelect={(evt) => {
evt.stopPropagation();
maybeAddMarimoImport({ autoInstantiate: true, createNewCell });
- onClick({ code: new SQLLanguageAdapter().defaultCode });
+ onClick({ code: LanguageAdapters.sql.defaultCode });
}}
>
<div className="mr-3 text-muted-foreground">
diff --git a/frontend/src/components/editor/cell/code/language-toggle.tsx b/frontend/src/components/editor/cell/code/language-toggle.tsx
index 5c3c2b33ed..1e7875ceca 100644
--- a/frontend/src/components/editor/cell/code/language-toggle.tsx
+++ b/frontend/src/components/editor/cell/code/language-toggle.tsx
@@ -7,8 +7,7 @@ import { useMemo } from "react";
import { Button } from "@/components/ui/button";
import { Tooltip } from "@/components/ui/tooltip";
import { switchLanguage } from "@/core/codemirror/language/extension";
-import { MarkdownLanguageAdapter } from "@/core/codemirror/language/languages/markdown";
-import { SQLLanguageAdapter } from "@/core/codemirror/language/languages/sql/sql";
+import { LanguageAdapters } from "@/core/codemirror/language/LanguageAdapters";
import type { LanguageAdapter } from "@/core/codemirror/language/types";
import { Functions } from "@/utils/functions";
import { MarkdownIcon, PythonIcon } from "./icons";
@@ -27,11 +26,11 @@ export const LanguageToggles: React.FC<LanguageTogglesProps> = ({
onAfterToggle,
}) => {
const canUseMarkdown = useMemo(
- () => new MarkdownLanguageAdapter().isSupported(code) || code.trim() === "",
+ () => LanguageAdapters.markdown.isSupported(code) || code.trim() === "",
[code],
);
const canUseSQL = useMemo(
- () => new SQLLanguageAdapter().isSupported(code) || code.trim() === "",
+ () => LanguageAdapters.sql.isSupported(code) || code.trim() === "",
[code],
);
diff --git a/frontend/src/components/editor/renderers/CellArray.tsx b/frontend/src/components/editor/renderers/CellArray.tsx
index 7d74623d3b..a957d2add3 100644
--- a/frontend/src/components/editor/renderers/CellArray.tsx
+++ b/frontend/src/components/editor/renderers/CellArray.tsx
@@ -20,8 +20,7 @@ import { SortableCellsProvider } from "@/components/sort/SortableCellsProvider";
import { Button } from "@/components/ui/button";
import { Tooltip } from "@/components/ui/tooltip";
import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
-import { MarkdownLanguageAdapter } from "@/core/codemirror/language/languages/markdown";
-import { SQLLanguageAdapter } from "@/core/codemirror/language/languages/sql/sql";
+import { LanguageAdapters } from "@/core/codemirror/language/LanguageAdapters";
import { aiEnabledAtom } from "@/core/config/config";
import { isConnectedAtom } from "@/core/network/connection";
import { useBoolean } from "@/hooks/useBoolean";
@@ -288,7 +287,7 @@ const AddCellButtons: React.FC<{
createNewCell({
cellId: { type: "__end__", columnId },
before: false,
- code: new MarkdownLanguageAdapter().defaultCode,
+ code: LanguageAdapters.markdown.defaultCode,
hideCode: true,
});
}}
@@ -307,7 +306,7 @@ const AddCellButtons: React.FC<{
createNewCell({
cellId: { type: "__end__", columnId },
before: false,
- code: new SQLLanguageAdapter().defaultCode,
+ code: LanguageAdapters.sql.defaultCode,
});
}}
>
diff --git a/frontend/src/core/codemirror/language/LanguageAdapters.ts b/frontend/src/core/codemirror/language/LanguageAdapters.ts
index 1f1f19d2c4..e75258ee85 100644
--- a/frontend/src/core/codemirror/language/LanguageAdapters.ts
+++ b/frontend/src/core/codemirror/language/LanguageAdapters.ts
@@ -1,20 +1,26 @@
/* Copyright 2024 Marimo. All rights reserved. */
+import { once } from "@/utils/once";
import { MarkdownLanguageAdapter } from "./languages/markdown";
import { PythonLanguageAdapter } from "./languages/python";
import { SQLLanguageAdapter } from "./languages/sql/sql";
import type { LanguageAdapter, LanguageAdapterType } from "./types";
+// Create cached instances
+const createPythonAdapter = once(() => new PythonLanguageAdapter());
+const createMarkdownAdapter = once(() => new MarkdownLanguageAdapter());
+const createSqlAdapter = once(() => new SQLLanguageAdapter());
+
export const LanguageAdapters: Record<LanguageAdapterType, LanguageAdapter> = {
// Getters to prevent circular dependencies
get python() {
- return new PythonLanguageAdapter();
+ return createPythonAdapter();
},
get markdown() {
- return new MarkdownLanguageAdapter();
+ return createMarkdownAdapter();
},
get sql() {
- return new SQLLanguageAdapter();
+ return createSqlAdapter();
},
};