@marimo-team/frontend 0.25.2-dev106 → 0.25.2-dev109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{CellStatus-y7gb1pfn.js → CellStatus-B4z-D5H1.js} +1 -1
- package/dist/assets/{ErrorBoundary-BaJR01Nz.js → ErrorBoundary-R-fjO4Cz.js} +2 -2
- package/dist/assets/{JsonOutput-vAkP2zUe.js → JsonOutput-BeLVZDXh.js} +1 -1
- package/dist/assets/{MarimoErrorOutput-3mDkRE60.js → MarimoErrorOutput-B2Ajs_V-.js} +1 -1
- package/dist/assets/{RenderHTML-By5MgTmt.js → RenderHTML-Chx9oQ4S.js} +1 -1
- package/dist/assets/{RunButton-B7SvGNMi.js → RunButton-DnSopQoo.js} +1 -1
- package/dist/assets/{add-cell-with-ai-D7aEUdUW.js → add-cell-with-ai-9oZmQ0tX.js} +1 -1
- package/dist/assets/{add-connection-dialog-C05Sy6Em.js → add-connection-dialog-C82vMzr5.js} +1 -1
- package/dist/assets/{agent-panel-DestmNKB.js → agent-panel-8bu-4RMv.js} +1 -1
- package/dist/assets/{ai-model-dropdown-CB0zKJVn.js → ai-model-dropdown-BKQARUae.js} +1 -1
- package/dist/assets/{app-config-button-h0kocVn3.js → app-config-button-DKoDBgwu.js} +1 -1
- package/dist/assets/{blob-Cvmfh5O4.js → blob-BJi30p8H.js} +1 -1
- package/dist/assets/{cell-editor-9QWD4Eoi.js → cell-editor-CKwmt_18.js} +1 -1
- package/dist/assets/{cell-link-DbRcdG3a.js → cell-link-BI2FitQ_.js} +1 -1
- package/dist/assets/{cells-B6il7NvU.js → cells-D73Y_xmw.js} +52 -52
- package/dist/assets/{chat-display-BytbDkjp.js → chat-display-CqK2mMHm.js} +1 -1
- package/dist/assets/{chat-panel-Dn0i8IDu.js → chat-panel-BgJcxa4q.js} +1 -1
- package/dist/assets/{chat-ui-C2vsp5te.js → chat-ui-CK-mgi6S.js} +1 -1
- package/dist/assets/{column-preview-BHkXVDRB.js → column-preview-biRDE_Oz.js} +1 -1
- package/dist/assets/{command-palette-CRbI5lmZ.js → command-palette-CHUS5_VG.js} +1 -1
- package/dist/assets/{common-BBoeGRjW.js → common-8ezkeamF.js} +1 -1
- package/dist/assets/{components-BJxtRyNP.js → components-FsfAPhUd.js} +1 -1
- package/dist/assets/{datasource-DY_Q9gCe.js → datasource-Dniq1d2k.js} +1 -1
- package/dist/assets/{dependency-graph-panel-e1M0eCTG.js → dependency-graph-panel-Ci62Tv1x.js} +1 -1
- package/dist/assets/{documentation-panel-KPshYHWI.js → documentation-panel-B-0JfpSn.js} +1 -1
- package/dist/assets/{download-DKJ7bLP9.js → download-CEG5vQri.js} +1 -1
- package/dist/assets/{edit-page-BLjefdmz.js → edit-page-VV7jun46.js} +4 -4
- package/dist/assets/{error-entries-BonnEKm-.js → error-entries-Frq0QZL-.js} +1 -1
- package/dist/assets/{error-panel-SKl73j_w.js → error-panel-BeSB6k3e.js} +1 -1
- package/dist/assets/feedback-button-CrqeO2wx.js +1 -0
- package/dist/assets/{feedback-button-C_PtEG12.js → feedback-button-DALE40Cq.js} +1 -1
- package/dist/assets/{file-explorer-panel-BTmHy6bB.js → file-explorer-panel-DkhJMce7.js} +1 -1
- package/dist/assets/{file-name-input-L5-MM5IK.js → file-name-input-DsLb3kUE.js} +1 -1
- package/dist/assets/{floating-outline-Cj_Zfo0m.js → floating-outline-Bivo15Ee.js} +1 -1
- package/dist/assets/{gallery-page-1CBmiJsq.js → gallery-page-BipSEe8i.js} +1 -1
- package/dist/assets/{glide-data-editor-CfN8_71N.js → glide-data-editor-DWxXZHhh.js} +1 -1
- package/dist/assets/{home-page-my0-GXpR.js → home-page-4xyvW9LC.js} +1 -1
- package/dist/assets/{hooks-CpM5Nux7.js → hooks-B7y2bbmR.js} +1 -1
- package/dist/assets/{index-BBfc1T4f.js → index-DLi7reLY.js} +3 -3
- package/dist/assets/{layout-D7t0uMv2.js → layout-B5DZz9ah.js} +3 -3
- package/dist/assets/{logs-panel-BQ7r0B3O.js → logs-panel-CswvaDqE.js} +1 -1
- package/dist/assets/{markdown-renderer-BGhL7GlA.js → markdown-renderer-CErbddaa.js} +1 -1
- package/dist/assets/{name-cell-input-gZHMbMFa.js → name-cell-input-DXf9tZ25.js} +1 -1
- package/dist/assets/{outline-panel-CSc24F_g.js → outline-panel-BPlLwpVm.js} +1 -1
- package/dist/assets/{packages-panel-1lOO--8d.js → packages-panel-CoIvCGdp.js} +1 -1
- package/dist/assets/{panel-accordion-state-DR9dzoVf.js → panel-accordion-state-B50Y_3hb.js} +1 -1
- package/dist/assets/{panels-B-362w2o.js → panels-j8cWK9B8.js} +1 -1
- package/dist/assets/{process-output-GdDkGBd4.js → process-output-Bfoxbqpj.js} +1 -1
- package/dist/assets/{readonly-code-display-DvCqBdEx.js → readonly-code-display-BusLGSPF.js} +1 -1
- package/dist/assets/{readonly-python-code-D61HNA9A.js → readonly-python-code-CTbOf95g.js} +1 -1
- package/dist/assets/{reveal-component-DOrRaoYo.js → reveal-component-D3wlU8v1.js} +1 -1
- package/dist/assets/{run-page-BdD-nBNW.js → run-page-B03JZs0U.js} +1 -1
- package/dist/assets/{runtime-details-state-DOSWTLDN.js → runtime-details-state-Ddpsoriz.js} +1 -1
- package/dist/assets/{scratchpad-panel-P0IUu7X-.js → scratchpad-panel-B9RdvhAM.js} +1 -1
- package/dist/assets/{session-panel-BfsjtxYG.js → session-panel-D3E0Ag30.js} +1 -1
- package/dist/assets/{snippets-panel-Bj5bokY-.js → snippets-panel-Bby1zIJE.js} +1 -1
- package/dist/assets/{state-CZOWsp3e.js → state-ENE4B_JH.js} +1 -1
- package/dist/assets/{state-CKlS-nyB.js → state-zdyODrb0.js} +1 -1
- package/dist/assets/{tracing-DpWBRQfq.js → tracing-De9k9D6u.js} +1 -1
- package/dist/assets/{tracing-panel-N0dAe1M7.js → tracing-panel-DvISFiEI.js} +2 -2
- package/dist/assets/{tree-actions-6YzAxpKB.js → tree-actions-D5HC2yfb.js} +1 -1
- package/dist/assets/{useAddCell-DwSNezIU.js → useAddCell-DAJ9Wd-E.js} +1 -1
- package/dist/assets/{useCellActionButton-9U0UBP8q.js → useCellActionButton-CWhycKft.js} +1 -1
- package/dist/assets/{useDeleteCell-Dyusf6t2.js → useDeleteCell-8ByYNceO.js} +1 -1
- package/dist/assets/{useDependencyPanelTab-DNn4Dq9X.js → useDependencyPanelTab-Dz37hZtr.js} +1 -1
- package/dist/assets/{useNotebookActions-DxslFCyH.js → useNotebookActions-CYbHF8MU.js} +1 -1
- package/dist/assets/{useRunCells-BpLdDZbV.js → useRunCells-BVoQp_ne.js} +1 -1
- package/dist/assets/{useSplitCell-FDzqmtiG.js → useSplitCell-Ba_Zm0ID.js} +1 -1
- package/dist/index.html +19 -19
- package/package.json +1 -1
- package/src/core/cells/__tests__/document-roundtrip.test.ts +16 -0
- package/src/core/codemirror/language/embedded/__tests__/embedded-python.test.ts +138 -26
- package/src/core/codemirror/language/embedded/embedded-python.ts +47 -13
- package/src/core/codemirror/language/embedded/latex.ts +20 -13
- package/dist/assets/feedback-button-BCK8Ksty.js +0 -1
package/dist/index.html
CHANGED
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
|
|
67
67
|
<!-- /TODO -->
|
|
68
68
|
<title>{{ title }}</title>
|
|
69
|
-
<script type="module" crossorigin src="./assets/index-
|
|
69
|
+
<script type="module" crossorigin src="./assets/index-DLi7reLY.js"></script>
|
|
70
70
|
<link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-B0Z9INg1.js">
|
|
71
71
|
<link rel="modulepreload" crossorigin href="./assets/react-DVplv7_D.js">
|
|
72
72
|
<link rel="modulepreload" crossorigin href="./assets/compiler-runtime-BrajqUja.js">
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
<link rel="modulepreload" crossorigin href="./assets/useTheme-COhSHkCj.js">
|
|
140
140
|
<link rel="modulepreload" crossorigin href="./assets/useAsyncData-C7aJJz0Y.js">
|
|
141
141
|
<link rel="modulepreload" crossorigin href="./assets/purify.es--06brOip.js">
|
|
142
|
-
<link rel="modulepreload" crossorigin href="./assets/cells-
|
|
142
|
+
<link rel="modulepreload" crossorigin href="./assets/cells-D73Y_xmw.js">
|
|
143
143
|
<link rel="modulepreload" crossorigin href="./assets/coerce-CpE6kUdX.js">
|
|
144
144
|
<link rel="modulepreload" crossorigin href="./assets/get-DjNf4SIX.js">
|
|
145
145
|
<link rel="modulepreload" crossorigin href="./assets/_hasPath-BmRQipI0.js">
|
|
@@ -152,43 +152,43 @@
|
|
|
152
152
|
<link rel="modulepreload" crossorigin href="./assets/copy-D8O_CYCG.js">
|
|
153
153
|
<link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-D9Dr-k4J.js">
|
|
154
154
|
<link rel="modulepreload" crossorigin href="./assets/chunk-YOKDWASO-BIpRENEC.js">
|
|
155
|
-
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-
|
|
155
|
+
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-CErbddaa.js">
|
|
156
156
|
<link rel="modulepreload" crossorigin href="./assets/copy-Djr5m5ac.js">
|
|
157
157
|
<link rel="modulepreload" crossorigin href="./assets/copy-icon-BIiRXh_3.js">
|
|
158
|
-
<link rel="modulepreload" crossorigin href="./assets/useRunCells-
|
|
159
|
-
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-
|
|
160
|
-
<link rel="modulepreload" crossorigin href="./assets/blob-
|
|
158
|
+
<link rel="modulepreload" crossorigin href="./assets/useRunCells-BVoQp_ne.js">
|
|
159
|
+
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-Chx9oQ4S.js">
|
|
160
|
+
<link rel="modulepreload" crossorigin href="./assets/blob-BJi30p8H.js">
|
|
161
161
|
<link rel="modulepreload" crossorigin href="./assets/kbd-pdKBv96t.js">
|
|
162
162
|
<link rel="modulepreload" crossorigin href="./assets/useInstallPackage-iX1eufdl.js">
|
|
163
163
|
<link rel="modulepreload" crossorigin href="./assets/errors-DCrsa1nH.js">
|
|
164
164
|
<link rel="modulepreload" crossorigin href="./assets/api-BJPYk7E_.js">
|
|
165
165
|
<link rel="modulepreload" crossorigin href="./assets/share-BZW3tzEX.js">
|
|
166
166
|
<link rel="modulepreload" crossorigin href="./assets/events-CbeVJ6OD.js">
|
|
167
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
167
|
+
<link rel="modulepreload" crossorigin href="./assets/state-zdyODrb0.js">
|
|
168
168
|
<link rel="modulepreload" crossorigin href="./assets/pair-CaQyK6En.js">
|
|
169
|
-
<link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-
|
|
169
|
+
<link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-R-fjO4Cz.js">
|
|
170
170
|
<link rel="modulepreload" crossorigin href="./assets/config-BOKzA3tF.js">
|
|
171
171
|
<link rel="modulepreload" crossorigin href="./assets/chevron-right-eAtVhbNZ.js">
|
|
172
172
|
<link rel="modulepreload" crossorigin href="./assets/dropdown-menu-C1rnl-0o.js">
|
|
173
173
|
<link rel="modulepreload" crossorigin href="./assets/html-to-image-DK9Zl1lU.js">
|
|
174
|
-
<link rel="modulepreload" crossorigin href="./assets/download-
|
|
174
|
+
<link rel="modulepreload" crossorigin href="./assets/download-CEG5vQri.js">
|
|
175
175
|
<link rel="modulepreload" crossorigin href="./assets/switch-CTaiAjrz.js">
|
|
176
176
|
<link rel="modulepreload" crossorigin href="./assets/tabs-BuQlZFbt.js">
|
|
177
177
|
<link rel="modulepreload" crossorigin href="./assets/table-DG7Ap4H4.js">
|
|
178
178
|
<link rel="modulepreload" crossorigin href="./assets/eye-off-CxVozGAC.js">
|
|
179
179
|
<link rel="modulepreload" crossorigin href="./assets/refresh-cw-Qw1f8Jhy.js">
|
|
180
|
-
<link rel="modulepreload" crossorigin href="./assets/tree-actions-
|
|
180
|
+
<link rel="modulepreload" crossorigin href="./assets/tree-actions-D5HC2yfb.js">
|
|
181
181
|
<link rel="modulepreload" crossorigin href="./assets/ellipsis-63DyBLHQ.js">
|
|
182
182
|
<link rel="modulepreload" crossorigin href="./assets/external-link-UrX9KO36.js">
|
|
183
183
|
<link rel="modulepreload" crossorigin href="./assets/spinner-DyNE-o8o.js">
|
|
184
184
|
<link rel="modulepreload" crossorigin href="./assets/message-circle-C3rKm8_a.js">
|
|
185
185
|
<link rel="modulepreload" crossorigin href="./assets/hat-glasses-C8RhSVii.js">
|
|
186
186
|
<link rel="modulepreload" crossorigin href="./assets/package-GSoSTiIK.js">
|
|
187
|
-
<link rel="modulepreload" crossorigin href="./assets/datasource-
|
|
187
|
+
<link rel="modulepreload" crossorigin href="./assets/datasource-Dniq1d2k.js">
|
|
188
188
|
<link rel="modulepreload" crossorigin href="./assets/alert-DTaqCu_d.js">
|
|
189
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
190
|
-
<link rel="modulepreload" crossorigin href="./assets/cell-link-
|
|
191
|
-
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-
|
|
189
|
+
<link rel="modulepreload" crossorigin href="./assets/state-ENE4B_JH.js">
|
|
190
|
+
<link rel="modulepreload" crossorigin href="./assets/cell-link-BI2FitQ_.js">
|
|
191
|
+
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-B2Ajs_V-.js">
|
|
192
192
|
<link rel="modulepreload" crossorigin href="./assets/useDateFormatter-DA-62E-Y.js">
|
|
193
193
|
<link rel="modulepreload" crossorigin href="./assets/en-US-BxZyFbza.js">
|
|
194
194
|
<link rel="modulepreload" crossorigin href="./assets/isValid-BFmJHgM5.js">
|
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
<link rel="modulepreload" crossorigin href="./assets/formats-yZ06h1Pl.js">
|
|
208
208
|
<link rel="modulepreload" crossorigin href="./assets/table-vrvqpuKJ.js">
|
|
209
209
|
<link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-Dbe0MrFr.js">
|
|
210
|
-
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-
|
|
210
|
+
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-BeLVZDXh.js">
|
|
211
211
|
<link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-C4_v6fQW.js">
|
|
212
212
|
<link rel="modulepreload" crossorigin href="./assets/square-function-_W_Lo0P4.js">
|
|
213
213
|
<link rel="modulepreload" crossorigin href="./assets/spec-BfSBcO5B.js">
|
|
@@ -221,11 +221,11 @@
|
|
|
221
221
|
<link rel="modulepreload" crossorigin href="./assets/file-icons-CdJgUy-I.js">
|
|
222
222
|
<link rel="modulepreload" crossorigin href="./assets/globe-UdPdIbF7.js">
|
|
223
223
|
<link rel="modulepreload" crossorigin href="./assets/esm-CI_o7NhW.js">
|
|
224
|
-
<link rel="modulepreload" crossorigin href="./assets/useAddCell-
|
|
225
|
-
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-
|
|
224
|
+
<link rel="modulepreload" crossorigin href="./assets/useAddCell-DAJ9Wd-E.js">
|
|
225
|
+
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CTbOf95g.js">
|
|
226
226
|
<link rel="modulepreload" crossorigin href="./assets/data-grid-types-DgHVN_Zz.js">
|
|
227
227
|
<link rel="modulepreload" crossorigin href="./assets/glide-utils-CIrAxdjv.js">
|
|
228
|
-
<link rel="modulepreload" crossorigin href="./assets/column-preview-
|
|
228
|
+
<link rel="modulepreload" crossorigin href="./assets/column-preview-biRDE_Oz.js">
|
|
229
229
|
<link rel="modulepreload" crossorigin href="./assets/square-BPmgQFnh.js">
|
|
230
230
|
<link rel="modulepreload" crossorigin href="./assets/triangle-alert-DmIqR8sY.js">
|
|
231
231
|
<link rel="modulepreload" crossorigin href="./assets/prop-types-Djf4O40e.js">
|
|
@@ -237,7 +237,7 @@
|
|
|
237
237
|
<link rel="modulepreload" crossorigin href="./assets/icons-CiZ_8zS-.js">
|
|
238
238
|
<link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-DFIVN9dn.js">
|
|
239
239
|
<link rel="modulepreload" crossorigin href="./assets/pathUtils-DPmlLd-r.js">
|
|
240
|
-
<link rel="modulepreload" crossorigin href="./assets/floating-outline-
|
|
240
|
+
<link rel="modulepreload" crossorigin href="./assets/floating-outline-Bivo15Ee.js">
|
|
241
241
|
<link rel="stylesheet" crossorigin href="./assets/cells-0PFKL3SH.css">
|
|
242
242
|
<link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DjIHoF9Z.css">
|
|
243
243
|
<link rel="stylesheet" crossorigin href="./assets/JsonOutput-B0GmlMnR.css">
|
package/package.json
CHANGED
|
@@ -178,6 +178,22 @@ function documentSnapshot(state: NotebookState) {
|
|
|
178
178
|
}
|
|
179
179
|
|
|
180
180
|
describe("document round-trip", () => {
|
|
181
|
+
it("applies a server transaction that deletes every cell", () => {
|
|
182
|
+
setup("a", "b");
|
|
183
|
+
applyTransactionChanges(
|
|
184
|
+
[
|
|
185
|
+
...replica.cellIds.inOrderIds.map((cellId) => ({
|
|
186
|
+
type: "delete-cell" as const,
|
|
187
|
+
cellId,
|
|
188
|
+
})),
|
|
189
|
+
{ type: "reorder-cells", cellIds: [] },
|
|
190
|
+
],
|
|
191
|
+
replicaActions,
|
|
192
|
+
() => replica.cellIds.inOrderIds,
|
|
193
|
+
);
|
|
194
|
+
expect(documentSnapshot(replica)).toEqual([]);
|
|
195
|
+
});
|
|
196
|
+
|
|
181
197
|
it("initial setup converges", () => {
|
|
182
198
|
setup("a", "b", "c");
|
|
183
199
|
expect(documentSnapshot(primary)).toEqual(documentSnapshot(replica));
|
|
@@ -2,13 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
import type { CompletionContext } from "@codemirror/autocomplete";
|
|
4
4
|
import { python } from "@codemirror/lang-python";
|
|
5
|
+
import { StreamLanguage } from "@codemirror/language";
|
|
6
|
+
import { stexMath } from "@codemirror/legacy-modes/mode/stex";
|
|
5
7
|
import { EditorState } from "@codemirror/state";
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
8
|
+
import { classHighlighter, highlightTree } from "@lezer/highlight";
|
|
9
|
+
import { parser as markdownParser } from "@lezer/markdown";
|
|
10
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
8
11
|
import { cellId, variableName } from "@/__tests__/branded";
|
|
9
12
|
import { store } from "@/core/state/jotai";
|
|
10
13
|
import { variablesAtom } from "@/core/variables/state";
|
|
11
14
|
import { parsePython, variableCompletionSource } from "../embedded-python";
|
|
15
|
+
import { parseLatex } from "../latex";
|
|
12
16
|
|
|
13
17
|
const IS_ACTIVE = () => true;
|
|
14
18
|
|
|
@@ -23,25 +27,133 @@ describe("parsePython", () => {
|
|
|
23
27
|
]);
|
|
24
28
|
});
|
|
25
29
|
|
|
26
|
-
|
|
30
|
+
const cases = [
|
|
31
|
+
"{math.exp(3)}",
|
|
32
|
+
'${math.exp(3) + len("$}")} $',
|
|
33
|
+
"${math.exp(3)} + {math.sin(3)}$",
|
|
34
|
+
"${math.exp(3)}$",
|
|
35
|
+
"$$ {math.exp(3)} $$",
|
|
36
|
+
String.raw`\({math.exp(3)}\)`,
|
|
37
|
+
String.raw`\[{math.exp(3)}\]`,
|
|
38
|
+
String.raw`\\({math.exp(3)}\\)`,
|
|
39
|
+
String.raw`\\[{math.exp(3)}\\]`,
|
|
40
|
+
String.raw`$\frac{{{math.exp(3)}}}{{2}}$`,
|
|
41
|
+
String.raw`$\{math.exp(3)}$`,
|
|
42
|
+
'${ {"}": math.exp(3)} }$',
|
|
43
|
+
"${math.exp(3):{width}.{precision}f}$",
|
|
44
|
+
];
|
|
45
|
+
|
|
46
|
+
function highlightedProperties(doc: string, prefix: string) {
|
|
47
|
+
const parser = markdownParser.configure([
|
|
48
|
+
parseLatex(StreamLanguage.define(stexMath).parser),
|
|
49
|
+
parsePython(python().language.parser, () => prefix.includes("f")),
|
|
50
|
+
]);
|
|
51
|
+
const properties: string[] = [];
|
|
52
|
+
highlightTree(parser.parse(doc), classHighlighter, (from, to, classes) => {
|
|
53
|
+
if (classes.split(" ").includes("tok-propertyName")) {
|
|
54
|
+
properties.push(doc.slice(from, to));
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
return properties;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
it.each(["f", "rf", "fr"])(
|
|
61
|
+
"highlights interpolation with %s strings",
|
|
62
|
+
(prefix) => {
|
|
63
|
+
for (const doc of cases) {
|
|
64
|
+
expect(highlightedProperties(doc, prefix)).toEqual(
|
|
65
|
+
doc.includes("math.sin") ? ["exp", "sin"] : ["exp"],
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
);
|
|
70
|
+
|
|
71
|
+
it.each(["", "r"])("does not interpolate %s strings", (prefix) => {
|
|
72
|
+
for (const doc of cases) {
|
|
73
|
+
expect(highlightedProperties(doc, prefix)).toEqual([]);
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it("parses replacement boundaries once for a paragraph with many interpolations", () => {
|
|
27
78
|
const pythonParser = python().language.parser;
|
|
28
|
-
const
|
|
79
|
+
const parse = vi.spyOn(pythonParser, "parse");
|
|
80
|
+
try {
|
|
81
|
+
const doc = "{math.exp(3)} ".repeat(1000);
|
|
82
|
+
const parser = markdownParser.configure([
|
|
83
|
+
parseLatex(StreamLanguage.define(stexMath).parser),
|
|
84
|
+
parsePython(pythonParser, IS_ACTIVE),
|
|
85
|
+
]);
|
|
86
|
+
const properties: string[] = [];
|
|
87
|
+
highlightTree(
|
|
88
|
+
parser.parse(doc),
|
|
89
|
+
classHighlighter,
|
|
90
|
+
(from, to, classes) => {
|
|
91
|
+
if (classes.split(" ").includes("tok-propertyName")) {
|
|
92
|
+
properties.push(doc.slice(from, to));
|
|
93
|
+
}
|
|
94
|
+
},
|
|
95
|
+
);
|
|
96
|
+
expect(properties).toEqual(Array.from({ length: 1000 }, () => "exp"));
|
|
97
|
+
expect(parse).toHaveBeenCalledTimes(1);
|
|
98
|
+
} finally {
|
|
99
|
+
parse.mockRestore();
|
|
100
|
+
}
|
|
101
|
+
});
|
|
29
102
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
103
|
+
it("preserves raw backslashes between replacements", () => {
|
|
104
|
+
expect(
|
|
105
|
+
highlightedProperties(String.raw`{math.exp(3)} \N{math.sin(3)}`, "rf"),
|
|
106
|
+
).toEqual(["exp", "sin"]);
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it("finds replacements after triple quotes in markdown text", () => {
|
|
110
|
+
expect(
|
|
111
|
+
highlightedProperties('{math.exp(3)} """ {math.sin(3)}', "f"),
|
|
112
|
+
).toEqual(["exp", "sin"]);
|
|
113
|
+
});
|
|
40
114
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
115
|
+
it("keeps replacement positions local to each paragraph", () => {
|
|
116
|
+
expect(
|
|
117
|
+
highlightedProperties("${math.exp(3)}$\n\n${math.sin(3)}$", "rf"),
|
|
118
|
+
).toEqual(["exp", "sin"]);
|
|
44
119
|
});
|
|
120
|
+
|
|
121
|
+
it("preserves LaTeX highlighting around Python replacements", () => {
|
|
122
|
+
const doc = String.raw`$\frac{{{math.exp(3)}}}{{2}} + \alpha$`;
|
|
123
|
+
const parser = markdownParser.configure([
|
|
124
|
+
parseLatex(StreamLanguage.define(stexMath).parser),
|
|
125
|
+
parsePython(python().language.parser, IS_ACTIVE),
|
|
126
|
+
]);
|
|
127
|
+
const highlighted: string[] = [];
|
|
128
|
+
highlightTree(parser.parse(doc), classHighlighter, (from, to) => {
|
|
129
|
+
highlighted.push(doc.slice(from, to));
|
|
130
|
+
});
|
|
131
|
+
expect(highlighted).toEqual(
|
|
132
|
+
expect.arrayContaining(["\\frac", "exp", "\\alpha"]),
|
|
133
|
+
);
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
it.each(["${math.exp(3)$", "${math.exp(3)", "${{math.exp(3)}$"])(
|
|
137
|
+
"does not treat incomplete or escaped braces as replacements: %s",
|
|
138
|
+
(doc) => {
|
|
139
|
+
expect(highlightedProperties(doc, "f")).toEqual([]);
|
|
140
|
+
},
|
|
141
|
+
);
|
|
142
|
+
|
|
143
|
+
it.each(["f", "rf", "fr"])(
|
|
144
|
+
"keeps doubled braces literal in %s strings",
|
|
145
|
+
(prefix) => {
|
|
146
|
+
for (const doc of [
|
|
147
|
+
"{{math.exp(3)}}",
|
|
148
|
+
"${{math.exp(3)}}$",
|
|
149
|
+
"$ {{{{math.exp(3)}}}} $",
|
|
150
|
+
String.raw`$\{{math.exp(3)}}$`,
|
|
151
|
+
String.raw`$\frac{{1}}{{2}}$`,
|
|
152
|
+
]) {
|
|
153
|
+
expect(highlightedProperties(doc, prefix)).toEqual([]);
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
);
|
|
45
157
|
});
|
|
46
158
|
|
|
47
159
|
describe("variableCompletionSource", () => {
|
|
@@ -72,10 +184,10 @@ describe("variableCompletionSource", () => {
|
|
|
72
184
|
const context: Partial<CompletionContext> = {
|
|
73
185
|
pos: 8,
|
|
74
186
|
explicit: false,
|
|
75
|
-
matchBefore: (
|
|
187
|
+
matchBefore: (_expr: RegExp) => ({ from: 7, to: 8, text: "v" }),
|
|
76
188
|
state,
|
|
77
189
|
aborted: false,
|
|
78
|
-
tokenBefore: (
|
|
190
|
+
tokenBefore: (_types: readonly string[]) => null,
|
|
79
191
|
};
|
|
80
192
|
|
|
81
193
|
const result = variableCompletionSource(context as CompletionContext);
|
|
@@ -92,10 +204,10 @@ describe("variableCompletionSource", () => {
|
|
|
92
204
|
const context: Partial<CompletionContext> = {
|
|
93
205
|
pos: 7,
|
|
94
206
|
explicit: false,
|
|
95
|
-
matchBefore: (
|
|
207
|
+
matchBefore: (_expr: RegExp) => ({ from: 6, to: 7, text: "v" }),
|
|
96
208
|
state,
|
|
97
209
|
aborted: false,
|
|
98
|
-
tokenBefore: (
|
|
210
|
+
tokenBefore: (_types: readonly string[]) => null,
|
|
99
211
|
};
|
|
100
212
|
|
|
101
213
|
const result = variableCompletionSource(context as CompletionContext);
|
|
@@ -110,10 +222,10 @@ describe("variableCompletionSource", () => {
|
|
|
110
222
|
const context: Partial<CompletionContext> = {
|
|
111
223
|
pos: 13,
|
|
112
224
|
explicit: false,
|
|
113
|
-
matchBefore: (
|
|
225
|
+
matchBefore: (_expr: RegExp) => ({ from: 12, to: 13, text: "v" }),
|
|
114
226
|
state,
|
|
115
227
|
aborted: false,
|
|
116
|
-
tokenBefore: (
|
|
228
|
+
tokenBefore: (_types: readonly string[]) => null,
|
|
117
229
|
};
|
|
118
230
|
|
|
119
231
|
const result = variableCompletionSource(context as CompletionContext);
|
|
@@ -131,7 +243,7 @@ describe("variableCompletionSource", () => {
|
|
|
131
243
|
matchBefore: () => null,
|
|
132
244
|
state,
|
|
133
245
|
aborted: false,
|
|
134
|
-
tokenBefore: (
|
|
246
|
+
tokenBefore: (_types: readonly string[]) => null,
|
|
135
247
|
};
|
|
136
248
|
|
|
137
249
|
const result = variableCompletionSource(context as CompletionContext);
|
|
@@ -146,10 +258,10 @@ describe("variableCompletionSource", () => {
|
|
|
146
258
|
const context: Partial<CompletionContext> = {
|
|
147
259
|
pos: 9,
|
|
148
260
|
explicit: false,
|
|
149
|
-
matchBefore: (
|
|
261
|
+
matchBefore: (_expr: RegExp) => ({ from: 8, to: 9, text: "v" }),
|
|
150
262
|
state,
|
|
151
263
|
aborted: false,
|
|
152
|
-
tokenBefore: (
|
|
264
|
+
tokenBefore: (_types: readonly string[]) => null,
|
|
153
265
|
};
|
|
154
266
|
|
|
155
267
|
const result = variableCompletionSource(context as CompletionContext);
|
|
@@ -16,11 +16,8 @@ import { getVariableCompletions } from "../../completion/variable-completions";
|
|
|
16
16
|
const PYTHON = "Python";
|
|
17
17
|
|
|
18
18
|
const OPEN_BRACE = 123; // {
|
|
19
|
-
const CLOSE_BRACE = 125; // }
|
|
20
19
|
const DELIMITER_LENGTH = 1;
|
|
21
20
|
|
|
22
|
-
const MARK = { mark: `${PYTHON}Mark`, resolve: PYTHON };
|
|
23
|
-
|
|
24
21
|
/**
|
|
25
22
|
* Define a Python code block parser for Markdown.
|
|
26
23
|
*
|
|
@@ -31,6 +28,11 @@ export function parsePython(
|
|
|
31
28
|
pythonParser: Parser,
|
|
32
29
|
isActivated: () => boolean,
|
|
33
30
|
): MarkdownConfig {
|
|
31
|
+
const replacements = new WeakMap<
|
|
32
|
+
InlineContext,
|
|
33
|
+
{ ends: Map<number, number>; parsedTo: number }
|
|
34
|
+
>();
|
|
35
|
+
|
|
34
36
|
const defineNodes = [
|
|
35
37
|
{ name: PYTHON, style: tags.emphasis },
|
|
36
38
|
{ name: `${PYTHON}Mark`, style: tags.processingInstruction },
|
|
@@ -41,26 +43,58 @@ export function parsePython(
|
|
|
41
43
|
parseInline: [
|
|
42
44
|
{
|
|
43
45
|
name: PYTHON,
|
|
46
|
+
before: "Escape",
|
|
44
47
|
parse(cx: InlineContext, next: number, pos: number): number {
|
|
45
48
|
if (!isActivated()) {
|
|
46
49
|
return -1;
|
|
47
50
|
}
|
|
48
51
|
|
|
49
|
-
|
|
52
|
+
// A backslash does not escape a brace in Python f-strings.
|
|
53
|
+
if (next === 92 && cx.char(pos + 1) === OPEN_BRACE) {
|
|
54
|
+
return pos + 1;
|
|
55
|
+
}
|
|
56
|
+
if (next !== OPEN_BRACE) {
|
|
50
57
|
return -1;
|
|
51
58
|
}
|
|
59
|
+
if (cx.char(pos + 1) === OPEN_BRACE) {
|
|
60
|
+
return pos + 2;
|
|
61
|
+
}
|
|
52
62
|
|
|
53
|
-
|
|
54
|
-
if (
|
|
63
|
+
let cached = replacements.get(cx);
|
|
64
|
+
if (!cached || pos >= cached.parsedTo) {
|
|
65
|
+
// Cache all replacements so each brace does not reparse the paragraph.
|
|
66
|
+
// Keep Markdown backslashes from consuming braces as Python escapes.
|
|
67
|
+
const prefix = 'rf"""';
|
|
68
|
+
const tree = pythonParser.parse(
|
|
69
|
+
`${prefix}${cx.slice(pos, cx.end)}\n"""`,
|
|
70
|
+
);
|
|
71
|
+
const formatString = tree.topNode
|
|
72
|
+
.getChild("ExpressionStatement")
|
|
73
|
+
?.getChild("FormatString");
|
|
74
|
+
const offset = pos - prefix.length;
|
|
75
|
+
const ends = new Map<number, number>();
|
|
76
|
+
for (const replacement of formatString?.getChildren(
|
|
77
|
+
"FormatReplacement",
|
|
78
|
+
) ?? []) {
|
|
79
|
+
if (replacement.lastChild?.name === "}") {
|
|
80
|
+
ends.set(offset + replacement.from, offset + replacement.to);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
cached = {
|
|
84
|
+
ends,
|
|
85
|
+
parsedTo: formatString ? offset + formatString.to : cx.end,
|
|
86
|
+
};
|
|
87
|
+
replacements.set(cx, cached);
|
|
88
|
+
}
|
|
89
|
+
const end = cached.ends.get(pos);
|
|
90
|
+
if (end === undefined) {
|
|
55
91
|
return -1;
|
|
56
92
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
next === OPEN_BRACE,
|
|
63
|
-
next === CLOSE_BRACE,
|
|
93
|
+
return cx.addElement(
|
|
94
|
+
cx.elt(PYTHON, pos, end, [
|
|
95
|
+
cx.elt(`${PYTHON}Mark`, pos, pos + 1),
|
|
96
|
+
cx.elt(`${PYTHON}Mark`, end - 1, end),
|
|
97
|
+
]),
|
|
64
98
|
);
|
|
65
99
|
},
|
|
66
100
|
},
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
30
30
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
31
31
|
|
|
32
|
-
import { type Parser, parseMixed } from "@lezer/common";
|
|
32
|
+
import { IterMode, type Parser, parseMixed } from "@lezer/common";
|
|
33
33
|
import { tags } from "@lezer/highlight";
|
|
34
34
|
import type {
|
|
35
35
|
DelimiterType,
|
|
@@ -231,24 +231,31 @@ export function parseLatex(latexParser: Parser): MarkdownConfig {
|
|
|
231
231
|
// Test if the node type is one of the math expression
|
|
232
232
|
const delimiterLength = DELIMITER_LENGTH[node.type.name];
|
|
233
233
|
if (delimiterLength) {
|
|
234
|
-
const from = node.from + delimiterLength;
|
|
235
|
-
const to = node.to - delimiterLength;
|
|
234
|
+
const from = node.node.firstChild?.to ?? node.from + delimiterLength;
|
|
235
|
+
const to = node.node.lastChild?.from ?? node.to - delimiterLength;
|
|
236
236
|
|
|
237
237
|
// Ensure valid ranges
|
|
238
238
|
if (from >= to || from < 0 || to < 0) {
|
|
239
239
|
return null;
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
242
|
+
// Leave Python replacements to their own parser and highlighter.
|
|
243
|
+
const overlay: { from: number; to: number }[] = [];
|
|
244
|
+
let start = from;
|
|
245
|
+
node.node.cursor(IterMode.IgnoreMounts).iterate((child) => {
|
|
246
|
+
if (child.name !== "Python") {
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
if (start < child.from) {
|
|
250
|
+
overlay.push({ from: start, to: child.from });
|
|
251
|
+
}
|
|
252
|
+
start = child.to;
|
|
253
|
+
return false;
|
|
254
|
+
});
|
|
255
|
+
if (start < to) {
|
|
256
|
+
overlay.push({ from: start, to });
|
|
257
|
+
}
|
|
258
|
+
return overlay.length ? { parser: latexParser, overlay } : null;
|
|
252
259
|
}
|
|
253
260
|
|
|
254
261
|
return null;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import{n as e}from"./feedback-button-C_PtEG12.js";export{e as FeedbackModal};
|