@adecore/editor 0.21.1 → 0.22.0

package/dist/code-block.js

@@ -17,28 +17,7 @@ export function renderCodeBlock(container, text, tokens, tabSize, options) {
         if (options.color !== undefined) {
             row.style.background = tintValue(options.color);
         }
-        const gutter = document.createElement('div');
-        gutter.className = 'se-code-gutter';
-        if (options.firstLine !== undefined) {
-            const number = document.createElement('span');
-            number.textContent = String(options.firstLine + index);
-            gutter.append(number);
-        }
-        if (options.sign) {
-            const sign = document.createElement('span');
-            sign.className = 'se-line-sign';
-            sign.textContent = options.sign;
-            if (options.color !== undefined) {
-                sign.style.color = colorValue(options.color);
-            }
-            gutter.append(sign);
-        }
-        if (options.color !== undefined) {
-            const bar = document.createElement('span');
-            bar.className = 'se-attribution';
-            bar.style.background = colorValue(options.color);
-            gutter.append(bar);
-        }
+        const gutter = codeGutter(document, options, index);
         const code = document.createElement('div');
         code.className = 'se-code-text';
         if (options.faded) {
@@ -54,6 +33,31 @@ export function renderCodeBlock(container, text, tokens, tabSize, options) {
     });
     container.append(block);
 }
