@adecore/editor 0.41.1 → 0.42.0

package/dist/controller.d.ts

@@ -7,6 +7,8 @@ export interface ControllerOptions {
     apple: boolean;
     save(): void;
     blur(): void;
+    zoom(step: -1 | 0 | 1): void;
+    wheelZooms(): boolean;
 }
 export declare class InputController {
     private readonly native;
@@ -25,6 +27,7 @@ export declare class InputController {
     private selectionRanges;
     private expansions;
     private lastInputAt;
+    private readonly wheelZoom;
     private desiredXs;
     private keepDesiredXs;
     private readonly view;
@@ -41,6 +44,7 @@ export declare class InputController {
     private paste;
     private commandOptions;
     private viewCommand;
+    private wheel;
     command(name: EditorRunCommand): boolean;
     setSelectionRanges(provider: EditorSelectionRanges | null): void;
     private expandThrough;

package/dist/controller.js

@@ -6,6 +6,7 @@ import { NativeInput } from './native-input.js';
 import { columnSelections, sameCell } from './column-selection.js';
 import { PointerSelection } from './pointer.js';
 import { TouchSelection } from './touch.js';
+import { WheelZoom } from './zoom.js';
 const MODIFYING = new Set([
     'deleteWordLeft',
     'deleteWordRight',
@@ -28,7 +29,12 @@ const MODIFYING = new Set([
     'outdent',
     'insertNewline',
     'smartBackspace',
-    'deleteForward'
+    'deleteForward',
+    'sortLines',
+    'reverseLines',
+    'uniqueLines',
+    'convertIndentsToSpaces',
+    'convertIndentsToTabs'
 ]);
 const VIEW_COMMANDS = new Set([
     'collapseRegion',
@@ -45,8 +51,12 @@ const VIEW_COMMANDS = new Set([
     'expandAllToLevel3',
     'expandAllToLevel4',
     'expandAllToLevel5',
-    'toggleColumnMode'
+    'toggleColumnMode',
+    'increaseFontSize',
+    'decreaseFontSize',
+    'resetFontSize'
 ]);
+const ZOOM_STEPS = { increaseFontSize: 1, decreaseFontSize: -1, resetFontSize: 0 };
 /* The clipboard text of the last copy or cut of a bare caret, which pastes back as whole lines. Shared, since it can be pasted in another editor. */
 let lineClip = null;
 function selectionSignature(selections) {
@@ -79,6 +89,7 @@ export class InputController {
     /* The Extend Selection presses that wait for a server's ranges, which are answered one after the other. */
     expansions = Promise.resolve();
     lastInputAt = 0;
+    wheelZoom = new WheelZoom();
     desiredXs = [];
     keepDesiredXs = false;
     view;
@@ -180,7 +191,7 @@ export class InputController {
         this.listen(input, 'copy', (event) => this.copy(event, false));
         this.listen(input, 'cut', (event) => this.copy(event, true));
         this.listen(viewport, 'scroll', () => this.view.scrolled());
-        this.listen(viewport, 'wheel', () => this.view.cancelScroll());
+        this.listen(viewport, 'wheel', (event) => this.wheel(event));
         this.listen(viewport, 'pointermove', (event) => this.view.hoverMoved(event));
         this.listen(viewport, 'pointerleave', () => {
             this.view.setHover(null);
@@ -300,6 +311,10 @@ export class InputController {
     /* Folding is the view's, since it knows where the ranges are. */
     viewCommand(name) {
         const { view } = this;
+        if (name in ZOOM_STEPS) {
+            this.options.zoom(ZOOM_STEPS[name]);
+            return true;
+        }
         if (view.settings.folding === false && name !== 'toggleColumnMode') {
             return false;
         }
@@ -323,6 +338,18 @@ export class InputController {
         run[name]();
         return true;
     }
+    /* A pinch comes as the wheel with Ctrl, on every platform. */
+    wheel(event) {
+        this.view.cancelScroll();
+        if (!(event.ctrlKey || (this.options.apple && event.metaKey)) || !this.options.wheelZooms()) {
+            return;
+        }
+        event.preventDefault();
+        const step = this.wheelZoom.step(event);
+        if (step !== 0) {
+            this.options.zoom(step);
+        }
+    }
     /* Runs a model command on every caret, with the folds that would hide its result opened first. */
     command(name) {
         if (VIEW_COMMANDS.has(name)) {

package/dist/editor.css

@@ -17,6 +17,7 @@
     --editor-added: var(--status-idle);
     --editor-modified: var(--accent);
     --editor-deleted: var(--status-error);
+    --editor-todo: var(--status-running);
     --editor-mark-number-mix: 72%;
     --editor-mark-bar-width: 3px;
     --editor-mark-gap: 4px;
@@ -38,6 +39,7 @@
     --editor-margin: color-mix(in srgb, var(--text) 16%, transparent);
     --editor-whitespace: color-mix(in srgb, var(--text) 32%, transparent);
     --editor-hatch: color-mix(in srgb, var(--text) 10%, transparent);
+    --editor-todo: var(--status-idle);
     --editor-mark-number-mix: 82%;
     --editor-sticky-shadow: color-mix(in srgb, black 60%, transparent);
 }
@@ -478,11 +480,15 @@
     left: 6px;
     background: var(--editor-occurrence);
 }
+.se-tick-todo,
 .se-tick-error,
 .se-tick-warning,
 .se-tick-info {
     left: 10px;
 }
+.se-tick-todo {
+    background: var(--editor-todo);
+}
 /* The only part of the track that takes the pointer, with a wider reach than the 4px it draws. */
 .se-tick[data-offset] {
     pointer-events: auto;

package/dist/engine.js

@@ -6,6 +6,7 @@ import { resolveSmartKeys } from './smart-keys.js';
 import { emit, subscribe } from './listeners.js';
 import { fillLens, lensSignature } from './lens.js';
 import { EditorView } from './view.js';
+import { clampFontSize, fontSizeRange } from './zoom.js';
 const DEFAULT_TAB_SIZE = 4;
 const DEFAULT_LABEL = 'Code editor';
 const DEFAULT_WIDGET_OWNER = 'default';
@@ -23,6 +24,9 @@ class SmartEditor {
     caretOffset = 0;
     saves = new Set();
     blurs = new Set();
+    fontSizes = new Set();
+    fontSizeRange;
+    fontSize = null;
     subscription;
     language;
     theme;
@@ -35,6 +39,7 @@ class SmartEditor {
     engine;
     constructor(engine, element, options) {
         this.engine = engine;
+        this.fontSizeRange = fontSizeRange(options.zoom);
         this.model = new DocumentModel(options.text);
         this.language = options.language;
         this.theme = options.theme;
@@ -54,7 +59,8 @@ class SmartEditor {
             whitespace: options.whitespace === true,
             rightMargin: options.rightMargin ?? null,
             foldOutline: options.foldOutline ?? 'hover',
-            folding: options.folding !== false
+            folding: options.folding !== false,
+            todoWords: options.todoWords
         };
         this.view = new EditorView(element, this.model, this.settings);
         this.grammarPreparation = new GrammarPreparation(this.model, () => this.view.grammarChanged());
@@ -63,8 +69,13 @@ class SmartEditor {
             keymap: engine.keymap,
             apple: engine.apple ?? false,
             save: () => emit(this.saves),
-            blur: () => emit(this.blurs)
+            blur: () => emit(this.blurs),
+            zoom: (step) => this.zoom(step),
+            wheelZooms: () => options.zoom?.wheel !== false
         });
+        if (options.fontSize !== undefined) {
+            this.setFontSize(options.fontSize);
+        }
         this.revision = this.model.getRevision();
         this.caretOffset = this.model.getPrimary().head;
         this.subscription = this.model.subscribe((snapshot) => {
@@ -273,6 +284,14 @@ class SmartEditor {
             return false;
         }
     }
+    cleanUpWhitespace(options) {
+        const changed = !this.settings.readOnly && this.model.cleanUpWhitespace({ ...options, language: this.settings.language });
+        this.model.markSaved();
+        return changed;
+    }
+    markSaved() {
+        this.model.markSaved();
+    }
     setMarkers(markers) {
         this.view.setMarkers(markers.map((marker) => ({
             severity: marker.severity,
@@ -655,6 +674,10 @@ class SmartEditor {
         this.settings.label = label;
         this.view.applySettings();
     }
+    setTodoWords(words) {
+        this.settings.todoWords = [...words];
+        this.view.applySettings();
+    }
     setFoldHints(hints) {
         this.view.setFoldHints(hints === null ? null : this.foldHintsByOffset(hints));
     }
@@ -700,6 +723,32 @@ class SmartEditor {
     refreshFont() {
         this.view.refreshFont();
     }
+    setFontSize(size) {
+        const next = size === null || !Number.isFinite(size) ? null : clampFontSize(size, this.fontSizeRange);
+        if (next !== this.fontSize) {
+            this.fontSize = next;
+            this.view.setFontSize(next);
+        }
+    }
+    getFontSize() {
+        return this.view.getFontSize();
+    }
+    onFontSizeChange(listener) {
+        return subscribe(this.fontSizes, listener);
+    }
+    /* Steps from the size on screen, so the first step from the page's size is one pixel away from it. */
+    zoom(step) {
+        const before = this.fontSize;
+        const current = this.view.getFontSize();
+        // A page size outside the range must not make a step the other way.
+        if (step !== 0 && Math.sign(clampFontSize(current + step, this.fontSizeRange) - current) !== step) {
+            return;
+        }
+        this.setFontSize(step === 0 ? null : current + step);
+        if (this.fontSize !== before) {
+            emit(this.fontSizes, this.fontSize);
+        }
+    }
     setReadOnly(readOnly, reason) {
         this.settings.readOnly = readOnly;
         this.settings.readOnlyReason = reason;
@@ -728,6 +777,7 @@ class SmartEditor {
         this.carets.clear();
         this.saves.clear();
         this.blurs.clear();
+        this.fontSizes.clear();
         this.subscription.dispose();
         this.controller.dispose();
         this.view.dispose();

package/dist/fake.d.ts

@@ -1,4 +1,4 @@
-import type { Editor, EditorAttributionHover, EditorAttributionMark, EditorBlock, EditorCodeBlockOptions, EditorLineAction, EditorReplacement, EditorLineHighlight, LineToken, EditorChangeMark, EditorCodeVision, EditorClick, EditorClickHandler, EditorContextMenu, EditorContentChange, EditorEngine, EditorFindQuery, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterMarker, EditorHighlight, EditorHover, EditorIndentation, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorInputPopup, EditorMarker, EditorMessages, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorReveal, EditorRect, EditorRunCommand, EditorSelectionRanges, EditorFoldHints, EditorFoldOutline, EditorFolds, EditorSemanticToken, EditorSmartKeys, EditorApplyEditsOptions, EditorTextChange, EditorTrackedRange, EditorTheme, EditorWidget } from './types.ts';
+import type { Editor, EditorAttributionHover, EditorAttributionMark, EditorBlock, EditorCodeBlockOptions, EditorLineAction, EditorReplacement, EditorLineHighlight, LineToken, EditorChangeMark, EditorCodeVision, EditorClick, EditorClickHandler, EditorContextMenu, EditorContentChange, EditorEngine, EditorFindQuery, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterMarker, EditorHighlight, EditorHover, EditorIndentation, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorInputPopup, EditorMarker, EditorMessages, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorReveal, EditorRect, EditorRunCommand, EditorSelectionRanges, EditorFoldHints, EditorFoldOutline, EditorFolds, EditorSemanticToken, EditorSmartKeys, EditorApplyEditsOptions, EditorTextChange, EditorTrackedRange, EditorTheme, EditorWhitespaceCleanup, EditorWidget } from './types.ts';
 import { type Listener } from './listeners.ts';
 export declare class FakeEditor implements Editor {
     readonly element: HTMLElement;
@@ -139,6 +139,8 @@ export declare class FakeEditor implements Editor {
     setFoldOutline(outline: EditorFoldOutline): void;
     label: string;
     setLabel(label: string): void;
+    todoWords: readonly string[] | undefined;
+    setTodoWords(words: readonly string[]): void;
     setFoldHints(hints: EditorFoldHints | null): void;
     setSmartKeys(keys: Partial<EditorSmartKeys>): void;
     setIndentation(indentation: EditorIndentation): void;
@@ -224,8 +226,18 @@ export declare class FakeEditor implements Editor {
     openContextMenu(menu: EditorContextMenu): void;
     press(event: Pick<KeyboardEvent, 'key'> & Partial<KeyboardEvent>): boolean;
     applyEdits(edits: readonly EditorContentChange[], options?: EditorApplyEditsOptions): boolean;
+    readonly cleanups: EditorWhitespaceCleanup[];
+    savedMarks: number;
+    cleanUpWhitespace(options: EditorWhitespaceCleanup): boolean;
+    markSaved(): void;
     setTheme(theme: EditorTheme): void;
     refreshFont(): void;
+    fontSize: number | null;
+    private readonly fontSizeListeners;
+    setFontSize(size: number | null): void;
+    getFontSize(): number;
+    onFontSizeChange(listener: (size: number | null) => void): () => void;
+    zoomTo(size: number | null): void;
     setReadOnly(readOnly: boolean, reason?: string): void;
     isReadOnly(): boolean;
     readonly commands: EditorRunCommand[];

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,6 +574,10 @@ export class FakeEditor {
     setLabel(label) {
         this.label = label;
     }
+    todoWords;
+    setTodoWords(words) {
+        this.todoWords = [...words];
+    }
     setFoldHints(hints) {
         this.foldHints = hints;
     }
@@ -810,12 +816,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;

package/dist/index.d.ts

@@ -1,7 +1,9 @@
 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 { 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, 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,8 @@
 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 { DEFAULT_SMART_KEYS } from './smart-keys.js';
 export { shikiScopeColors, shikiTokenizers } from './shiki.js';

package/dist/keymap-table.d.ts

@@ -26,6 +26,11 @@ export declare const KEYMAP: {
     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;
@@ -64,6 +69,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;
@@ -96,7 +104,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';
 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

@@ -23,6 +23,12 @@ export const KEYMAP = {
     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'),
     matchBrace: bind('Ctrl+M', 'Ctrl+Shift+M'),
@@ -63,6 +69,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'),

package/dist/keymap.js

@@ -24,6 +24,11 @@ const ACTIONS = {
     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' },
@@ -59,7 +64,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/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/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);
+    }
+}

package/dist/types.d.ts

@@ -1,9 +1,15 @@
 import type { EditorSearchClientOptions } from './search-client.ts';
 import type { Keymap } from './keymap-table.ts';
-import type { EditorCommand, FoldRole } from '@adecore/editor-core';
+import type { EditorCommand, FoldRole, WhitespaceCleanupOptions } from '@adecore/editor-core';
 export type { EditorCommand, FoldRole };
+export type EditorWhitespaceCleanup = WhitespaceCleanupOptions;
 export type EditorFoldOutline = 'off' | 'hover' | 'always';
-export type EditorViewCommand = 'collapseRegion' | 'expandRegion' | 'collapseAllRegions' | 'expandAllRegions' | 'collapseRegionRecursively' | 'expandRegionRecursively' | 'foldSelection' | 'collapseDocComments' | 'expandDocComments' | 'expandAllToLevel1' | 'expandAllToLevel2' | 'expandAllToLevel3' | 'expandAllToLevel4' | 'expandAllToLevel5' | 'toggleColumnMode';
+export type EditorViewCommand = 'collapseRegion' | 'expandRegion' | 'collapseAllRegions' | 'expandAllRegions' | 'collapseRegionRecursively' | 'expandRegionRecursively' | 'foldSelection' | 'collapseDocComments' | 'expandDocComments' | 'expandAllToLevel1' | 'expandAllToLevel2' | 'expandAllToLevel3' | 'expandAllToLevel4' | 'expandAllToLevel5' | 'toggleColumnMode' | 'increaseFontSize' | 'decreaseFontSize' | 'resetFontSize';
+export interface EditorZoom {
+    readonly min?: number;
+    readonly max?: number;
+    readonly wheel?: boolean;
+}
 export type EditorRunCommand = EditorCommand | EditorViewCommand;
 export interface EditorFoldRange {
     readonly startLine: number;
@@ -38,6 +44,9 @@ export interface EditorOptions {
     readonly line?: number;
     readonly column?: number;
     readonly scrollTop?: number;
+    readonly todoWords?: readonly string[];
+    readonly fontSize?: number;
+    readonly zoom?: EditorZoom;
 }
 export interface EditorMessages {
     readonly noMoreOccurrences: string;
@@ -324,6 +333,7 @@ export interface Editor {
     setWhitespace(whitespace: boolean): void;
     setRightMargin(column: number | null): void;
     setFoldOutline(outline: EditorFoldOutline): void;
+    setTodoWords?(words: readonly string[]): void;
     setLabel(label: string): void;
     setFoldHints(hints: EditorFoldHints | null): void;
     setChangeMarks(marks: readonly EditorChangeMark[], layer?: string): void;
@@ -385,8 +395,13 @@ export interface Editor {
     setSelectionRanges(provider: EditorSelectionRanges | null): void;
     trackRange(range: EditorRange): EditorTrackedRange;
     applyEdits(edits: readonly EditorContentChange[], options?: EditorApplyEditsOptions): boolean;
+    cleanUpWhitespace?(options: EditorWhitespaceCleanup): boolean;
+    markSaved?(): void;
     setTheme(theme: EditorTheme): void;
     refreshFont(): void;
+    setFontSize?(size: number | null): void;
+    getFontSize?(): number;
+    onFontSizeChange?(listener: (size: number | null) => void): () => void;
     setReadOnly(readOnly: boolean, reason?: string): void;
     isReadOnly?(): boolean;
     runCommand(command: EditorRunCommand): boolean;

package/dist/view.d.ts

@@ -22,6 +22,7 @@ export interface ViewSettings {
     foldOutline: 'off' | 'hover' | 'always';
     folding?: boolean;
     stickyScroll?: boolean;
+    todoWords?: readonly string[];
 }
 export type ViewFold = Omit<FoldingRange, 'kind'> & {
     kind: FoldingRange['kind'] | 'custom';
@@ -59,6 +60,7 @@ export declare class EditorView {
     readonly layout: EditorLayout;
     readonly find: FindController;
     readonly tokens: TokenCache;
+    private readonly todos;
     private readonly content;
     private readonly gutter;
     private readonly gutterLines;
@@ -125,6 +127,7 @@ export declare class EditorView {
     private caretTimer;
     private caretKey;
     private renderedScroll;
+    private fontSize;
     private font;
     private layoutVersion;
     private revision;
@@ -171,6 +174,8 @@ export declare class EditorView {
     applySettings(): void;
     repaint(): void;
     refreshFont(): void;
+    setFontSize(size: number | null): void;
+    getFontSize(): number;
     setTokenizer(tokenizer: LineTokenizer | null): void;
     grammarChanged(): void;
     setLineTokens(tokens: ((line: number) => readonly LineToken[] | null | undefined) | null): void;
@@ -190,6 +195,7 @@ export declare class EditorView {
     setSemanticTokens(tokens: readonly ViewSemanticToken[] | null): void;
     setScopeColors(colors: ScopeColors | null): void;
     private styledTokensOf;
+    private semanticTokensOf;
     private semanticSpans;
     setMarkers(markers: readonly ViewMarker[]): void;
     setComposition(text: string | undefined): void;