@blankdotpage/cake 0.1.67 → 0.1.69

package/dist/cake/editor/cake-editor.js

@@ -1,12 +1,11 @@
 import { isApplyEditCommand, createRuntimeFromRegistry, } from "../core/runtime";
-import { renderDocContent } from "../dom/render";
+import { renderDocContent, } from "../dom/render";
 import { applyDomSelection, readDomSelection } from "../dom/dom-selection";
 import { bundledExtensions } from "../extensions";
 import { getCaretRect as getDomCaretRect, getSelectionGeometry, } from "./selection/selection-geometry-dom";
-import { getDocLines, getLineOffsets, resolveOffsetToLine, } from "./selection/selection-layout";
-import { cursorOffsetToVisibleOffset, getVisibleText, visibleOffsetToCursorOffset, } from "./selection/visible-text";
 import { hitTestFromLayout, measureLayoutModelFromDom, } from "./selection/selection-layout-dom";
 import { moveSelectionVertically as moveSelectionVerticallyInLayout } from "./selection/selection-navigation";
+import { EditorTextModel, } from "./internal/editor-text-model";
 import { isMacPlatform } from "../shared/platform";
 import { graphemeCount } from "../shared/segmenter";
 import { getWordBoundaries, nextWordBreak, prevWordBreak, } from "../shared/word-break";
@@ -15,6 +14,47 @@ const defaultSelection = { start: 0, end: 0, affinity: "forward" };
 const COMPOSITION_COMMIT_CLEAR_DELAY_MS = 50;
 const HISTORY_GROUPING_INTERVAL_MS = 500;
 const MAX_UNDO_STACK_SIZE = 100;