+function codeGutter(document, options, index) {
+    const gutter = document.createElement('div');
+    gutter.className = 'se-code-gutter';
+    if (options.firstLine !== undefined) {
+        const number = document.createElement('span');
+        number.textContent = String(options.firstLine + index);
+        gutter.append(number);
+    }
+    if (options.sign) {
+        const sign = document.createElement('span');
+        sign.className = 'se-line-sign';
+        sign.textContent = options.sign;
+        if (options.color !== undefined) {
+            sign.style.color = colorValue(options.color);
+        }
+        gutter.append(sign);
+    }
+    if (options.color !== undefined) {
+        const bar = document.createElement('span');
+        bar.className = 'se-attribution';
+        bar.style.background = colorValue(options.color);
+        gutter.append(bar);
+    }
+    return gutter;
+}
 function fill(element, line, tokens, emphasis) {
     if (tokens === null && emphasis.length === 0) {
         element.textContent = line;

package/dist/controller.d.ts

@@ -45,6 +45,7 @@ export declare class InputController {
     private movePages;
     private toggleColumnMode;
     private extendBlock;
+    private blockOf;
     private moveCarets;
     private dropText;
     private goToMatchingBracket;

package/dist/controller.js

@@ -1,12 +1,11 @@
 import { replacementEdits } from './input.js';
+import { emit, subscribe } from './listeners.js';
 import { chordMatches, keyAction } from './keymap.js';
 import { DoubleModifierGesture } from './modifier-gesture.js';
 import { NativeInput } from './native-input.js';
 import { columnSelections, sameCell } from './column-selection.js';
 import { PointerSelection } from './pointer.js';
 const MODIFYING = new Set([
-    'undo',
-    'redo',
     'deleteWordLeft',
     'deleteWordRight',
     'deleteCamelLeft',
@@ -49,6 +48,9 @@ const VIEW_COMMANDS = new Set([
 ]);
 /* 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) {
+    return selections.map((selection) => `${selection.anchor}:${selection.head}`).join(',');
+}
 /* Typing in the same stretch is one undo step until a pause this long. */
 const TYPING_PAUSE_MS = 750;
 /*
@@ -330,7 +332,7 @@ export class InputController {
     }
     modelCommand(name) {
         const { model } = this.view;
-        const modifies = MODIFYING.has(name) && name !== 'undo' && name !== 'redo';
+        const modifies = MODIFYING.has(name);
         if ((modifies || name === 'undo' || name === 'redo') && this.blockedByReadOnly()) {
             return false;
         }
@@ -402,7 +404,7 @@ export class InputController {
     /* Column mode on drops every caret but the first and keeps a selection as a box; off it makes one selection of the box. */
     toggleColumnMode() {
         const { view } = this;
-        const { model, layout } = view;
+        const { model } = view;
         this.block = null;
         if (view.columnMode) {
             const first = model.getSelections()[0];
@@ -415,22 +417,16 @@ export class InputController {
         const primary = model.getPrimary();
         model.setSelections([primary]);
         if (primary.anchor !== primary.head) {
-            const anchor = layout.caret(primary.anchor);
-            const head = layout.caret(primary.head);
-            this.block = { anchor: { x: anchor.x, y: anchor.y }, head: { x: head.x, y: head.y }, signature: '' };
+            this.block = this.blockOf(primary, '');
             this.extendBlock({ x: 0, y: 0 });
         }
     }
     /* Moves the corner of the box by a step and selects the columns between it and the other corner. */
     extendBlock(step) {
         const { model, layout } = this.view;
-        const selections = model.getSelections();
-        const signature = selections.map((selection) => `${selection.anchor}:${selection.head}`).join(',');
+        const signature = selectionSignature(model.getSelections());
         if (this.block === null || (this.block.signature !== '' && this.block.signature !== signature)) {
-            const primary = model.getPrimary();
-            const anchor = layout.caret(primary.anchor);
-            const head = layout.caret(primary.head);
-            this.block = { anchor: { x: anchor.x, y: anchor.y }, head: { x: head.x, y: head.y }, signature };
+            this.block = this.blockOf(model.getPrimary(), signature);
         }
         const block = this.block;
         block.head = {
@@ -438,10 +434,14 @@ export class InputController {
             y: Math.max(0, Math.min(layout.height - layout.metrics.lineHeight, block.head.y + step.y))
         };
         model.setSelections(columnSelections(layout, block.anchor, block.head));
-        block.signature = model
-            .getSelections()
-            .map((selection) => `${selection.anchor}:${selection.head}`)
-            .join(',');
+        block.signature = selectionSignature(model.getSelections());
+    }
+    /* A box between the two ends of a selection. */
+    blockOf(selection, signature) {
+        const { layout } = this.view;
+        const anchor = layout.caret(selection.anchor);
+        const head = layout.caret(selection.head);
+        return { anchor: { x: anchor.x, y: anchor.y }, head: { x: head.x, y: head.y }, signature };
     }
     moveCarets(key, extend) {
         if (this.view.columnMode && extend && (key === 'ArrowUp' || key === 'ArrowDown' || key === 'ArrowLeft' || key === 'ArrowRight')) {
@@ -460,20 +460,17 @@ export class InputController {
         const { model, layout } = this.view;
         const vertical = key === 'ArrowUp' || key === 'ArrowDown';
         const direction = key === 'ArrowLeft' || key === 'ArrowUp' ? -1 : 1;
+        const edge = (selection) => direction < 0 ? Math.min(selection.anchor, selection.head) : Math.max(selection.anchor, selection.head);
         const selections = model.getSelections().map((selection, index) => {
+            const collapses = !extend && selection.anchor !== selection.head;
             let head;
-            if (!vertical && !extend && selection.anchor !== selection.head) {
-                head = direction < 0 ? Math.min(selection.anchor, selection.head) : Math.max(selection.anchor, selection.head);
+            if (!vertical && collapses) {
+                head = edge(selection);
             }
             else if (vertical) {
                 // A selection first gives way to the edge in the direction of the move, as the platform's Up and Down do.
-                const hasSelection = !extend && selection.anchor !== selection.head;
-                const from = hasSelection
-                    ? direction < 0
-                        ? Math.min(selection.anchor, selection.head)
-                        : Math.max(selection.anchor, selection.head)
-                    : selection.head;
-                if (hasSelection) {
+                const from = collapses ? edge(selection) : selection.head;
+                if (collapses) {
                     delete this.desiredXs[index];
                 }
                 this.desiredXs[index] ??= layout.caret(from).x;
@@ -578,22 +575,13 @@ export class InputController {
     }
     /* A handler sees the key before the editor does, the page's own shortcuts included, since a list of suggestions owns the arrows while it is open. */
     onKeyDown(handler) {
-        this.keyHandlers.add(handler);
-        return () => {
-            this.keyHandlers.delete(handler);
-        };
+        return subscribe(this.keyHandlers, handler);
     }
     onClick(handler) {
-        this.clickHandlers.add(handler);
-        return () => {
-            this.clickHandlers.delete(handler);
-        };
+        return subscribe(this.clickHandlers, handler);
     }
     onContextMenu(listener) {
-        this.contextListeners.add(listener);
-        return () => {
-            this.contextListeners.delete(listener);
-        };
+        return subscribe(this.contextListeners, listener);
     }
     keydown(event) {
         if (event.isComposing || this.native.composing) {
@@ -667,9 +655,9 @@ export class InputController {
             ? selections
                 .map((selection) => {
                 const { first, last } = this.view.lineSpan(model.positionAt(selection.head).line);
-                return { start: model.getLine(first).start, end: model.getLine(last).end, next: model.getLine(last).next };
+                const end = model.getLine(last);
+                return model.slice(model.getLine(first).start, end.next) + (end.next === end.end ? '\n' : '');
             })
-                .map((lines) => model.slice(lines.start, lines.next) + (lines.next === lines.end ? '\n' : ''))
                 .join('')
             : selections.map((selection) => model.slice(Math.min(selection.anchor, selection.head), Math.max(selection.anchor, selection.head))).join('\n');
         event.clipboardData?.setData('text/plain', text);
@@ -730,9 +718,7 @@ export class InputController {
             .getSelections()
             .some((candidate) => Math.min(candidate.anchor, candidate.head) <= offset && offset <= Math.max(candidate.anchor, candidate.head));
         const menu = { position: this.positionOf(offset), inSelection: selection, x: event.clientX, y: event.clientY };
-        for (const listener of [...this.contextListeners]) {
-            listener(menu);
-        }
+        emit(this.contextListeners, menu);
     }
     /* A press on a pinned header goes to that header. */
     stickyDown(event) {

package/dist/engine.js

@@ -134,10 +134,7 @@ class SmartEditor {
         return subscribe(this.changes, listener);
     }
     onTextChange(listener) {
-        this.textChanges.add(listener);
-        return () => {
-            this.textChanges.delete(listener);
-        };
+        return subscribe(this.textChanges, listener);
     }
     announceTextChange(edits, source) {
         const change = {
@@ -147,9 +144,7 @@ class SmartEditor {
                 text: edit.text
             }))
         };
-        for (const listener of [...this.textChanges]) {
-            listener(change);
-        }
+        emit(this.textChanges, change);
     }
     caretMoved(head) {
         if (head === this.caretOffset) {
@@ -157,9 +152,7 @@ class SmartEditor {
         }
         this.caretOffset = head;
         const position = this.positionAt(head);
-        for (const listener of [...this.carets]) {
-            listener(position);
-        }
+        emit(this.carets, position);
     }
     getCaret() {
         return this.positionAt(this.model.getPrimary().head);
@@ -168,14 +161,14 @@ class SmartEditor {
         return this.view.scrollPlace.y;
     }
     getSelection() {
-        const { anchor, head } = this.model.getPrimary();
-        return { start: this.positionAt(Math.min(anchor, head)), end: this.positionAt(Math.max(anchor, head)) };
+        return this.rangeOf(this.model.getPrimary());
     }
     getSelections() {
-        return this.model.getSelections().map(({ anchor, head }) => ({
-            start: this.positionAt(Math.min(anchor, head)),
-            end: this.positionAt(Math.max(anchor, head))
-        }));
+        return this.model.getSelections().map((selection) => this.rangeOf(selection));
+    }
+    /* A selection as a range, start before end. */
+    rangeOf({ anchor, head }) {
+        return { start: this.positionAt(Math.min(anchor, head)), end: this.positionAt(Math.max(anchor, head)) };
     }
     getIndentation() {
         return { tabSize: this.settings.tabSize, insertSpaces: this.settings.insertSpaces };
@@ -199,10 +192,7 @@ class SmartEditor {
         this.view.revealOffset(this.offsetAt(last.end), reveal);
     }
     onCaret(listener) {
-        this.carets.add(listener);
-        return () => {
-            this.carets.delete(listener);
-        };
+        return subscribe(this.carets, listener);
     }
     onHover(listener) {
         return this.view.onHover((offset) => {
@@ -496,7 +486,7 @@ class SmartEditor {
     onGutterAction(listener) {
         return this.view.onGutterAction(listener);
     }
-    setGutterMarkers(markers, owner = 'default') {
+    setGutterMarkers(markers, owner = DEFAULT_WIDGET_OWNER) {
         this.view.setGutterMarkers(owner, markers);
     }
     onGutterMarker(listener) {
@@ -529,27 +519,29 @@ class SmartEditor {
         this.view.applySettings();
     }
     setFoldHints(hints) {
-        this.view.setFoldHints(hints === null
-            ? null
-            : {
-                symbols: (hints.symbols ?? []).map((symbol) => ({
-                    from: this.offsetAt(symbol.range.start),
-                    to: this.offsetAt(symbol.range.end),
-                    body: symbol.body
-                })),
-                ranges: (hints.ranges ?? []).map((range) => {
-                    const first = this.model.getLine(Math.min(range.startLine, this.model.getLineCount() - 1));
-                    const last = this.model.getLine(Math.min(range.endLine, this.model.getLineCount() - 1));
-                    const within = (line, character) => Math.min(line.end, line.start + Math.max(0, character));
-                    return {
-                        from: first.start,
-                        to: last.start,
-                        ...(range.kind === undefined ? {} : { kind: range.kind }),
-                        ...(range.startCharacter === undefined ? {} : { head: within(first, range.startCharacter) }),
-                        ...(range.endCharacter === undefined ? {} : { tail: within(last, range.endCharacter) })
-                    };
-                })
-            });
+        this.view.setFoldHints(hints === null ? null : this.foldHintsByOffset(hints));
+    }
+    foldHintsByOffset(hints) {
+        const lineOf = (line) => this.model.getLine(Math.min(line, this.model.getLineCount() - 1));
+        const within = (line, character) => Math.min(line.end, line.start + Math.max(0, character));
+        return {
+            symbols: (hints.symbols ?? []).map((symbol) => ({
+                from: this.offsetAt(symbol.range.start),
+                to: this.offsetAt(symbol.range.end),
+                body: symbol.body
+            })),
+            ranges: (hints.ranges ?? []).map((range) => {
+                const first = lineOf(range.startLine);
+                const last = lineOf(range.endLine);
+                return {
+                    from: first.start,
+                    to: last.start,
+                    ...(range.kind === undefined ? {} : { kind: range.kind }),
+                    ...(range.startCharacter === undefined ? {} : { head: within(first, range.startCharacter) }),
+                    ...(range.endCharacter === undefined ? {} : { tail: within(last, range.endCharacter) })
+                };
+            })
+        };
     }
     setSmartKeys(keys) {
         this.settings.smartKeys = { ...this.settings.smartKeys, ...keys };