@adecore/editor 0.41.1 → 0.43.0

package/dist/fake.js

@@ -148,6 +148,8 @@ export class FakeEditor {
         this.readOnly = options.readOnly ?? false;
         this.readOnlyReason = options.readOnlyReason;
         this.label = options.label ?? 'Code editor';
+        this.todoWords = options.todoWords;
+        this.fontSize = options.fontSize ?? null;
         this.revealedLine = options.line ?? null;
         this.column = options.column ?? null;
         this.scrollTop = options.scrollTop ?? null;
@@ -572,9 +574,66 @@ export class FakeEditor {
     setLabel(label) {
         this.label = label;
     }
+    todoWords;
+    setTodoWords(words) {
+        this.todoWords = [...words];
+    }
     setFoldHints(hints) {
         this.foldHints = hints;
     }
+    declarations = null;
+    setDeclarations(positions) {
+        this.declarations = positions;
+    }
+    navigations = new Set();
+    onNavigate(listener) {
+        return subscribe(this.navigations, listener);
+    }
+    /* Stands for a command that navigated: tells the listeners the caret left `from`. */
+    navigate(from) {
+        emit(this.navigations, from);
+    }
+    hasFocus() {
+        return this.focused;
+    }
+    copies = new Set();
+    onCopy(listener) {
+        return subscribe(this.copies, listener);
+    }
+    /* Stands for a copy or cut of a person: tells the listeners what went on the clipboard. */
+    copy(text, wholeLines = false, cut = false) {
+        emit(this.copies, { text, wholeLines, cut });
+    }
+    /* Every paste a host asked for, with its options. */
+    pastes = [];
+    /* Puts the text at every caret, one line per caret when the lines are as many as the carets, and leaves the carets behind it. */
+    paste(text, options) {
+        this.assertLive();
+        this.pastes.push({ text, options });
+        if (this.readOnly || text === '') {
+            return false;
+        }
+        const lines = text.split('\n');
+        const selections = [...this.selections].sort((left, right) => Math.min(left.anchor, left.head) - Math.min(right.anchor, right.head));
+        const perCaret = lines.length === selections.length;
+        const edits = selections.map((selection, index) => ({
+            from: Math.min(selection.anchor, selection.head),
+            to: Math.max(selection.anchor, selection.head),
+            text: perCaret ? lines[index] : text
+        }));
+        return this.edit(edits, 'command', false, () => {
+            let shift = 0;
+            return edits.map((edit) => {
+                const caret = edit.from + shift + edit.text.length;
+                shift += edit.text.length - (edit.to - edit.from);
+                return { anchor: caret, head: caret };
+            });
+        });
+    }
+    wordSources = null;
+    setWordSources(source) {
+        this.wordSources = source;
+    }
     setSmartKeys(keys) {
         this.smartKeys = keys;
     }
@@ -595,10 +654,17 @@ export class FakeEditor {
     setMarkers(markers) {
         this.markers = markers;
     }
-    /* What the host drew as hints last. */
+    /* What the host drew as hints last, every owner's together. */
     inlayHints = [];
-    setInlayHints(hints) {
-        this.inlayHints = hints;
+    inlayOwners = new Map();
+    setInlayHints(hints, owner = 'default') {
+        if (hints.length === 0) {
+            this.inlayOwners.delete(owner);
+        }
+        else {
+            this.inlayOwners.set(owner, hints);
+        }
+        this.inlayHints = [...this.inlayOwners.values()].flat();
     }
     inlayHovers = new Set();
     inlayHandlers = new Set();
@@ -810,12 +876,41 @@ export class FakeEditor {
             }));
         return this.edit(ordered, 'command', options.mergeUndo === true, place);
     }
+    /* The options of every cleanup asked for, in order; the fake changes no text for them. */
+    cleanups = [];
+    /* How often the text was marked as saved, by a cleanup or on its own. */
+    savedMarks = 0;
+    cleanUpWhitespace(options) {
+        this.cleanups.push({ ...options });
+        this.markSaved();
+        return false;
+    }
+    markSaved() {
+        this.savedMarks += 1;
+    }
     setTheme(theme) {
         this.theme = theme;
     }
     refreshFont() {
         this.fontRefreshes += 1;
     }
+    /* The size `setFontSize` set, null for the page's. */
+    fontSize = null;
+    fontSizeListeners = new Set();
+    setFontSize(size) {
+        this.fontSize = size;
+    }
+    getFontSize() {
+        return this.fontSize ?? 13;
+    }
+    onFontSizeChange(listener) {
+        return subscribe(this.fontSizeListeners, listener);
+    }
+    /* What a person zooming would do: the new size goes to the listeners. */
+    zoomTo(size) {
+        this.fontSize = size;
+        emit(this.fontSizeListeners, size);
+    }
     setReadOnly(readOnly, reason) {
         this.readOnly = readOnly;
         this.readOnlyReason = reason;
@@ -837,6 +932,8 @@ export class FakeEditor {
         this.changes.clear();
         this.textChanges.clear();
         this.carets.clear();
+        this.navigations.clear();
+        this.copies.clear();
         this.hovers.clear();
         this.inlayHovers.clear();
         this.inlayHandlers.clear();

package/dist/index.d.ts

@@ -1,7 +1,10 @@
 export { MAX_REPLACEMENT_PAGE, MAX_REPLACEMENT_CHARACTERS } from './search-protocol.ts';
 export { AGENT_COLORS } from './attribution.ts';
 export { findDocComments, MAX_DOC_COMMENTS, type DocComment } from '@adecore/editor-core';
+export { DEFAULT_TODO_WORDS, findTodos, type TodoMatch, type TodoOptions } from '@adecore/editor-core';
+export { detectIndentation, type DetectedIndentation } from '@adecore/editor-core';
 export { createSmartEditorEngine } from './engine.ts';
+export { rememberCopy } from './controller.ts';
 export { DEFAULT_SMART_KEYS } from './smart-keys.ts';
 export { shikiScopeColors, shikiTokenizers } from './shiki.ts';
-export type { Editor, EditorAttributionHover, EditorAttributionMark, EditorMarkColor, EditorBlock, EditorChangeKind, EditorChangeMark, EditorCodeVision, EditorCodeVisionEntry, EditorClick, EditorCodeBlockOptions, EditorClickHandler, EditorCommand, EditorContextMenu, EditorEngine, EditorFindQuery, EditorFoldHints, EditorFoldRangeHint, EditorFoldOutline, EditorFoldRange, EditorFoldSymbol, EditorFolds, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterIcon, EditorGutterMarker, EditorReplacement, EditorIndentation, EditorContentChange, EditorHighlight, EditorHighlightKind, EditorHover, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorLineAction, EditorLineHighlight, EditorMarker, EditorInputPopup, EditorMessages, EditorMarkerSeverity, EditorReveal, EditorRect, EditorSmartKeys, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorApplyEditsOptions, EditorTextChange, EditorTrackedRange, EditorRunCommand, EditorSelectionRanges, EditorTheme, EditorViewCommand, EditorWidget, FoldRole, KeyChord, LineToken, LineTokenKind, ScopeColorSource, ScopeColors, ScopeStyle, EditorSemanticToken, LineTokenizer, SmartEditorEngineOptions, TokenizedLine, TokenizerSource } from './types.ts';
+export type { Editor, EditorAttributionHover, EditorAttributionMark, EditorMarkColor, EditorBlock, EditorChangeKind, EditorChangeMark, EditorCodeVision, EditorCodeVisionEntry, EditorClick, EditorCodeBlockOptions, EditorClickHandler, EditorCommand, EditorContextMenu, EditorEngine, EditorFindQuery, EditorFoldHints, EditorFoldRangeHint, EditorFoldOutline, EditorFoldRange, EditorFoldSymbol, EditorFolds, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterIcon, EditorGutterMarker, EditorReplacement, EditorIndentation, EditorContentChange, EditorHighlight, EditorHighlightKind, EditorHover, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorLineAction, EditorLineHighlight, EditorMarker, EditorInputPopup, EditorMessages, EditorMarkerSeverity, EditorReveal, EditorRect, EditorSmartKeys, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorApplyEditsOptions, EditorCopy, EditorPasteOptions, EditorTextChange, EditorTrackedRange, EditorRunCommand, EditorSelectionRanges, EditorTheme, EditorViewCommand, EditorWhitespaceCleanup, EditorWidget, EditorZoom, FoldRole, KeyChord, LineToken, LineTokenKind, ScopeColorSource, ScopeColors, ScopeStyle, EditorSemanticToken, LineTokenizer, SmartEditorEngineOptions, TokenizedLine, TokenizerSource } from './types.ts';

package/dist/index.js

@@ -1,6 +1,9 @@
 export { MAX_REPLACEMENT_PAGE, MAX_REPLACEMENT_CHARACTERS } from './search-protocol.js';
 export { AGENT_COLORS } from './attribution.js';
 export { findDocComments, MAX_DOC_COMMENTS } from '@adecore/editor-core';
+export { DEFAULT_TODO_WORDS, findTodos } from '@adecore/editor-core';
+export { detectIndentation } from '@adecore/editor-core';
 export { createSmartEditorEngine } from './engine.js';
+export { rememberCopy } from './controller.js';
 export { DEFAULT_SMART_KEYS } from './smart-keys.js';
 export { shikiScopeColors, shikiTokenizers } from './shiki.js';

package/dist/keymap-table.d.ts

@@ -18,17 +18,39 @@ export declare const KEYMAP: {
     readonly deleteLine: KeyBinding;
     readonly moveLineUp: KeyBinding;
     readonly moveLineDown: KeyBinding;
+    readonly moveStatementUp: KeyBinding;
+    readonly moveStatementDown: KeyBinding;
     readonly toggleLineComment: KeyBinding;
     readonly toggleBlockComment: KeyBinding;
     readonly joinLines: KeyBinding;
     readonly startNewLine: KeyBinding;
+    readonly completeCurrentStatement: KeyBinding;
+    readonly hippieCompletion: KeyBinding;
+    readonly hippieBackwardCompletion: KeyBinding;
     readonly startNewLineBefore: KeyBinding;
     readonly splitLine: KeyBinding;
     readonly toggleCase: KeyBinding;
     readonly autoIndentLines: KeyBinding;
+    readonly sortLines: KeyBinding;
+    readonly reverseLines: KeyBinding;
+    readonly uniqueLines: KeyBinding;
+    readonly convertIndentsToSpaces: KeyBinding;
+    readonly convertIndentsToTabs: KeyBinding;
     readonly expandSelection: KeyBinding;
     readonly shrinkSelection: KeyBinding;
     readonly matchBrace: KeyBinding;
+    readonly methodUp: KeyBinding;
+    readonly methodDown: KeyBinding;
+    readonly lastEditLocation: KeyBinding;
+    readonly nextEditLocation: KeyBinding;
+    readonly pasteFromHistory: KeyBinding;
+    readonly pasteAsPlainText: KeyBinding;
+    readonly nextChange: KeyBinding;
+    readonly previousChange: KeyBinding;
+    readonly codeBlockStart: KeyBinding;
+    readonly codeBlockEnd: KeyBinding;
+    readonly codeBlockStartWithSelection: KeyBinding;
+    readonly codeBlockEndWithSelection: KeyBinding;
     readonly selectNextOccurrence: KeyBinding;
     readonly unselectOccurrence: KeyBinding;
     readonly selectAllOccurrences: KeyBinding;
@@ -64,6 +86,9 @@ export declare const KEYMAP: {
     readonly expandAllToLevel3: KeyBinding;
     readonly expandAllToLevel4: KeyBinding;
     readonly expandAllToLevel5: KeyBinding;
+    readonly increaseFontSize: KeyBinding;
+    readonly decreaseFontSize: KeyBinding;
+    readonly resetFontSize: KeyBinding;
     readonly triggerCompletion: KeyBinding;
     readonly parameterInfo: KeyBinding;
     readonly quickInfo: KeyBinding;
@@ -72,6 +97,7 @@ export declare const KEYMAP: {
     readonly renameSymbol: KeyBinding;
     readonly organizeImports: KeyBinding;
     readonly formatDocument: KeyBinding;
+    readonly wrapWithAbbreviation: KeyBinding;
     readonly selectionToChat: KeyBinding;
     readonly inlineEdit: KeyBinding;
     readonly suggestInline: KeyBinding;
@@ -83,6 +109,7 @@ export declare const KEYMAP: {
     readonly peekDefinition: KeyBinding;
     readonly peekReferences: KeyBinding;
     readonly callHierarchy: KeyBinding;
+    readonly typeHierarchy: KeyBinding;
     readonly toggleRenderedDocs: KeyBinding;
     readonly historyBack: KeyBinding;
     readonly historyForward: KeyBinding;
@@ -96,7 +123,7 @@ export declare const KEYMAP: {
     readonly replace: KeyBinding;
 };
 export type KeymapId = keyof typeof KEYMAP;
-export type OptionalKeymapId = 'toggleRenderedDocs';
+export type OptionalKeymapId = 'toggleRenderedDocs' | 'increaseFontSize' | 'decreaseFontSize' | 'resetFontSize' | 'sortLines' | 'reverseLines' | 'uniqueLines' | 'convertIndentsToSpaces' | 'convertIndentsToTabs' | 'completeCurrentStatement' | 'hippieCompletion' | 'hippieBackwardCompletion' | 'moveStatementUp' | 'moveStatementDown' | 'lastEditLocation' | 'nextEditLocation' | 'methodUp' | 'methodDown' | 'pasteFromHistory' | 'pasteAsPlainText' | 'nextChange' | 'previousChange' | 'codeBlockStart' | 'codeBlockEnd' | 'codeBlockStartWithSelection' | 'codeBlockEndWithSelection' | 'wrapWithAbbreviation' | 'typeHierarchy';
 export type Keymap = Readonly<Record<Exclude<KeymapId, OptionalKeymapId>, KeyBinding> & Partial<Record<OptionalKeymapId, KeyBinding>>>;
 export type KeymapOverrides = Partial<Record<KeymapId, Partial<KeyBinding>>>;
 export declare const KEYMAP_IDS: KeymapId[];

package/dist/keymap-table.js

@@ -15,17 +15,41 @@ export const KEYMAP = {
     deleteLine: bind('Mod+Backspace', 'Mod+Y'),
     moveLineUp: bind('Alt+Shift+ArrowUp'),
     moveLineDown: bind('Alt+Shift+ArrowDown'),
+    moveStatementUp: bind('Mod+Shift+ArrowUp'),
+    moveStatementDown: bind('Mod+Shift+ArrowDown'),
     toggleLineComment: bind('Mod+/'),
     toggleBlockComment: bind('Mod+Alt+/', 'Mod+Shift+/'),
     joinLines: bind('Ctrl+Shift+J'),
     startNewLine: bind('Shift+Enter'),
+    completeCurrentStatement: bind('Mod+Shift+Enter'),
+    hippieCompletion: bind('Alt+/'),
+    hippieBackwardCompletion: bind('Alt+Shift+/'),
     startNewLineBefore: bind('Mod+Alt+Enter'),
     splitLine: bind('Mod+Enter'),
     toggleCase: bind('Mod+Shift+U'),
     autoIndentLines: bind('Ctrl+Alt+I'),
+    // The platform binds no chord to these, so they live in the menu and the palette.
+    sortLines: bind(null),
+    reverseLines: bind(null),
+    uniqueLines: bind(null),
+    convertIndentsToSpaces: bind(null),
+    convertIndentsToTabs: bind(null),
     expandSelection: bind('Alt+ArrowUp', 'Ctrl+W'),
-    shrinkSelection: bind('Alt+ArrowDown'),
+    // Off macOS Alt+ArrowDown is Next Method, as in IntelliJ, so Shrink Selection takes its own chord there.
+    shrinkSelection: bind('Alt+ArrowDown', 'Ctrl+Shift+W'),
     matchBrace: bind('Ctrl+M', 'Ctrl+Shift+M'),
+    methodUp: bind('Ctrl+Shift+ArrowUp', 'Alt+ArrowUp'),
+    methodDown: bind('Ctrl+Shift+ArrowDown', 'Alt+ArrowDown'),
+    lastEditLocation: bind('Mod+Shift+Backspace'),
+    nextEditLocation: bind(null),
+    pasteFromHistory: bind('Mod+Shift+V'),
+    pasteAsPlainText: bind('Mod+Alt+Shift+V'),
+    nextChange: bind('Ctrl+Alt+Shift+ArrowDown'),
+    previousChange: bind('Ctrl+Alt+Shift+ArrowUp'),
+    codeBlockStart: bind('Mod+Alt+[', 'Ctrl+['),
+    codeBlockEnd: bind('Mod+Alt+]', 'Ctrl+]'),
+    codeBlockStartWithSelection: bind('Mod+Alt+Shift+[', 'Ctrl+Shift+['),
+    codeBlockEndWithSelection: bind('Mod+Alt+Shift+]', 'Ctrl+Shift+]'),
     selectNextOccurrence: bind('Ctrl+G', 'Alt+J'),
     unselectOccurrence: bind('Ctrl+Shift+G', 'Alt+Shift+J'),
     selectAllOccurrences: bind('Meta+Ctrl+G', 'Ctrl+Alt+Shift+J'),
@@ -45,9 +69,10 @@ export const KEYMAP = {
     smartEnd: bind('Meta+ArrowRight', null),
     selectSmartEnd: bind('Meta+Shift+ArrowRight', null),
     textStart: bind('Meta+ArrowUp', null),
-    selectTextStart: bind('Meta+Shift+ArrowUp', null),
+    // IntelliJ binds Cmd+Shift+ArrowUp and ArrowDown to Move Statement on macOS, where Cmd+Shift+Home and End still select to the text edges.
+    selectTextStart: bind(null),
     textEnd: bind('Meta+ArrowDown', null),
-    selectTextEnd: bind('Meta+Shift+ArrowDown', null),
+    selectTextEnd: bind(null),
     collapse: bind('Mod+-'),
     expand: bind('Mod+='),
     collapseAll: bind('Mod+Shift+-'),
@@ -63,6 +88,10 @@ export const KEYMAP = {
     expandAllToLevel3: bind(null),
     expandAllToLevel4: bind(null),
     expandAllToLevel5: bind(null),
+    // The platform binds no chord to these, and the zoom chords of other editors are the fold keys here.
+    increaseFontSize: bind(null),
+    decreaseFontSize: bind(null),
+    resetFontSize: bind(null),
     triggerCompletion: bind('Ctrl+Space'),
     parameterInfo: bind('Mod+P'),
     quickInfo: bind('Ctrl+J', 'Ctrl+Q'),
@@ -71,6 +100,7 @@ export const KEYMAP = {
     renameSymbol: bind('Shift+F6'),
     organizeImports: bind('Ctrl+Alt+O'),
     formatDocument: bind('Mod+Alt+L'),
+    wrapWithAbbreviation: bind('Mod+Alt+J'),
     selectionToChat: bind(null),
     inlineEdit: bind(null),
     suggestInline: bind(null),
@@ -82,6 +112,7 @@ export const KEYMAP = {
     peekDefinition: bind('Alt+Space', 'Ctrl+Shift+I'),
     peekReferences: bind('Alt+F7'),
     callHierarchy: bind('Ctrl+Alt+H'),
+    typeHierarchy: bind('Ctrl+H'),
     toggleRenderedDocs: bind('Ctrl+Alt+Q'),
     historyBack: bind('Mod+[', 'Ctrl+Alt+ArrowLeft'),
     historyForward: bind('Mod+]', 'Ctrl+Alt+ArrowRight'),

package/dist/keymap.js

@@ -16,17 +16,36 @@ const ACTIONS = {
     deleteLine: command('deleteLine'),
     moveLineUp: command('moveLineUp'),
     moveLineDown: command('moveLineDown'),
+    moveStatementUp: command('moveStatementUp'),
+    moveStatementDown: command('moveStatementDown'),
     toggleLineComment: command('toggleLineComment'),
     toggleBlockComment: command('toggleBlockComment'),
     joinLines: command('joinLines'),
     startNewLine: command('startNewLine'),
+    completeCurrentStatement: command('completeCurrentStatement'),
+    hippieCompletion: command('hippieCompletion'),
+    hippieBackwardCompletion: command('hippieBackwardCompletion'),
     startNewLineBefore: command('startNewLineBefore'),
     splitLine: command('splitLine'),
     toggleCase: command('toggleCase'),
     autoIndentLines: command('autoIndentLines'),
+    sortLines: command('sortLines'),
+    reverseLines: command('reverseLines'),
+    uniqueLines: command('uniqueLines'),
+    convertIndentsToSpaces: command('convertIndentsToSpaces'),
+    convertIndentsToTabs: command('convertIndentsToTabs'),
     expandSelection: command('expandSelection'),
     shrinkSelection: command('shrinkSelection'),
     matchBrace: { type: 'bracket' },
+    methodUp: view('methodUp'),
+    methodDown: view('methodDown'),
+    pasteAsPlainText: view('pasteAsPlainText'),
+    nextChange: view('nextChange'),
+    previousChange: view('previousChange'),
+    codeBlockStart: command('codeBlockStart'),
+    codeBlockEnd: command('codeBlockEnd'),
+    codeBlockStartWithSelection: command('codeBlockStartWithSelection'),
+    codeBlockEndWithSelection: command('codeBlockEndWithSelection'),
     selectNextOccurrence: command('selectNextOccurrence'),
     unselectOccurrence: command('unselectOccurrence'),
     selectAllOccurrences: command('selectAllOccurrences'),
@@ -59,7 +78,10 @@ const ACTIONS = {
     expandAllToLevel3: view('expandAllToLevel3'),
     expandAllToLevel4: view('expandAllToLevel4'),
     expandAllToLevel5: view('expandAllToLevel5'),
-    toggleColumnMode: view('toggleColumnMode')
+    toggleColumnMode: view('toggleColumnMode'),
+    increaseFontSize: view('increaseFontSize'),
+    decreaseFontSize: view('decreaseFontSize'),
+    resetFontSize: view('resetFontSize')
 };
 const PUNCTUATION_CODES = {
     ',': 'Comma',

package/dist/layout.d.ts

@@ -36,7 +36,9 @@ export interface Inlay {
     gapRight?: number;
     composition?: boolean;
     ghost?: boolean;
+    swatch?: string;
 }
+export declare const SWATCH_SIZE = 12;
 export interface BlockWidget {
     id: string;
     at: number;

package/dist/layout.js

@@ -11,6 +11,8 @@ export function subRowBand(top, subRows, lineHeight, window, block = 1) {
         last: Math.min(subRows - 1, Math.ceil((last + 1) / block) * block - 1)
     };
 }
+/* The side of a swatch in pixels, without its gaps. */
+export const SWATCH_SIZE = 12;
 export const TEXT_PADDING = 0;
 export const BOTTOM_PADDING = 8;
 export const RIGHT_PADDING = 16;
@@ -154,9 +156,12 @@ export function scanDenseLine(line, metrics, limit, lineInlays) {
             flushRun(offset);
             const inlay = lineInlays[nextInlay++];
             const shown = visibleBidi(inlay.text);
+            const gaps = (inlay.gapLeft ?? 0) + (inlay.gapRight ?? 0);
             const width = inlay.composition || inlay.ghost
                 ? metrics.measureText(shown)
-                : Math.max(8, metrics.measureInlay(shown) + 12) + (inlay.gapLeft ?? 0) + (inlay.gapRight ?? 0);
+                : inlay.swatch !== undefined
+                    ? SWATCH_SIZE + gaps
+                    : Math.max(8, metrics.measureInlay(shown) + 12) + gaps;
             geometry.inlays.push({ inlay, x, width, subRow: row });
             x += width;
         }

package/dist/outline.d.ts

@@ -37,6 +37,7 @@ export declare class Outline {
     setStructure(entries: OutlineEntry[]): void;
     setProvided(blocks: readonly EditorBlock[] | null, document: OutlineDocument): void;
     edited(batches: readonly (readonly DocumentChange[])[]): void;
+    declarationStops(document: OutlineDocument): number[];
     blocks(document: OutlineDocument): readonly OutlineBlock[];
 }
 export interface StickyRows {

package/dist/outline.js

@@ -140,6 +140,16 @@ export class Outline {
         this.provided = this.provided === null ? null : move(this.provided);
         this.version++;
     }
+    /* Where the named blocks of the structure declare their name, in no order: the stops of Method Up and Down. */
+    declarationStops(document) {
+        return this.structure.flatMap((entry) => {
+            if (entry.name === undefined) {
+                return [];
+            }
+            const header = document.getLine(document.positionAt(entry.from).line);
+            return [header.start + Math.max(0, header.text.indexOf(entry.name))];
+        });
+    }
     /* Outermost first. Of two blocks that start on one line, only the larger one. */
     blocks(document) {
         if (this.cache?.version !== this.version) {

package/dist/overview.d.ts

@@ -1,4 +1,4 @@
-export type OverviewKind = 'added' | 'modified' | 'deleted' | 'find' | 'find-current' | 'occurrence' | 'info' | 'warning' | 'error';
+export type OverviewKind = 'added' | 'modified' | 'deleted' | 'find' | 'find-current' | 'occurrence' | 'todo' | 'info' | 'warning' | 'error';
 export interface OverviewSpan {
     kind: OverviewKind;
     top: number;

package/dist/paint.js

@@ -102,10 +102,20 @@ export function lineElement(document, geometry, tokens, lineHeight, band, whites
             continue;
         }
         const span = document.createElement('span');
-        span.className = box.inlay.ghost ? 'se-ghost' : box.inlay.composition ? 'se-composition' : 'se-inlay';
+        span.className = box.inlay.ghost
+            ? 'se-ghost'
+            : box.inlay.composition
+                ? 'se-composition'
+                : box.inlay.swatch !== undefined
+                    ? 'se-inlay se-swatch'
+                    : 'se-inlay';
         span.dataset.inlayId = box.inlay.id;
         const { parts } = box.inlay;
-        if (parts === undefined) {
+        if (box.inlay.swatch !== undefined) {
+            span.style.backgroundColor = box.inlay.swatch;
+            span.setAttribute('aria-label', box.inlay.text);
+        }
+        else if (parts === undefined) {
             span.textContent = visibleBidi(box.inlay.text);
         }
         else {

package/dist/todos.d.ts

@@ -0,0 +1,23 @@
+import { type DocumentModel, type TodoMatch } from '@adecore/editor-core';
+import type { LineToken } from './types.ts';
+export type TodoMark = TodoMatch & {
+    readonly text: string;
+};
+export declare class TodoMarks {
+    private readonly model;
+    private readonly changed;
+    private words;
+    private language;
+    private revision;
+    private readonly lines;
+    private timer;
+    private all;
+    version: number;
+    constructor(model: DocumentModel, changed: () => void);
+    get marks(): readonly TodoMark[];
+    configure(language: string | undefined, words: readonly string[] | undefined): void;
+    styled(line: number, base: readonly LineToken[] | null): readonly LineToken[] | null;
+    schedule(): void;
+    refresh(): void;
+    dispose(): void;
+}

package/dist/todos.js

@@ -0,0 +1,86 @@
+import { DEFAULT_TODO_WORDS } from '@adecore/editor-core';
+import { overlayTokens } from './semantic.js';
+const TODO_COLOR = 'var(--editor-todo)';
+const ITALIC = 1;
+/* The marks in the scroll track read the whole document, so they wait for a pause in editing as the folds do. */
+const TODO_DELAY_MS = 300;
+const TODO_LIMIT = 2_000_000;
+const CACHED_LINES = 600;
+/*
+ * The TODO comments of a view: drawn in their own color over the grammar's on the lines being painted,
+ * and listed for the whole document a moment after the last edit, for the ticks in the scroll track.
+ */
+export class TodoMarks {
+    model;
+    changed;
+    words = DEFAULT_TODO_WORDS;
+    /* Empty until the first `configure`, which reads the document. */
+    language = '';
+    revision = -1;
+    lines = new Map();
+    timer;
+    all = [];
+    /* Counts every new list, so a painter can tell its ticks are stale. */
+    version = 0;
+    constructor(model, changed) {
+        this.model = model;
+        this.changed = changed;
+    }
+    get marks() {
+        return this.all;
+    }
+    configure(language, words) {
+        const nextLanguage = language ?? 'plaintext';
+        const nextWords = words ?? DEFAULT_TODO_WORDS;
+        if (nextLanguage === this.language && nextWords.join('\n') === this.words.join('\n')) {
+            return;
+        }
+        this.language = nextLanguage;
+        this.words = nextWords;
+        this.revision = -1;
+        this.refresh();
+    }
+    /* The line's tokens with its TODOs drawn over them, the same array for as long as neither changed. */
+    styled(line, base) {
+        if (this.words.length === 0) {
+            return base;
+        }
+        const revision = this.model.getRevision();
+        if (revision !== this.revision || this.lines.size > CACHED_LINES) {
+            this.revision = revision;
+            this.lines.clear();
+        }
+        const cached = this.lines.get(line);
+        if (cached !== undefined && cached.base === base) {
+            return cached.result;
+        }
+        const matches = this.model.findTodos(this.language, { words: this.words }, line, line);
+        let result = base;
+        if (matches.length > 0) {
+            const { start, end } = this.model.getLine(line);
+            const spans = matches.map((match) => ({ from: match.from - start, to: match.to - start, color: TODO_COLOR, fontStyle: ITALIC }));
+            result = overlayTokens(base ?? [{ length: end - start, color: '', fontStyle: 0 }], spans);
+        }
+        this.lines.set(line, { base, result });
+        return result;
+    }
+    schedule() {
+        clearTimeout(this.timer);
+        this.timer = setTimeout(() => this.refresh(), TODO_DELAY_MS);
+    }
+    /* Reads the TODOs of the whole document now, which otherwise waits for a pause in editing. */
+    refresh() {
+        clearTimeout(this.timer);
+        const found = this.words.length === 0 || this.model.getLength() > TODO_LIMIT ? [] : this.model.findTodos(this.language, { words: this.words });
+        const next = found.map((match) => ({ ...match, text: this.model.slice(match.from, match.to) }));
+        if (next.length === 0 && this.all.length === 0) {
+            return;
+        }
+        this.all = next;
+        this.version++;
+        this.changed();
+    }
+    dispose() {
+        clearTimeout(this.timer);
+    }
+}