+function computeDirtyCursorRange(previous, next) {
+    if (!previous) {
+        return null;
+    }
+    const prevSource = previous.source;
+    const nextSource = next.source;
+    if (prevSource === nextSource) {
+        return null;
+    }
+    const prevLength = prevSource.length;
+    const nextLength = nextSource.length;
+    let prefix = 0;
+    while (prefix < prevLength &&
+        prefix < nextLength &&
+        prevSource.charCodeAt(prefix) === nextSource.charCodeAt(prefix)) {
+        prefix += 1;
+    }
+    let prevSuffix = prevLength;
+    let nextSuffix = nextLength;
+    while (prevSuffix > prefix &&
+        nextSuffix > prefix &&
+        prevSource.charCodeAt(prevSuffix - 1) ===
+            nextSource.charCodeAt(nextSuffix - 1)) {
+        prevSuffix -= 1;
+        nextSuffix -= 1;
+    }
+    const previousStart = previous.map.sourceToCursor(prefix, "forward").cursorOffset;
+    const previousEnd = previous.map.sourceToCursor(prevSuffix, "backward").cursorOffset;
+    const nextStart = next.map.sourceToCursor(prefix, "forward").cursorOffset;
+    const nextEnd = next.map.sourceToCursor(nextSuffix, "backward").cursorOffset;
+    return {
+        previous: {
+            start: previousStart,
+            end: previousEnd,
+        },
+        next: {
+            start: nextStart,
+            end: nextEnd,
+        },
+    };
+}
 function removeFromArray(arr, value) {
     const index = arr.indexOf(value);
     if (index === -1) {
@@ -27,7 +67,11 @@ export class CakeEditor {
         return this._state;
     }
     set state(value) {
+        const previousDoc = this._state?.doc;
         this._state = value;
+        if (previousDoc !== value.doc) {
+            this.textModel.rebuild(value.doc);
+        }
     }
     getLastRenderPerf() {
         return this.lastRenderPerf;
@@ -69,6 +113,7 @@ export class CakeEditor {
         this.normalizeBlockFns = [];
         this.normalizeInlineFns = [];
         this.onEditFns = [];
+        this.structuralReparsePolicies = [];
         this.keybindings = [];
         this.keyDownInterceptors = [];
         this.onPasteTextHandlers = [];
@@ -77,6 +122,7 @@ export class CakeEditor {
         this.domBlockRenderers = [];
         this.uiComponents = [];
         this.extensionDisposers = [];
+        this.textModel = new EditorTextModel();
         this.contentRoot = null;
         this.domMap = null;
         this.isApplyingSelection = false;
@@ -116,6 +162,8 @@ export class CakeEditor {
         this.lastFocusRect = null;
         this.verticalNavGoalX = null;
         this.lastRenderPerf = null;
+        this.renderSnapshot = null;
+        this.lastRenderedState = null;
         this.history = {
             undoStack: [],
             redoStack: [],
@@ -203,6 +251,7 @@ export class CakeEditor {
             normalizeBlockFns: this.normalizeBlockFns,
             normalizeInlineFns: this.normalizeInlineFns,
             onEditFns: this.onEditFns,
+            structuralReparsePolicies: this.structuralReparsePolicies,
             domInlineRenderers: this.domInlineRenderers,
             domBlockRenderers: this.domBlockRenderers,
         });
@@ -282,6 +331,10 @@ export class CakeEditor {
         this.onEditFns.push(fn);
         return () => removeFromArray(this.onEditFns, fn);
     }
+    registerStructuralReparsePolicy(fn) {
+        this.structuralReparsePolicies.push(fn);
+        return () => removeFromArray(this.structuralReparsePolicies, fn);
+    }
     registerOnPasteText(fn) {
         this.onPasteTextHandlers.push(fn);
         return () => removeFromArray(this.onPasteTextHandlers, fn);
@@ -362,16 +415,26 @@ export class CakeEditor {
         return this.state.selection;
     }
     getText() {
-        const lines = getDocLines(this.state.doc);
-        return getVisibleText(lines);
+        return this.textModel.getVisibleText();
     }
     getTextSelection() {
-        const lines = getDocLines(this.state.doc);
         return {
-            start: cursorOffsetToVisibleOffset(lines, this.state.selection.start),
-            end: cursorOffsetToVisibleOffset(lines, this.state.selection.end),
+            start: this.textModel.cursorOffsetToVisibleOffset(this.state.selection.start),
+            end: this.textModel.cursorOffsetToVisibleOffset(this.state.selection.end),
         };
     }
+    rebuildTextModelFallback() {
+        // Single fallback branch for complex cases where cursor/visible mapping misses.
+        this.textModel.rebuild(this.state.doc);
+    }
+    visibleOffsetToCursorOffset(visibleOffset) {
+        const resolved = this.textModel.visibleOffsetToCursorOffset(visibleOffset);
+        if (resolved !== null) {
+            return resolved;
+        }
+        this.rebuildTextModelFallback();
+        return this.textModel.visibleOffsetToCursorOffset(visibleOffset);
+    }
     getActiveMarks() {
         const { start, end } = this.state.selection;
         if (start === end) {
@@ -684,9 +747,8 @@ export class CakeEditor {
         return { found: false, marks: [], nextOffset: offset };
     }
     setTextSelection(selection) {
-        const lines = getDocLines(this.state.doc);
-        const start = visibleOffsetToCursorOffset(lines, selection.start);
-        const end = visibleOffsetToCursorOffset(lines, selection.end);
+        const start = this.visibleOffsetToCursorOffset(selection.start);
+        const end = this.visibleOffsetToCursorOffset(selection.end);
         if (start === null || end === null) {
             return;
         }
@@ -699,34 +761,25 @@ export class CakeEditor {
         });
     }
     getTextBeforeCursor(maxChars = Number.POSITIVE_INFINITY) {
-        const text = this.getText();
-        const { start } = this.getTextSelection();
-        const cursor = Math.max(0, Math.min(start, text.length));
-        const length = Math.max(0, maxChars);
-        return text.slice(Math.max(0, cursor - length), cursor);
+        return this.textModel.getTextBeforeCursor(this.state.selection, maxChars);
     }
     getTextAroundCursor(before, after) {
-        const text = this.getText();
-        const { start } = this.getTextSelection();
-        const cursor = Math.max(0, Math.min(start, text.length));
-        const beforeLength = Math.max(0, before);
-        const afterLength = Math.max(0, after);
-        const beforeText = text.slice(Math.max(0, cursor - beforeLength), cursor);
-        const afterText = text.slice(cursor, Math.min(text.length, cursor + afterLength));
-        return { before: beforeText, after: afterText };
+        return this.textModel.getTextAroundCursor(this.state.selection, before, after);
+    }
+    getTextForCursorRange(start, end) {
+        return this.textModel.getTextForCursorRange(start, end);
     }
     replaceTextBeforeCursor(chars, replacement) {
-        const lines = getDocLines(this.state.doc);
         const selection = this.state.selection;
         const focus = selection.start === selection.end
             ? selection.start
             : selection.affinity === "backward"
                 ? selection.start
                 : selection.end;
-        const focusVisible = cursorOffsetToVisibleOffset(lines, focus);
+        const focusVisible = this.textModel.cursorOffsetToVisibleOffset(focus);
         const length = Math.max(0, chars);
         const startVisible = Math.max(0, focusVisible - length);
-        const startCursor = visibleOffsetToCursorOffset(lines, startVisible);
+        const startCursor = this.visibleOffsetToCursorOffset(startVisible);
         if (startCursor === null) {
             return;
         }
@@ -751,7 +804,7 @@ export class CakeEditor {
         this.scheduleScrollCaretIntoView();
     }
     getCursorLength() {
-        return this.state.map.cursorLength;
+        return this.textModel.getCursorLength();
     }
     getFocusRect() {
         return this.lastFocusRect;
@@ -780,12 +833,13 @@ export class CakeEditor {
         if (!this.contentRoot) {
             return null;
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const geometry = getSelectionGeometry({
             root: this.contentRoot,
             container: this.container,
             docLines: lines,
             selection: this.state.selection,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         const focus = geometry.caretRect ?? geometry.focusRect;
         if (!focus) {
@@ -815,12 +869,13 @@ export class CakeEditor {
         if (!this.contentRoot) {
             return [];
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const geometry = getSelectionGeometry({
             root: this.contentRoot,
             container: this.container,
             docLines: lines,
             selection: this.state.selection,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         if (geometry.selectionRects.length === 0) {
             return [];
@@ -844,7 +899,7 @@ export class CakeEditor {
         }));
     }
     getLines() {
-        return getDocLines(this.state.doc);
+        return this.textModel.getLines();
     }
     getOverlayRoot() {
         return this.ensureExtensionsRoot();
@@ -1242,7 +1297,11 @@ export class CakeEditor {
         if (perfEnabled) {
             renderStart = performance.now();
         }
-        const { content, map } = renderDocContent(this.state.doc, this.runtime.dom, this.contentRoot);
+        const dirtyCursorRange = computeDirtyCursorRange(this.lastRenderedState, this.state);
+        const { content, map, snapshot } = renderDocContent(this.state.doc, this.runtime.dom, this.contentRoot, {
+            previousSnapshot: this.renderSnapshot,
+            dirtyCursorRange,
+        });
         const existingChildren = Array.from(this.contentRoot.childNodes);
         const isManagedChild = (node) => node instanceof Element &&
             (node.hasAttribute("data-line-index") ||
@@ -1257,6 +1316,11 @@ export class CakeEditor {
             this.contentRoot.replaceChildren(...content, ...preservedChildren);
         }
         this.domMap = map;
+        this.renderSnapshot = snapshot;
+        this.lastRenderedState = {
+            source: this.state.source,
+            map: this.state.map,
+        };
         if (perfEnabled) {
             renderAndMapMs = performance.now() - renderStart;
         }
@@ -1518,9 +1582,9 @@ export class CakeEditor {
         if (selection.start !== selection.end) {
             return selection;
         }
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
-        const { lineIndex } = resolveOffsetToLine(lines, selection.start);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
+        const { lineIndex } = this.textModel.resolveOffsetToLine(selection.start);
         const lineInfo = lines[lineIndex];
         if (!lineInfo || !lineInfo.isAtomic) {
             return selection;
@@ -1566,13 +1630,13 @@ export class CakeEditor {
         if (Number.isNaN(lineIndex)) {
             return null;
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const lineInfo = lines[lineIndex];
         if (!lineInfo || !lineInfo.isAtomic) {
             return null;
         }
         // Calculate the selection range for the entire line including newline
-        const lineOffsets = getLineOffsets(lines);
+        const lineOffsets = this.textModel.getLineOffsets();
         const lineStart = lineOffsets[lineIndex] ?? 0;
         const lineEnd = lineStart + lineInfo.cursorLength + (lineInfo.hasNewline ? 1 : 0);
         return {
@@ -1703,10 +1767,10 @@ export class CakeEditor {
         if (!hit) {
             return;
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         if (event.detail === 2) {
-            const lineOffsets = getLineOffsets(lines);
-            const { lineIndex } = resolveOffsetToLine(lines, hit.cursorOffset);
+            const lineOffsets = this.textModel.getLineOffsets();
+            const { lineIndex } = this.textModel.resolveOffsetToLine(hit.cursorOffset);
             const lineInfo = lines[lineIndex];
             if (lineInfo && lineInfo.cursorLength === 0) {
                 const lineStart = lineOffsets[lineIndex] ?? 0;
@@ -1724,11 +1788,11 @@ export class CakeEditor {
                 this.suppressSelectionChange = false;
                 return;
             }
-            const visibleText = getVisibleText(lines);
-            const visibleOffset = cursorOffsetToVisibleOffset(lines, hit.cursorOffset);
+            const visibleText = this.textModel.getVisibleText();
+            const visibleOffset = this.textModel.cursorOffsetToVisibleOffset(hit.cursorOffset);
             const wordBounds = getWordBoundaries(visibleText, visibleOffset);
-            const start = visibleOffsetToCursorOffset(lines, wordBounds.start);
-            const end = visibleOffsetToCursorOffset(lines, wordBounds.end);
+            const start = this.visibleOffsetToCursorOffset(wordBounds.start);
+            const end = this.visibleOffsetToCursorOffset(wordBounds.end);
             if (start === null || end === null) {
                 this.suppressSelectionChange = false;
                 return;
@@ -1748,8 +1812,8 @@ export class CakeEditor {
             return;
         }
         if (event.detail >= 3) {
-            const lineOffsets = getLineOffsets(lines);
-            const { lineIndex } = resolveOffsetToLine(lines, hit.cursorOffset);
+            const lineOffsets = this.textModel.getLineOffsets();
+            const { lineIndex } = this.textModel.resolveOffsetToLine(hit.cursorOffset);
             const lineInfo = lines[lineIndex];
             if (!lineInfo) {
                 this.suppressSelectionChange = false;
@@ -2176,8 +2240,7 @@ export class CakeEditor {
         if (this.compositionCommit && event.inputType === "insertText") {
             this.clearCompositionCommit();
             const domText = this.readDomText();
-            const lines = getDocLines(this.state.doc);
-            const modelText = getVisibleText(lines);
+            const modelText = this.textModel.getVisibleText();
             if (domText === modelText) {
                 if (this.domMap) {
                     const domSelection = readDomSelection(this.domMap);
@@ -2203,8 +2266,7 @@ export class CakeEditor {
         // we must not drop the edit; reconcile if the DOM diverged from the model.
         if (this.beforeInputHandled) {
             const domText = this.readDomText();
-            const lines = getDocLines(this.state.doc);
-            const modelText = getVisibleText(lines);
+            const modelText = this.textModel.getVisibleText();
             if (domText === modelText) {
                 return;
             }
@@ -2412,8 +2474,8 @@ export class CakeEditor {
             return false;
         }
         const lineIndex = this.selectedAtomicLineIndex;
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
         const lineInfo = lines[lineIndex];
         if (!lineInfo || !lineInfo.isAtomic) {
             this.selectedAtomicLineIndex = null;
@@ -2461,8 +2523,8 @@ export class CakeEditor {
         if (selection.start !== selection.end) {
             return false;
         }
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
         const lineIndex = lineOffsets.findIndex((offset) => offset === selection.start);
         if (lineIndex === -1) {
             return false;
@@ -2502,8 +2564,11 @@ export class CakeEditor {
         sourceLines[swapB] = aSource;
         const newSource = sourceLines.join("\n");
         const nextState = this.runtime.createState(newSource);
-        const nextOffsets = getLineOffsets(getDocLines(nextState.doc));
-        const cursorPos = nextOffsets[swapA] ?? 0;
+        let lineStartSource = 0;
+        for (let index = 0; index < swapA; index += 1) {
+            lineStartSource += (sourceLines[index]?.length ?? 0) + 1;
+        }
+        const cursorPos = nextState.map.sourceToCursor(lineStartSource, "forward").cursorOffset;
         this.recordHistory("delete-backward");
         this.state = {
             ...nextState,
@@ -2554,7 +2619,7 @@ export class CakeEditor {
         if (!this.contentRoot) {
             return null;
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const layout = measureLayoutModelFromDom({
             lines,
             root: this.contentRoot,
@@ -2585,6 +2650,7 @@ export class CakeEditor {
                 layout,
                 offset: currentPos,
                 affinity: currentAffinity,
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             // Arrow left at start of visual row (not at document start):
             // Stay at same position but change to backward affinity
@@ -2598,6 +2664,7 @@ export class CakeEditor {
                     layout,
                     offset: currentPos,
                     affinity: "backward",
+                    resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
                 });
                 // If backward affinity puts us on a different row, just change affinity
                 if (prevBoundaries.rowEnd !== rowEnd ||
@@ -2616,6 +2683,7 @@ export class CakeEditor {
                     layout,
                     offset: currentPos,
                     affinity: "forward",
+                    resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
                 });
                 // If forward affinity puts us on a different row, just change affinity
                 if (nextBoundaries.rowEnd !== rowEnd ||
@@ -2632,8 +2700,8 @@ export class CakeEditor {
     }
     moveOffsetByChar(offset, direction) {
         const cursorLength = this.state.map.cursorLength;
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
         let nextPos;
         if (direction === "forward") {
             if (offset >= cursorLength) {
@@ -2647,7 +2715,7 @@ export class CakeEditor {
             }
             nextPos = offset - 1;
         }
-        const { lineIndex: nextLineIndex } = resolveOffsetToLine(lines, nextPos);
+        const { lineIndex: nextLineIndex } = this.textModel.resolveOffsetToLine(nextPos);
         const nextLineInfo = lines[nextLineIndex];
         if (nextLineInfo && nextLineInfo.isAtomic) {
             const lineStart = lineOffsets[nextLineIndex] ?? 0;
@@ -2674,7 +2742,7 @@ export class CakeEditor {
             }
         }
         const { focus } = resolveSelectionAnchorAndFocus(this.state.selection);
-        const focusResolved = resolveOffsetToLine(lines, focus);
+        const focusResolved = this.textModel.resolveOffsetToLine(focus);
         const focusLineLayout = layout.lines[focusResolved.lineIndex];
         let focusRowIndex = undefined;
         if (focusLineLayout?.rows.length && this.lastFocusRect) {
@@ -2701,6 +2769,7 @@ export class CakeEditor {
             lines,
             layout,
             selection: this.state.selection,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             direction,
             goalX: this.verticalNavGoalX,
             focusRowIndex,
@@ -2709,7 +2778,7 @@ export class CakeEditor {
                 if (!hit || !this.contentRoot) {
                     return null;
                 }
-                const resolved = resolveOffsetToLine(lines, hit.cursorOffset);
+                const resolved = this.textModel.resolveOffsetToLine(hit.cursorOffset);
                 const lineInfo = lines[resolved.lineIndex];
                 const lineElement = this.contentRoot.querySelector(`[data-line-index="${resolved.lineIndex}"]`);
                 if (!lineInfo || !(lineElement instanceof HTMLElement)) {
@@ -2753,6 +2822,7 @@ export class CakeEditor {
             layout,
             offset: focus,
             affinity: "backward",
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         let target = rowStart;
         if (focus === rowStart && focus > 0) {
@@ -2761,6 +2831,7 @@ export class CakeEditor {
                 layout,
                 offset: focus - 1,
                 affinity: "backward",
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             target = previous.rowStart;
         }
@@ -2782,6 +2853,7 @@ export class CakeEditor {
             layout,
             offset: focus,
             affinity: "forward",
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         let target = rowEnd;
         if (focus === rowEnd && focus < this.state.map.cursorLength) {
@@ -2790,6 +2862,7 @@ export class CakeEditor {
                 layout,
                 offset: focus + 1,
                 affinity: "forward",
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             target = next.rowEnd;
         }
@@ -2809,6 +2882,7 @@ export class CakeEditor {
             layout,
             offset: focus,
             affinity,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         let target = rowStart;
         if (focus === rowStart && focus > 0) {
@@ -2817,6 +2891,7 @@ export class CakeEditor {
                 layout,
                 offset: focus - 1,
                 affinity: "backward",
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             target = previous.rowStart;
         }
@@ -2836,6 +2911,7 @@ export class CakeEditor {
             layout,
             offset: focus,
             affinity,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         let target = rowEnd;
         if (focus === rowEnd && focus < this.state.map.cursorLength) {
@@ -2844,6 +2920,7 @@ export class CakeEditor {
                 layout,
                 offset: focus + 1,
                 affinity: "forward",
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             target = next.rowEnd;
         }
@@ -2862,8 +2939,8 @@ export class CakeEditor {
         if (selection.start === selection.end) {
             return null;
         }
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
         const selStart = Math.min(selection.start, selection.end);
         const selEnd = Math.max(selection.start, selection.end);
         const fullLineInfo = this.detectFullLineSelection(selStart, selEnd, lines, lineOffsets);
@@ -2918,26 +2995,25 @@ export class CakeEditor {
         return selectionFromAnchor(anchor, nextFocus, direction);
     }
     moveOffsetByWord(offset, direction) {
-        const lines = getDocLines(this.state.doc);
-        const visibleText = getVisibleText(lines);
+        const visibleText = this.textModel.getVisibleText();
         if (!visibleText) {
             return 0;
         }
-        const visibleOffset = cursorOffsetToVisibleOffset(lines, offset);
+        const visibleOffset = this.textModel.cursorOffsetToVisibleOffset(offset);
         const nextVisibleOffset = direction === "backward"
             ? prevWordBreak(visibleText, visibleOffset)
             : nextWordBreak(visibleText, visibleOffset);
-        return visibleOffsetToCursorOffset(lines, nextVisibleOffset) ?? offset;
+        return this.visibleOffsetToCursorOffset(nextVisibleOffset) ?? offset;
     }
     deleteToVisualRowStart() {
         const selection = this.state.selection;
-        const lines = getDocLines(this.state.doc);
-        const { lineIndex, offsetInLine } = resolveOffsetToLine(lines, selection.start);
+        const lines = this.textModel.getLines();
+        const { lineIndex, offsetInLine } = this.textModel.resolveOffsetToLine(selection.start);
         const lineInfo = lines[lineIndex];
         if (!lineInfo) {
             return;
         }
-        const lineOffsets = getLineOffsets(lines);
+        const lineOffsets = this.textModel.getLineOffsets();
         const lineStart = lineOffsets[lineIndex] ?? 0;
         const isLineStart = offsetInLine === 0;
         const isCollapsed = selection.start === selection.end;
@@ -2962,6 +3038,7 @@ export class CakeEditor {
             layout,
             offset: selection.start,
             affinity: "backward",
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         const isVisualRowStart = selection.start === rowStart;
         if (isCollapsed && isVisualRowStart) {
@@ -2978,11 +3055,11 @@ export class CakeEditor {
     }
     handleIndent() {
         const selection = this.state.selection;
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const TAB_SPACES = "  ";
         const isCollapsed = selection.start === selection.end;
-        const startLineIndex = resolveOffsetToLine(lines, selection.start).lineIndex;
-        const endLineIndex = resolveOffsetToLine(lines, Math.max(selection.start, selection.end - 1)).lineIndex;
+        const startLineIndex = this.textModel.resolveOffsetToLine(selection.start).lineIndex;
+        const endLineIndex = this.textModel.resolveOffsetToLine(Math.max(selection.start, selection.end - 1)).lineIndex;
         const affectsMultipleLines = endLineIndex > startLineIndex;
         // Check if the current line is a list item by checking source text
         const sourceLines = this.state.source.split("\n");
@@ -3003,7 +3080,7 @@ export class CakeEditor {
         // insert at caret position. Otherwise indent at line start.
         if (isCollapsed) {
             // Check if caret is in middle/end of line (not at start)
-            const lineOffsets = getLineOffsets(lines);
+            const lineOffsets = this.textModel.getLineOffsets();
             const lineStart = lineOffsets[startLineIndex] ?? 0;
             const offsetInLine = selection.start - lineStart;
             if (offsetInLine > 0) {
@@ -3055,10 +3132,10 @@ export class CakeEditor {
     }
     handleOutdent() {
         const selection = this.state.selection;
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const TAB_SPACES = "  ";
-        const startLineIndex = resolveOffsetToLine(lines, selection.start).lineIndex;
-        const endLineIndex = resolveOffsetToLine(lines, Math.max(selection.start, selection.end - 1)).lineIndex;
+        const startLineIndex = this.textModel.resolveOffsetToLine(selection.start).lineIndex;
+        const endLineIndex = this.textModel.resolveOffsetToLine(Math.max(selection.start, selection.end - 1)).lineIndex;
         const sourceLines = this.state.source.split("\n");
         // Check if the current line is a list item by checking source text
         const startSourceLine = sourceLines[startLineIndex] ?? "";
@@ -3152,8 +3229,7 @@ export class CakeEditor {
      */
     reconcileDomChanges(selection) {
         const domText = this.readDomText();
-        const lines = getDocLines(this.state.doc);
-        const modelText = getVisibleText(lines);
+        const modelText = this.textModel.getVisibleText();
         if (domText === modelText) {
             return false;
         }
@@ -3175,8 +3251,8 @@ export class CakeEditor {
         // The replacement text from DOM
         const replacementText = domText.slice(prefixLen, domText.length - suffixLen);
         // Convert visible text offsets to cursor offsets
-        const cursorStart = visibleOffsetToCursorOffset(lines, prefixLen);
-        const cursorEnd = visibleOffsetToCursorOffset(lines, modelText.length - suffixLen);
+        const cursorStart = this.visibleOffsetToCursorOffset(prefixLen);
+        const cursorEnd = this.visibleOffsetToCursorOffset(modelText.length - suffixLen);
         if (cursorStart === null || cursorEnd === null) {
             // Fallback: rebuild state from scratch (loses formatting)
             // History was already recorded above
@@ -3464,12 +3540,13 @@ export class CakeEditor {
                 this.syncSelectionRects([]);
                 return;
             }
-            const lines = getDocLines(this.state.doc);
+            const lines = this.textModel.getLines();
             const geometry = getSelectionGeometry({
                 root: this.contentRoot,
                 container: this.container,
                 docLines: lines,
                 selection,
+                resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
             });
             this.lastFocusRect = geometry.focusRect;
             this.syncSelectionRects(geometry.selectionRects);
@@ -3483,12 +3560,13 @@ export class CakeEditor {
             return;
         }
         this.contentRoot.classList.remove("cake-touch-mode");
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const geometry = getSelectionGeometry({
             root: this.contentRoot,
             container: this.container,
             docLines: lines,
             selection: this.state.selection,
+            resolveOffsetToLine: (offset) => this.textModel.resolveOffsetToLine(offset),
         });
         this.lastFocusRect = geometry.focusRect;
         this.syncSelectionRects(geometry.selectionRects);
@@ -3673,7 +3751,7 @@ export class CakeEditor {
         if (!this.contentRoot) {
             return null;
         }
-        const lines = getDocLines(this.state.doc);
+        const lines = this.textModel.getLines();
         const hit = hitTestFromLayout({
             clientX,
             clientY,
@@ -3736,10 +3814,10 @@ export class CakeEditor {
             const lineIndexAttr = blockElement?.getAttribute("data-line-index") ?? null;
             if (lineIndexAttr !== null) {
                 const lineIndex = Number.parseInt(lineIndexAttr, 10);
-                const lines = getDocLines(this.state.doc);
+                const lines = this.textModel.getLines();
                 const lineInfo = lines[lineIndex];
                 if (lineInfo?.isAtomic) {
-                    const lineOffsets = getLineOffsets(lines);
+                    const lineOffsets = this.textModel.getLineOffsets();
                     const lineStart = lineOffsets[lineIndex] ?? 0;
                     const lineEnd = lineStart + lineInfo.cursorLength + (lineInfo.hasNewline ? 1 : 0);
                     const atomicSelection = {
@@ -3845,8 +3923,8 @@ export class CakeEditor {
             return;
         }
         // Check if this is a full line selection (required for line drag)
-        const lines = getDocLines(this.state.doc);
-        const lineOffsets = getLineOffsets(lines);
+        const lines = this.textModel.getLines();
+        const lineOffsets = this.textModel.getLineOffsets();
         // Find which line the selection starts on
         // We need to handle the case where selStart might be at the newline position
         // of the previous line (offset - 1) due to DOM selection normalization
@@ -4258,10 +4336,10 @@ export class CakeEditor {
             return;
         }
         // Get the plain text and source text for the selection
-        const lines = getDocLines(this.state.doc);
-        const visibleText = getVisibleText(lines);
-        const visibleStart = cursorOffsetToVisibleOffset(lines, start);
-        const visibleEnd = cursorOffsetToVisibleOffset(lines, end);
+        const lines = this.textModel.getLines();
+        const visibleText = this.textModel.getVisibleText();
+        const visibleStart = this.textModel.cursorOffsetToVisibleOffset(start);
+        const visibleEnd = this.textModel.cursorOffsetToVisibleOffset(end);
         const plainText = visibleText.slice(visibleStart, visibleEnd);
         // Get source text for the selection (use backward/forward to capture full markdown syntax)
         const cursorSourceMap = this.state.map;
@@ -4323,10 +4401,10 @@ export class CakeEditor {
             if (selection.start !== selection.end) {
                 const start = Math.min(selection.start, selection.end);
                 const end = Math.max(selection.start, selection.end);
-                const lines = getDocLines(this.state.doc);
-                const visibleText = getVisibleText(lines);
-                const visibleStart = cursorOffsetToVisibleOffset(lines, start);
-                const visibleEnd = cursorOffsetToVisibleOffset(lines, end);
+                const lines = this.textModel.getLines();
+                const visibleText = this.textModel.getVisibleText();
+                const visibleStart = this.textModel.cursorOffsetToVisibleOffset(start);
+                const visibleEnd = this.textModel.cursorOffsetToVisibleOffset(end);
                 const plainText = visibleText.slice(visibleStart, visibleEnd);
                 const cursorSourceMap = this.state.map;
                 const sourceStart = cursorSourceMap.cursorToSource(start, "backward");
@@ -4348,8 +4426,8 @@ export class CakeEditor {
                 return;
             }
             // Check if this is a full-line selection - if so, use line-level move
-            const lines = getDocLines(this.state.doc);
-            const lineOffsets = getLineOffsets(lines);
+            const lines = this.textModel.getLines();
+            const lineOffsets = this.textModel.getLineOffsets();
             const fullLineInfo = this.detectFullLineSelection(dragStart, dragEnd, lines, lineOffsets);
             if (fullLineInfo) {
                 // Full line drag - use line-level move
@@ -4500,7 +4578,7 @@ function getVisualRowBoundaries(params) {
     if (!layout || layout.lines.length === 0) {
         return { rowStart: 0, rowEnd: 0 };
     }
-    const resolved = resolveOffsetToLine(lines, offset);
+    const resolved = params.resolveOffsetToLine(offset);
     const line = layout.lines[resolved.lineIndex];
     if (!line) {
         return { rowStart: 0, rowEnd: 0 };