@adecore/editor 0.38.0 → 0.40.0

package/dist/controller.d.ts

@@ -37,6 +37,7 @@ export declare class InputController {
     private inputGroup;
     private applyEdits;
     private replaceSelections;
+    private unfoldCarets;
     private paste;
     private commandOptions;
     private viewCommand;

package/dist/controller.js

@@ -88,6 +88,10 @@ export class InputController {
         this.options = options;
         this.gesture = new DoubleModifierGesture(options.apple ? 'Alt' : 'Control');
         const { model, input, viewport } = view;
+        const lineAt = (offset) => {
+            const row = view.layout.rowForLine(model.positionAt(offset).line);
+            return row.kind === 'text' ? { from: model.getLine(row.line).start, to: model.getLine(row.lastLine).next } : { from: offset, to: offset };
+        };
         this.native = new NativeInput(input, model, {
             readOnly: () => view.settings.readOnly,
             replace: (text) => this.replaceSelections(text),
@@ -110,10 +114,7 @@ export class InputController {
             contentPoint: (x, y) => view.contentPoint(x, y),
             columnSelections: (from, to) => (sameCell(view.layout, from, to) ? null : columnSelections(view.layout, from, to)),
             visualLine: (offset) => view.layout.visualLine(offset),
-            lineAt: (offset) => {
-                const row = view.layout.rowForLine(model.positionAt(offset).line);
-                return row.kind === 'text' ? { from: model.getLine(row.line).start, to: model.getLine(row.lastLine).next } : { from: offset, to: offset };
-            },
+            lineAt,
             camelHumps: () => view.settings.smartKeys.camelHumps,
             columnMode: () => view.columnMode,
             selectionAt: (x, y) => (view.settings.readOnly ? null : view.selectionAtPoint(x, y)),
@@ -127,10 +128,7 @@ export class InputController {
             model,
             offsetAt: (x, y) => view.offsetAtPoint(x, y),
             camelHumps: () => view.settings.smartKeys.camelHumps,
-            lineAt: (offset) => {
-                const row = view.layout.rowForLine(model.positionAt(offset).line);
-                return row.kind === 'text' ? { from: model.getLine(row.line).start, to: model.getLine(row.lastLine).next } : { from: offset, to: offset };
-            },
+            lineAt,
             focus: () => view.focus()
         });
         this.subscription = model.subscribe(() => {
@@ -237,15 +235,8 @@ export class InputController {
         this.cleanup.length = 0;
         this.keyHandlers.clear();
     }
-    /* Tells a person why nothing happened, when the editor is read only and has said why. */
     blockedByReadOnly() {
-        if (!this.view.settings.readOnly) {
-            return false;
-        }
-        if (this.view.settings.readOnlyReason) {
-            this.view.notify(this.view.settings.readOnlyReason);
-        }
-        return true;
+        return this.view.blockedByReadOnly();
     }
     inputGroup() {
         const now = Date.now();
@@ -266,23 +257,23 @@ export class InputController {
             return;
         }
         const { model } = this.view;
-        for (const selection of model.getSelections()) {
-            this.view.ensureVisible(selection.head);
-        }
+        this.unfoldCarets();
         const replacement = replacementEdits(model.getSelections(), this.native.normalizeNewlines(text));
         this.applyEdits(replacement.edits, replacement.selections);
         this.view.revealCaret();
     }
+    unfoldCarets() {
+        for (const selection of this.view.model.getSelections()) {
+            this.view.ensureVisible(selection.head);
+        }
+    }
     paste(text) {
         if (this.blockedByReadOnly()) {
             return;
         }
-        const { model } = this.view;
-        for (const selection of model.getSelections()) {
-            this.view.ensureVisible(selection.head);
-        }
+        this.unfoldCarets();
         this.historyGroup++;
-        model.paste(this.native.normalizeNewlines(text), { ...this.commandOptions(), wholeLines: text !== '' && text === lineClip });
+        this.view.model.paste(this.native.normalizeNewlines(text), { ...this.commandOptions(), wholeLines: text !== '' && text === lineClip });
         this.historyGroup++;
         this.view.revealCaret();
     }
@@ -358,7 +349,7 @@ export class InputController {
             return { line, character: column };
         });
         const chains = await provider(asked).catch(() => null);
-        if (model.getRevision() !== revision || JSON.stringify(model.getSelections()) !== JSON.stringify(selections)) {
+        if (model.getRevision() !== revision || selectionSignature(model.getSelections()) !== selectionSignature(selections)) {
             return;
         }
         if (chains === null) {
@@ -413,9 +404,7 @@ export class InputController {
         if (this.blockedByReadOnly()) {
             return;
         }
-        for (const selection of this.view.model.getSelections()) {
-            this.view.ensureVisible(selection.head);
-        }
+        this.unfoldCarets();
         // Every key goes through the model, which decides by the key before it too, as for the arrow of PHP.
         if (text.length === 1) {
             this.view.model.typeText(text, { ...this.commandOptions(), historyGroup: this.inputGroup() });

package/dist/engine.js

@@ -164,8 +164,7 @@ class SmartEditor {
             return;
         }
         this.caretOffset = head;
-        const position = this.positionAt(head);
-        emit(this.carets, position);
+        emit(this.carets, this.positionAt(head));
     }
     getCaret() {
         return this.positionAt(this.model.getPrimary().head);
@@ -483,13 +482,7 @@ class SmartEditor {
         }
     }
     blockedByReadOnly() {
-        if (!this.settings.readOnly) {
-            return false;
-        }
-        if (this.settings.readOnlyReason) {
-            this.view.notify(this.settings.readOnlyReason);
-        }
-        return true;
+        return this.view.blockedByReadOnly();
     }
     onFind(listener) {
         return this.view.onFind(listener);

package/dist/find.js

@@ -360,14 +360,7 @@ export class FindController {
                 }
                 this.pendingAnchor = undefined;
                 this.pendingStep = undefined;
-                this.failed =
-                    error instanceof EditorSearchError
-                        ? error.kind === 'syntax'
-                            ? 'invalid'
-                            : error.kind === 'timeout' || error.kind === 'unavailable'
-                                ? error.kind
-                                : 'error'
-                        : 'error';
+                this.failed = searchFailure(error);
                 this.regexCache = { revision, key, complete: false };
                 this.options?.changed();
             });
@@ -534,7 +527,8 @@ export class FindController {
         this.options?.changed();
     }
     async replaceOne(replacement, preserveCase, canApply) {
-        const query = this.query, mark = this.currentMark;
+        const query = this.query;
+        const mark = this.currentMark;
         if (query === null || mark === null || this.search === undefined || !canApply()) {
             return false;
         }
@@ -574,8 +568,7 @@ export class FindController {
         }
         catch (error) {
             if (valid()) {
-                const failure = searchFailure(error);
-                this.reportReplaceFailed(error instanceof EditorSearchError && error.kind === 'range' ? 'limit' : failure === 'invalid' ? 'error' : failure);
+                this.reportReplaceFailed(replaceFailure(error));
             }
             return false;
         }
@@ -629,8 +622,7 @@ export class FindController {
         }
         catch (error) {
             if (!this.disposed && epoch === this.epoch) {
-                const failure = searchFailure(error);
-                this.replaceFailed = error instanceof EditorSearchError && error.kind === 'range' ? 'limit' : failure === 'invalid' ? 'error' : failure;
+                this.replaceFailed = replaceFailure(error);
             }
             return 0;
         }
@@ -656,3 +648,10 @@ function searchFailure(error) {
                 : 'error'
         : 'error';
 }
+function replaceFailure(error) {
+    if (error instanceof EditorSearchError && error.kind === 'range') {
+        return 'limit';
+    }
+    const failure = searchFailure(error);
+    return failure === 'invalid' ? 'error' : failure;
+}

package/dist/layout.js

@@ -417,7 +417,13 @@ export class EditorLayout {
         for (const block of this.blocks) {
             const line = this.document.positionAt(block.at).line;
             const target = block.placement === 'above' ? above : below;
-            target.set(line, [...(target.get(line) ?? []), block]);
+            const list = target.get(line);
+            if (list === undefined) {
+                target.set(line, [block]);
+            }
+            else {
+                list.push(block);
+            }
         }
         const folds = new Map();
         for (const fold of this.folds) {
@@ -703,7 +709,6 @@ export class EditorLayout {
     rowForLine(line) {
         return this.rows[this.lineRows[Math.max(0, Math.min(this.lineRows.length - 1, line))]];
     }
-    /* Whether a fold hides the line. */
     isHidden(line) {
         const row = this.rowForLine(line);
         return row.kind === 'text' && line > row.line && line <= row.lastLine;

package/dist/paint.d.ts

@@ -24,6 +24,8 @@ export declare class RowPainter {
     private buildText;
     private appendTail;
     private paintReplacement;
+    private hostEntry;
+    private measure;
     private paintBlock;
     private fillBlock;
     clear(): void;

package/dist/paint.js

@@ -221,7 +221,7 @@ export class RowPainter {
             chip.className = 'se-fold-chip';
             chip.textContent = '…';
             chip.tabIndex = -1;
-            const chipLeft = geometry.rowEnds[geometry.rowEnds.length - 1] + FOLD_GAP;
+            const chipLeft = geometry.rowEnds.at(-1) + FOLD_GAP;
             const chipWidth = Math.ceil(this.layout.metrics.charWidth) + FOLD_CHIP_PADDING;
             chip.style.left = `${chipLeft}px`;
             chip.style.top = `${(geometry.subRows - 1) * lineHeight}px`;
@@ -265,8 +265,7 @@ export class RowPainter {
             }
             replacement.render(element);
             this.code.append(element);
-            entry = { element, text: '', tokens: null, layoutVersion: 0, whitespace: false, folded: false, tail: '', tailTokens: null, revision };
-            this.rows.set(row.key, entry);
+            entry = this.hostEntry(row.key, element, revision);
         }
         else if (entry.revision !== revision) {
             entry.element.replaceChildren();
@@ -277,10 +276,19 @@ export class RowPainter {
         entry.element.style.top = `${row.top}px`;
         entry.element.style.left = `${indent}px`;
         entry.element.style.width = `${Math.max(80, paint.viewportWidth - indent)}px`;
-        entry.element.style.height = '';
-        this.observer?.observe(entry.element);
-        const height = entry.element.getBoundingClientRect?.().height ?? 0;
-        return height > 0 && this.layout.setMeasuredHeight(row.key, height);
+        return this.measure(row.key, entry.element);
+    }
+    hostEntry(key, element, revision) {
+        const entry = { element, text: '', tokens: null, layoutVersion: 0, whitespace: false, folded: false, tail: '', tailTokens: null, revision };
+        this.rows.set(key, entry);
+        return entry;
+    }
+    /* Lets the host's content set the height, and returns whether that moved the layout. */
+    measure(key, element) {
+        element.style.height = '';
+        this.observer?.observe(element);
+        const height = element.getBoundingClientRect?.().height ?? 0;
+        return height > 0 && this.layout.setMeasuredHeight(key, height);
     }
     paintBlock(row, paint) {
         const { widget } = row;
@@ -296,8 +304,7 @@ export class RowPainter {
             if (!widget.lens && !widget.fixed) {
                 this.observer?.observe(element);
             }
-            entry = { element, text: '', tokens: null, layoutVersion: 0, whitespace: false, folded: false, tail: '', tailTokens: null, revision };
-            this.rows.set(row.key, entry);
+            entry = this.hostEntry(row.key, element, revision);
         }
         else if (entry.revision !== revision) {
             entry.element.replaceChildren();
@@ -322,10 +329,7 @@ export class RowPainter {
             entry.element.style.height = `${row.height}px`;
             return false;
         }
-        entry.element.style.height = '';
-        this.observer?.observe(entry.element);
-        const height = entry.element.getBoundingClientRect?.().height ?? 0;
-        return height > 0 && this.layout.setMeasuredHeight(row.key, height);
+        return this.measure(row.key, entry.element);
     }
     fillBlock(element, widget) {
         if (widget.render) {
@@ -407,15 +411,14 @@ export function paintGutter(container, layout, rows, paint) {
             }
             item.append(button);
         }
-        const sign = paint.highlights.get(row.line)?.sign;
-        if (sign) {
+        if (highlight?.sign) {
             const mark = document.createElement('span');
             mark.className = 'se-line-sign';
-            mark.textContent = sign;
+            mark.textContent = highlight.sign;
             if (label !== null) {
                 mark.setAttribute('aria-hidden', 'true');
             }
-            mark.style.color = colorValue(paint.highlights.get(row.line).color);
+            mark.style.color = colorValue(highlight.color);
             item.append(mark);
         }
         if (highlight?.bar !== undefined) {
@@ -495,7 +498,6 @@ export function paintOver(container, layers) {
     }
     container.replaceChildren(fragment);
 }
-/* The carets, above the text. */
 export function paintCarets(container, carets) {
     const document = container.ownerDocument;
     container.replaceChildren(...carets.map((rect) => box(document, rect.drop ? 'se-drop-caret' : rect.primary ? 'se-caret se-primary-caret' : 'se-caret', { ...rect, width: 2 })));
@@ -571,14 +573,15 @@ function appendTabSigns(element, geometry, lineHeight, band) {
         if (geometry.text[offsetOfStop(geometry, stop)] !== '\t') {
             continue;
         }
+        const row = rowOfStop(geometry, stop);
         const left = xOfStop(geometry, stop);
-        const right = rowOfStop(geometry, stop + 1) === rowOfStop(geometry, stop) ? xOfStop(geometry, stop + 1) : geometry.rowEnds[rowOfStop(geometry, stop)];
+        const right = rowOfStop(geometry, stop + 1) === row ? xOfStop(geometry, stop + 1) : geometry.rowEnds[row];
         if (right - left < 3) {
             continue;
         }
         const sign = arrowSign(document, right - left - 2, lineHeight, 'se-tab-sign');
         sign.style.left = `${left + 1}px`;
-        sign.style.top = `${rowOfStop(geometry, stop) * lineHeight}px`;
+        sign.style.top = `${row * lineHeight}px`;
         element.append(sign);
     }
 }

package/dist/view.d.ts

@@ -194,6 +194,7 @@ export declare class EditorView {
     setMarkers(markers: readonly ViewMarker[]): void;
     setComposition(text: string | undefined): void;
     notify(message: string): void;
+    blockedByReadOnly(): boolean;
     private foldName;
     announce(message: string): void;
     setInputPopup(popup: EditorInputPopup | null): void;
@@ -317,6 +318,7 @@ export declare class EditorView {
     private wrapSigns;
     private indentOf;
     private effectiveIndent;
+    private nearestIndent;
     private activeGuide;
     private scopeGuide;
     private caretOnGuide;
@@ -393,10 +395,9 @@ export declare class EditorView {
         color: string;
     }[]): void;
     setLineHighlights(highlights: readonly EditorLineHighlight[]): void;
-    private highlightedLines;
+    private runLines;
     private highlightMarks;
     renderCode(container: HTMLElement, text: string, options: EditorCodeBlockOptions): void;
-    private attributedLines;
     onAttributionHover(listener: (hover: {
         id: string;
         rect: EditorRect;

package/dist/view.js

@@ -20,6 +20,9 @@ import { TokenCache } from './tokens.js';
 function sameRect(left, right) {
     return left.left === right.left && left.top === right.top && left.right === right.right && left.bottom === right.bottom;
 }
+function closestElement(target, selector) {
+    return target?.closest?.(selector) ?? null;
+}
 function mapRange(range, map) {
     return { ...range, from: map(range.from), to: map(range.to) };
 }
@@ -453,8 +456,7 @@ export class EditorView {
                 continue;
             }
             const line = this.model.positionAt(token.from).line;
-            const start = this.model.getLine(line).start;
-            const end = this.model.getLine(line).end;
+            const { start, end } = this.model.getLine(line);
             if (token.to > end) {
                 continue;
             }
@@ -486,6 +488,16 @@ export class EditorView {
             this.notice.hidden = true;
         }, NOTICE_MS);
     }
+    /* Tells a person why nothing happened, when the editor is read only and has said why. */
+    blockedByReadOnly() {
+        if (!this.settings.readOnly) {
+            return false;
+        }
+        if (this.settings.readOnlyReason) {
+            this.notify(this.settings.readOnlyReason);
+        }
+        return true;
+    }
     foldName(line, collapsed) {
         const template = (collapsed ? this.settings.messages.unfold : this.settings.messages.fold) ??
             (collapsed ? 'Unfold lines {start} to {end}' : 'Fold lines {start} to {end}');
@@ -1095,16 +1107,16 @@ export class EditorView {
             this.anchorScroll(() => this.layout.configure({ wrapWidth: width }));
         }
     }
-    bracketAt(from, to, head) {
-        if (to - from > 1) {
+    bracketAt({ anchor, head }) {
+        if (Math.abs(head - anchor) > 1) {
             return undefined;
         }
-        const candidates = from !== to ? [from] : [head, head - 1];
+        const candidates = anchor !== head ? [Math.min(anchor, head)] : [head, head - 1];
         return candidates.find((at) => at >= 0 && /[()[\]{}]/.test(this.model.slice(at, at + 1)));
     }
     /* The offset a bracket at the caret pairs with, if it is one. */
     matchingBracket(selection) {
-        const at = this.bracketAt(Math.min(selection.anchor, selection.head), Math.max(selection.anchor, selection.head), selection.head);
+        const at = this.bracketAt(selection);
         return at === undefined ? null : { at, mate: this.model.matchBracket(at, this.settings.language)?.mate };
     }
     /* Draws the highlights of the brackets at the carets that the last frame ran out of lexing for. */
@@ -1151,7 +1163,7 @@ export class EditorView {
     }
     /* The offset of the character under a point of the page, or null over anything that is not text. */
     characterAtPoint(clientX, clientY, target) {
-        if (target?.closest?.('.se-inlay, .se-block, .se-line-action, .se-gutter, .se-sticky, .se-fold-chip, .se-overview')) {
+        if (closestElement(target, '.se-inlay, .se-block, .se-line-action, .se-gutter, .se-sticky, .se-fold-chip, .se-overview')) {
             return null;
         }
         const point = this.contentPoint(clientX, clientY);
@@ -1292,17 +1304,18 @@ export class EditorView {
         if (own !== null) {
             return own;
         }
+        return Math.min(this.nearestIndent(line, -1, GUIDE_SCAN_LINES), this.nearestIndent(line, 1, GUIDE_SCAN_LINES));
+    }
+    /* The indentation of the first line that is not blank within `reach` lines of `line` in `direction`, or 0. */
+    nearestIndent(line, direction, reach) {
         const last = this.model.getLineCount() - 1;
-        const nearest = (direction) => {
-            for (let at = line + direction, steps = 0; at >= 0 && at <= last && steps < GUIDE_SCAN_LINES; at += direction, steps++) {
-                const indent = this.indentOf(at);
-                if (indent !== null) {
-                    return indent;
-                }
+        for (let at = line + direction, steps = 0; at >= 0 && at <= last && steps < reach; at += direction, steps++) {
+            const indent = this.indentOf(at);
+            if (indent !== null) {
+                return indent;
             }
-            return 0;
-        };
-        return Math.min(nearest(-1), nearest(1));
+        }
+        return 0;
     }
     /* The scope guide of the caret, worked out again only when the text or the caret's line is not the one it was for. */
     activeGuide() {
@@ -1319,22 +1332,8 @@ export class EditorView {
         const indent = this.effectiveIndent(line);
         const count = this.model.getLineCount();
         const deeper = (at, column) => at >= 0 && at < count && this.effectiveIndent(at) > column;
-        const next = (() => {
-            for (let at = line + 1; at < count && at < line + GUIDE_SCAN_LINES; at++) {
-                if (this.indentOf(at) !== null) {
-                    return this.indentOf(at);
-                }
-            }
-            return 0;
-        })();
-        const previous = (() => {
-            for (let at = line - 1; at >= 0 && at > line - GUIDE_SCAN_LINES; at--) {
-                if (this.indentOf(at) !== null) {
-                    return this.indentOf(at);
-                }
-            }
-            return 0;
-        })();
+        const next = this.nearestIndent(line, 1, GUIDE_SCAN_LINES - 1);
+        const previous = this.nearestIndent(line, -1, GUIDE_SCAN_LINES - 1);
         // A line that opens a block, or closes one, is at the edge of its guide: the one that sits at its own indentation.
         const opens = indent % size === 0 && (next > indent || previous > indent) && this.indentOf(line) !== null;
         const column = opens ? indent : indent > 0 ? Math.ceil(indent / size - 1) * size : -1;
@@ -1441,7 +1440,7 @@ export class EditorView {
     }
     /* The hint, and the part of its label, an event happened on, or null anywhere else. */
     inlayAt(target) {
-        const element = target?.closest?.('.se-inlay');
+        const element = closestElement(target, '.se-inlay');
         if (!element?.dataset.inlayId) {
             return null;
         }
@@ -1806,13 +1805,13 @@ export class EditorView {
         const lastRow = rows.at(-1);
         const firstLine = rows[0]?.line ?? 0;
         const lastLine = lastRow?.kind === 'text' ? lastRow.lastLine : (lastRow?.line ?? 0);
-        const highlighted = this.highlightedLines(firstLine, lastLine);
+        const highlighted = this.runLines(this.highlights, firstLine, lastLine);
         const shownFrom = this.model.offsetAt({ line: firstLine, column: 0 });
         const shownTo = lastLine + 1 < this.model.getLineCount() ? this.model.offsetAt({ line: lastLine + 1, column: 0 }) : this.model.getLength();
         paintGutter(this.gutterLines, this.layout, rows, {
             lineNumber: (line) => this.lineNumberLabel(line),
-            changes: this.changedLines(rows),
-            attribution: this.attributedLines(firstLine, lastLine),
+            changes: this.changedLines(firstLine, lastLine),
+            attribution: this.runLines(this.attribution, firstLine, lastLine),
             highlights: highlighted,
             activeLines: new Set(selections
                 .filter((selection) => selection.head >= shownFrom && selection.head <= shownTo)
@@ -1893,7 +1892,7 @@ export class EditorView {
             if (index < selections.length - 1 && (selection.head < visibleFrom - 1 || selection.head > visibleTo + 1)) {
                 continue;
             }
-            const at = this.bracketAt(Math.min(selection.anchor, selection.head), Math.max(selection.anchor, selection.head), selection.head);
+            const at = this.bracketAt(selection);
             if (at === undefined) {
                 continue;
             }
@@ -1916,9 +1915,7 @@ export class EditorView {
                 }
             }
         }
-        const selected = selections.flatMap((selection) => selection.anchor === selection.head
-            ? []
-            : this.paintRectangles(Math.min(selection.anchor, selection.head), Math.max(selection.anchor, selection.head), rows));
+        const selected = selections.flatMap(({ anchor, head }) => anchor === head ? [] : this.paintRectangles(Math.min(anchor, head), Math.max(anchor, head), rows));
         paintOverlays(this.overlays, { currentLine, selections: selected, focused, marks });
         paintOver(this.over, [
             { className: 'se-faded', rects: faded },
@@ -2006,12 +2003,8 @@ export class EditorView {
         this.changeCache = { version: this.changeVersion, lines, runs };
         return this.changeCache;
     }
-    /* How each line on screen differs. */
-    changedLines(rows) {
+    changedLines(first, last) {
         const { lines } = this.resolvedChanges();
-        const first = rows[0]?.line ?? 0;
-        const lastRow = rows.at(-1);
-        const last = lastRow?.kind === 'text' ? lastRow.lastLine : (lastRow?.line ?? 0);
         const visible = new Map();
         for (let line = first; line <= last; line++) {
             const kind = lines.get(line);
@@ -2112,8 +2105,8 @@ export class EditorView {
         this.highlights.set(highlights.map((highlight) => ({ id: '', ...highlight })), this.model.getLineCount(), (line) => this.model.getLine(line));
         this.render();
     }
-    highlightedLines(first, last) {
-        return this.highlights.linesIn(first, last, this.model.getLine(first).start, this.model.getLine(last).end, (offset) => this.model.positionAt(offset).line);
+    runLines(runs, first, last) {
+        return runs.linesIn(first, last, this.model.getLine(first).start, this.model.getLine(last).end, (offset) => this.model.positionAt(offset).line);
     }
     /* One box per row, so a row of the host's between two tinted lines stays clear. */
     highlightMarks(rows, lines) {
@@ -2147,9 +2140,6 @@ export class EditorView {
     renderCode(container, text, options) {
         renderCodeBlock(container, text, options.tokens === undefined ? this.tokens.tokenizeText(text.split(/\r?\n/)) : options.tokens, this.settings.tabSize, options);
     }
-    attributedLines(first, last) {
-        return this.attribution.linesIn(first, last, this.model.getLine(first).start, this.model.getLine(last).end, (offset) => this.model.positionAt(offset).line);
-    }
     onAttributionHover(listener) {
         return subscribe(this.attributionListeners, listener);
     }
@@ -2186,7 +2176,7 @@ export class EditorView {
         if (row.kind !== 'text') {
             return null;
         }
-        const bar = this.attributedLines(row.line, row.line).get(row.line);
+        const bar = this.runLines(this.attribution, row.line, row.line).get(row.line);
         if (bar === undefined) {
             return null;
         }
@@ -2203,7 +2193,7 @@ export class EditorView {
     }
     /* A problem's tick says what the problem is when the pointer rests on it, and a press goes to it. The rest of the track lets the pointer through. */
     wireOverview() {
-        const tickOf = (event) => event.target?.closest?.('.se-tick[data-offset]') ?? null;
+        const tickOf = (event) => closestElement(event.target, '.se-tick[data-offset]');
         this.overview.addEventListener('pointerover', (event) => {
             const tick = tickOf(event);
             const title = tick?.getAttribute('data-title');
@@ -2395,10 +2385,8 @@ export class EditorView {
     onGutterMarker(listener) {
         return subscribe(this.gutterMarkerListeners, listener);
     }
-    /* The id of the host's gutter marker when the target is it. */
     gutterMarkerIdOf(target) {
-        const button = target?.closest?.('[data-gutter-marker]');
-        return button?.dataset.gutterMarker ?? null;
+        return closestElement(target, '[data-gutter-marker]')?.dataset.gutterMarker ?? null;
     }
     pressGutterMarker(id) {
         emit(this.gutterMarkerListeners, id);
@@ -2415,17 +2403,16 @@ export class EditorView {
         }
         return byLine;
     }
-    /* The line of the host's gutter button when the target is it. */
     gutterActionLineOf(target) {
-        const button = target?.closest?.('[data-gutter-action]');
+        const button = closestElement(target, '[data-gutter-action]');
         return button ? Number(button.dataset.gutterAction) : null;
     }
     pressGutterAction(line) {
         emit(this.gutterActionListeners, line);
     }
-    /* Whether a click at this point of the gutter is on a fold control, and which line it folds. */
+    /* The line a fold control in the gutter folds. */
     foldLineOf(target) {
-        const button = target?.closest?.('[data-fold-line]');
+        const button = closestElement(target, '[data-fold-line]');
         return button ? Number(button.dataset.foldLine) : null;
     }
     dispose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "type": "module",
   "exports": {
     ".": {
@@ -54,13 +54,13 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor-core": "0.38.0",
-    "linkedom": "^0.18.13",
-    "shiki": "^4.4.3"
+    "@adecore/editor-core": "0.40.0",
+    "linkedom": "^0.18.14",
+    "shiki": "^4.5.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.4.2",
-    "@types/node": "^24.13.6",
+    "@types/bun": "^1.4.4",
+    "@types/node": "^24.19.2",
     "typescript": "^7.0.2"
   },
   "license": "FSL-1.1-MIT",