@adecore/editor-react 0.23.0 → 0.24.0

package/dist/RenderedDocs.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createPortal } from 'react-dom';
-import { useSyncExternalStore } from 'react';
+import { memo, useSyncExternalStore } from 'react';
 import { useTranslation } from 'react-i18next';
 import { DOC_LINK_PREFIX, sectionsOf } from './doc-comment-model.js';
 import { markdownParts } from './hover-content.js';
@@ -39,12 +39,11 @@ function TagRow({ tag, language, linkable, spaced }) {
     const link = target === null ? null : /^https?:\/\//i.test(target) ? `[${target}](${target})` : `[\`${target}\`](${DOC_LINK_PREFIX}${encodeURIComponent(target)})`;
     return (_jsx("dd", { className: `col-start-2 m-0 flex min-w-0 flex-wrap items-baseline gap-x-2 ${spaced ? 'mt-1' : ''}`, children: tag.name === 'example' ? (_jsx("div", { className: "w-full rounded-md bg-surface-sunken px-2 py-1.5", children: _jsx(Signature, { code: tag.text, language: language }) })) : (_jsxs(_Fragment, { children: [tag.subject !== null && target === null && _jsx(Code, { children: tag.subject }), tag.type !== null && _jsx(Code, { faint: true, children: tag.type }), (link !== null || tag.text !== '') && (_jsx("div", { className: "min-w-0 grow basis-48 text-text", children: _jsx(Prose, { text: [link, tag.text].filter((part) => part !== null && part !== '').join(' '), language: language, linkable: linkable, compact: true }) }))] })) }));
 }
-export function RenderedDocBlock({ language, entry }) {
+function DocBlock({ language, comment, parsed, linkable }) {
     const { t } = useTranslation('editor');
     const feature = language.renderedDocs;
-    const { description, tags } = entry.parsed;
+    const { description, tags } = parsed;
     const highlighter = shikiLanguageOf(language.languageId);
-    const linkable = feature.canFollow;
     const sections = sectionsOf(tags);
     const deprecated = sections.find((section) => section.name === 'deprecated');
     const shown = sections.filter((section) => section.name !== 'deprecated');
@@ -61,7 +60,7 @@ export function RenderedDocBlock({ language, entry }) {
             return;
         }
         if (href.startsWith(DOC_LINK_PREFIX)) {
-            feature.follow(decodeURIComponent(href.slice(DOC_LINK_PREFIX.length)), entry.comment);
+            feature.follow(decodeURIComponent(href.slice(DOC_LINK_PREFIX.length)), comment);
         }
         else if (/^(https?:|mailto:)/i.test(href)) {
             window.open(href, '_blank', 'noopener,noreferrer');
@@ -72,6 +71,8 @@ export function RenderedDocBlock({ language, entry }) {
                     ...section.tags.map((tag, index) => (_jsx(TagRow, { tag: tag, language: highlighter, linkable: linkable, spaced: row > 0 && index === 0 }, `${section.name}:${index}`)))
                 ]) }))] }));
 }
+/* Drawn again only when its comment or its links change, since every scroll of the editor draws the popups again. */
+export const RenderedDocBlock = memo(DocBlock);
 /*
  * The documentation comments the editor drew as rows, filled with their formatted text. It portals into
  * the element the editor made for each row, so the editor decides what is in view; a comment is parsed
@@ -80,5 +81,8 @@ export function RenderedDocBlock({ language, entry }) {
 export function RenderedDocs({ language }) {
     const feature = language.renderedDocs;
     useSyncExternalStore(feature.subscribe, feature.getVersion, feature.getVersion);
-    return _jsx(_Fragment, { children: feature.entries().map((entry) => createPortal(_jsx(RenderedDocBlock, { language: language, entry: entry }), entry.container, entry.id)) });
+    const linkable = feature.canFollow;
+    return (_jsx(_Fragment, { children: feature
+            .entries()
+            .map((entry) => createPortal(_jsx(RenderedDocBlock, { language: language, comment: entry.comment, parsed: entry.parsed, linkable: linkable }), entry.container, entry.id)) }));
 }

package/dist/call-hierarchy-model.js

@@ -24,19 +24,13 @@ export function rootsOf(items) {
         shown: 0
     }));
 }
-function compareItems(left, right) {
-    return left.name.localeCompare(right.name) || left.uri.localeCompare(right.uri) || left.range.start.line - right.range.start.line;
-}
 /*
- * The children of a node made from the calls a server returned, listed by name the way the symbols of a
- * file are. The call sites of a caller are in its own file; those of a callee are in the file of the node
- * that was asked about.
+ * The children of a node made from the calls a server returned, in the order the server gave them.
+ * The call sites of a caller are in its own file; those of a callee are in the file of the node that was asked about.
  */
 export function childrenOf(direction, parent, calls) {
     const entries = calls.map((call) => ({ item: 'from' in call ? call.from : call.to, sites: call.fromRanges }));
-    return entries
-        .sort((left, right) => compareItems(left.item, right.item))
-        .map((entry, index) => ({
+    return entries.map((entry, index) => ({
         id: `${parent.id}.${index}`,
         parent: parent.id,
         level: parent.level + 1,

package/dist/call-hierarchy.js

@@ -1,10 +1,11 @@
 import { StaleResultError } from '@adecore/lsp';
+import { KEY_PRIORITY } from './key-priority.js';
 import { CALL_LEVEL_LIMIT, childrenOf, moreIdOf, rootsOf, rowsOf, statusIdOf, stepsOf, targetOf } from './call-hierarchy-model.js';
 import { PEEK_HEIGHT } from './peek.js';
 import { snippetOf } from './peek-model.js';
 import { isShortcut } from './shortcut-keys.js';
 import { messageOf } from './error-message.js';
-import { realTimers } from './timers.js';
+import { realTimers, revealRow } from './timers.js';
 const TOAST_ID = 'language-call-hierarchy';
 const PREPARE = 'textDocument/prepareCallHierarchy';
 /* The row the panel stands in is as tall as a peek's, plus the segmented control that is a pixel taller than the peek's title bar. */
@@ -34,7 +35,7 @@ export class CallHierarchyFeature {
         this.timers = timers;
         const { editor } = language;
         const offs = [
-            editor.onKeyDown((event) => {
+            language.onKey((event) => {
                 if (isShortcut(this.language.shortcuts.callHierarchy, event)) {
                     if (this.isOpen) {
                         this.setDirection(this.direction === 'incoming' ? 'outgoing' : 'incoming');
@@ -45,7 +46,7 @@ export class CallHierarchyFeature {
                     return true;
                 }
                 return this.key(event);
-            }),
+            }, KEY_PRIORITY.callHierarchy),
             editor.onTextChange(() => this.close())
         ];
         language.onDispose(() => {
@@ -56,7 +57,7 @@ export class CallHierarchyFeature {
         });
     }
     get isOpen() {
-        return (this.language.popups.getState().callHierarchy ?? null) !== null;
+        return this.language.popups.getState().callHierarchy !== null;
     }
     /* Whether a server of this document answers the three requests the tree is made of. */
     get supported() {
@@ -111,7 +112,7 @@ export class CallHierarchyFeature {
     }
     close() {
         this.reset();
-        if (this.language.popups.getState().callHierarchy == null) {
+        if (this.language.popups.getState().callHierarchy === null) {
             return;
         }
         this.language.popups.setState({ callHierarchy: null });
@@ -121,7 +122,7 @@ export class CallHierarchyFeature {
     }
     /* Starts the tree over from the same symbols for the other direction. */
     setDirection(direction) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (view === null || view.direction === direction) {
             return;
         }
@@ -145,7 +146,7 @@ export class CallHierarchyFeature {
         }
         if (node.expanded) {
             this.patch(id, { expanded: false });
-            const view = this.language.popups.getState().callHierarchy ?? null;
+            const view = this.language.popups.getState().callHierarchy;
             if (view !== null && this.hasAncestor(view.active, id)) {
                 this.select(id);
             }
@@ -170,7 +171,7 @@ export class CallHierarchyFeature {
         }
         this.patch(parent, { shown: Math.min(node.children.length, node.shown + CALL_LEVEL_LIMIT) });
         const first = node.children[node.shown];
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         // The row that offered more is gone once everything shows, so the selection moves on to what it brought.
         if (first !== undefined && view?.active === moreIdOf(parent)) {
             this.select(first);
@@ -178,7 +179,7 @@ export class CallHierarchyFeature {
     }
     /* Makes a row the active one and shows the code of its call. */
     select(id, site = 0) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         const node = this.nodes.get(id);
         if (view === null || !view.rows.some((row) => row.id === id)) {
             return;
@@ -192,14 +193,14 @@ export class CallHierarchyFeature {
     }
     /* Steps through the places a call is made from when the active one has more than one. */
     stepSite(direction) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (view !== null && view.sites > 1) {
             this.select(view.active, (view.site + direction + view.sites) % view.sites);
         }
     }
     /* Goes to the call of a row, or to the symbol of a root, and closes the tree. */
     go(id) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         const node = this.nodes.get(id);
         if (view === null || node === undefined) {
             return;
@@ -223,16 +224,15 @@ export class CallHierarchyFeature {
         this.nodes = new Map(roots.map((root) => [root.id, root]));
     }
     mounted(container) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (view !== null && view.container !== container) {
             this.language.popups.setState({ callHierarchy: { ...view, container } });
-            // The row opens under the caret line, which may sit at the bottom of the view with the tree below the fold. The element is in the page a turn later.
-            this.timers.set(() => container.scrollIntoView?.({ block: 'nearest' }), 0);
+            revealRow(this.timers, container);
         }
     }
     patch(id, change) {
         const node = this.nodes.get(id);
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (node === undefined || view === null) {
             return;
         }
@@ -292,7 +292,7 @@ export class CallHierarchyFeature {
                 this.texts.set(uri, text);
             }
         }
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (view === null || view.active !== node.id) {
             return;
         }
@@ -315,7 +315,7 @@ export class CallHierarchyFeature {
         return false;
     }
     key(event) {
-        const view = this.language.popups.getState().callHierarchy ?? null;
+        const view = this.language.popups.getState().callHierarchy;
         if (view === null || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.isComposing) {
             return false;
         }

package/dist/code-actions.js

@@ -1,4 +1,5 @@
 import { ErrorCodes, LspError, StaleResultError } from '@adecore/lsp';
+import { KEY_PRIORITY } from './key-priority.js';
 import { ACTION_GROUPS, REFACTOR_GROUPS, actionsOf, diagnosticsAt, fixableOnLine, isHint, mergeEntries, previewOf } from './code-actions-model.js';
 import { Refresher } from './refresher.js';
 import { isShortcut } from './shortcut-keys.js';
@@ -40,11 +41,13 @@ export class CodeActionsFeature {
         const offs = [
             editor.onCaret(() => {
                 editor.setGutterAction(null);
+                // An answer for the caret's last place would light the bulb on the line it moved to.
+                this.refresher.cancel();
                 this.refresher.later();
             }),
             editor.onTextChange(() => editor.setGutterAction(null)),
             editor.onGutterAction(() => void this.open()),
-            editor.onKeyDown((event) => {
+            language.onKey((event) => {
                 if (isShortcut(this.language.shortcuts.codeActions, event)) {
                     void this.open();
                     return true;
@@ -54,7 +57,7 @@ export class CodeActionsFeature {
                     return true;
                 }
                 return false;
-            }),
+            }, KEY_PRIORITY.codeActions),
             language.diagnostics.onChange(() => this.refresher.later()),
             providers
         ];

package/dist/completion-model.js

@@ -1,3 +1,4 @@
+import { labelCollator } from '@adecore/ui/format';
 import { applyCompletionDefaults } from '@adecore/lsp';
 import { comparePositions } from './diagnostics-model.js';
 import { escapeMarkdown, isEmptyHover, splitSignatures } from './hover-content.js';
@@ -156,6 +157,7 @@ export function prefixFor(item, caret, lineBefore, textBetween) {
  * preselected one, and the server's own order. `recency` is higher for a choice made more recently, and 0 for none.
  */
 export function rankCompletions(items, prefixOf, recency = () => 0, limit = 150) {
+    const { compare } = labelCollator();
     return items
         .map((item, index) => {
         const prefix = prefixOf(item);
@@ -165,7 +167,7 @@ export function rankCompletions(items, prefixOf, recency = () => 0, limit = 150)
         .sort((left, right) => left.score - right.score ||
         right.recent - left.recent ||
         Number(right.item.preselect === true) - Number(left.item.preselect === true) ||
-        (left.item.sortText ?? left.item.label).localeCompare(right.item.sortText ?? right.item.label) ||
+        compare(left.item.sortText ?? left.item.label, right.item.sortText ?? right.item.label) ||
         left.index - right.index)
         .slice(0, limit)
         .map(({ item, score, prefix }) => ({ item, score, prefix }));

package/dist/completion.d.ts

@@ -15,8 +15,10 @@ export declare class CompletionFeature {
     private server;
     private request;
     private controller;
+    private resolving;
+    private accepting;
+    private rankedFor;
     private requestTimer;
-    private refreshTimer;
     private resolveTimer;
     private textRevision;
     private acceptSequence;
@@ -27,6 +29,7 @@ export declare class CompletionFeature {
     invoke(): void;
     move(delta: number): void;
     accept(replace: boolean, index?: number, commit?: string): Promise<void>;
+    private insert;
     private refuseLargeCompletion;
     private placeMirroredCarets;
     private surroundings;
@@ -38,7 +41,6 @@ export declare class CompletionFeature {
     private edited;
     private caretMoved;
     private triggerCharacters;
-    private scheduleRefresh;
     private beginRequest;
     private ask;
     private refilter;

package/dist/completion.js

@@ -1,4 +1,5 @@
 import { SnippetTransformQueueError } from './snippet-transform-queue.js';
+import { KEY_PRIORITY } from './key-priority.js';
 import { SnippetTransformError } from './snippet-transform-client.js';
 import { MAX_TRANSFORM_JOBS, MAX_TRANSFORM_WORK } from './snippet-transform-protocol.js';
 import { fileUriToPath, StaleResultError } from '@adecore/lsp';
@@ -14,10 +15,9 @@ import { textBeforeOf } from './line-text.js';
 import { isEmptyRange } from './proposal-model.js';
 import { isShortcut } from './shortcut-keys.js';
 import { realTimers } from './timers.js';
+import { messageOf } from './error-message.js';
 const METHOD = 'textDocument/completion';
 const START_DELAY_MS = 80;
-/* After typing stops, the list is asked for again at the new text: a server only resolves an item for the text it was made for. */
-const REFRESH_DELAY_MS = 150;
 const RESOLVE_DELAY_MS = 120;
 const PAGE = 8;
 const LINES_BACK = 60;
@@ -78,8 +78,11 @@ export class CompletionFeature {
     server = '';
     request = 0;
     controller = null;
+    resolving = null;
+    accepting = null;
+    /* What the list was ranked for last: the caret event and the text event of one keystroke both refilter, and only the first has to rank. */
+    rankedFor = null;
     requestTimer;
-    refreshTimer;
     resolveTimer;
     textRevision = 0;
     acceptSequence = 0;
@@ -90,16 +93,18 @@ export class CompletionFeature {
         this.timers = timers;
         const { editor } = language;
         const offs = [
-            editor.onKeyDown((event) => this.key(event)),
+            language.onKey((event) => this.key(event), KEY_PRIORITY.completion),
             editor.onTextChange((change) => this.edited(change)),
             editor.onCaret((position) => this.caretMoved(position)),
             editor.onBlur(() => {
                 this.acceptSequence++;
+                this.accepting?.abort();
                 this.close();
             })
         ];
         language.onDispose(() => {
             this.disposed = true;
+            this.accepting?.abort();
             for (const off of offs) {
                 off();
             }
@@ -126,14 +131,26 @@ export class CompletionFeature {
         this.publish();
         this.scheduleResolve();
     }
-    /* Picks a row by a click or a key. */
+    /* Picks a row by a click or a key. It never rejects: a failure is told to the person, so a caller can leave the promise alone. */
     async accept(replace, index = this.active, commit) {
+        try {
+            await this.insert(replace, index, commit);
+        }
+        catch (error) {
+            const { project } = this.language;
+            project.host.notify?.({ id: TOAST_ID, kind: 'error', title: project.i18n.t('editor:language.completion.failed', { message: messageOf(error) }) });
+        }
+    }
+    async insert(replace, index, commit) {
         const entry = this.ranked[index];
         if (entry === undefined) {
             return;
         }
         const { editor, project, uri, snippets } = this.language;
         const acceptSequence = ++this.acceptSequence;
+        this.accepting?.abort();
+        const accepting = new AbortController();
+        this.accepting = accepting;
         const snippetToken = snippets.token;
         const inSnippet = snippets.isActive;
         const exitChanges = [];
@@ -160,7 +177,7 @@ export class CompletionFeature {
         this.close();
         if (needsResolve) {
             // Resolving can add the import an item needs; an item that cannot be resolved is still inserted as it is.
-            item = await this.resolveNow(entry.item);
+            item = await this.resolveNow(entry.item, accepting.signal);
         }
         if (!current()) {
             return;
@@ -390,10 +407,10 @@ export class CompletionFeature {
      * made for. When the person typed on since, the list is asked for again at the new text and the same
      * suggestion is resolved in that one; an item that cannot be resolved is still inserted as it is.
      */
-    async resolveNow(item) {
+    async resolveNow(item, signal) {
         const { editor, project, uri } = this.language;
         try {
-            return { ...item, ...(await project.service.resolveCompletion(uri, item)) };
+            return { ...item, ...(await project.service.resolveCompletion(uri, item, { signal })) };
         }
         catch (error) {
             if (!(error instanceof StaleResultError)) {
@@ -401,8 +418,8 @@ export class CompletionFeature {
             }
         }
         try {
-            const fresh = itemsOf(await project.service.completion(uri, editor.getCaret(), { triggerKind: 1 })).items.find((candidate) => candidate.label === item.label && candidate.kind === item.kind);
-            return fresh === undefined ? item : { ...fresh, ...(await project.service.resolveCompletion(uri, fresh).catch(() => fresh)) };
+            const fresh = itemsOf(await project.service.completion(uri, editor.getCaret(), { triggerKind: 1 }, { signal })).items.find((candidate) => candidate.label === item.label && candidate.kind === item.kind);
+            return fresh === undefined ? item : { ...fresh, ...(await project.service.resolveCompletion(uri, fresh, { signal }).catch(() => fresh)) };
         }
         catch {
             return item;
@@ -411,11 +428,12 @@ export class CompletionFeature {
     close() {
         this.request++;
         this.controller?.abort();
+        this.resolving?.abort();
         this.timers.clear(this.requestTimer);
-        this.timers.clear(this.refreshTimer);
         this.timers.clear(this.resolveTimer);
         this.pool = [];
         this.ranked = [];
+        this.rankedFor = null;
         this.touched = false;
         this.explicit = false;
         this.activeKey = null;
@@ -498,7 +516,6 @@ export class CompletionFeature {
         else if (this.isOpen) {
             if (text === '' || typedIdentifier) {
                 this.refilter();
-                this.scheduleRefresh();
             }
             else {
                 this.close();
@@ -507,6 +524,10 @@ export class CompletionFeature {
         else if (text.length === 1 && typedIdentifier && isEmptyRange(range)) {
             this.beginRequest({ triggerKind: 1 }, START_DELAY_MS);
         }
+        else if (text !== '') {
+            // A request the last letter started, still waiting or out, would open the list after a character that ends the word.
+            this.close();
+        }
     }
     caretMoved(position) {
         if (this.start === null) {
@@ -523,19 +544,6 @@ export class CompletionFeature {
         const { project, uri } = this.language;
         return project.service.providerOptions(METHOD, uri)?.triggerCharacters ?? [];
     }
-    scheduleRefresh() {
-        const { project, uri } = this.language;
-        this.timers.clear(this.refreshTimer);
-        if (this.start === null || !project.service.supports(METHOD, uri)) {
-            return;
-        }
-        const request = this.request;
-        this.refreshTimer = this.timers.set(() => {
-            if (request === this.request && this.start !== null) {
-                void this.ask({ triggerKind: 1 }, request, true);
-            }
-        }, REFRESH_DELAY_MS);
-    }
     beginRequest(context, delay) {
         const { project, uri } = this.language;
         if (!project.service.supports(METHOD, uri)) {
@@ -600,6 +608,11 @@ export class CompletionFeature {
             return;
         }
         const lineBefore = textBeforeOf(editor, caret);
+        const typedKey = `${caret.line}:${caret.character}:${lineBefore}`;
+        if (this.rankedFor?.pool === this.pool && this.rankedFor.key === typedKey) {
+            return;
+        }
+        this.rankedFor = { pool: this.pool, key: typedKey };
         // Most items of a list replace the same range, so the text under it is read once and not once per item.
         const typed = new Map();
         const textBetween = (range) => {
@@ -635,20 +648,29 @@ export class CompletionFeature {
     scheduleResolve() {
         const { project, uri } = this.language;
         this.timers.clear(this.resolveTimer);
+        this.resolving?.abort();
         const entry = this.ranked[this.active];
         if (entry === undefined || this.resolved.has(entry.item) || project.service.providerOptions('completionItem/resolve', uri) === undefined) {
             return;
         }
+        const request = this.request;
         this.resolveTimer = this.timers.set(() => {
+            const controller = new AbortController();
+            this.resolving = controller;
             void project.service
-                .resolveCompletion(uri, entry.item)
+                .resolveCompletion(uri, entry.item, { signal: controller.signal })
                 .then((item) => {
                 this.resolved.set(entry.item, { ...entry.item, ...item });
                 if (this.ranked[this.active]?.item === entry.item) {
                     this.publish();
                 }
             })
-                .catch(() => undefined);
+                .catch((error) => {
+                // A server only resolves an item for the text it was made for, so only an item that is wanted and stale costs a new list.
+                if (error instanceof StaleResultError && !controller.signal.aborted && request === this.request && this.start !== null) {
+                    void this.ask({ triggerKind: 1 }, request, true);
+                }
+            });
         }, RESOLVE_DELAY_MS);
     }
     publish() {

package/dist/diagnostics-model.d.ts

@@ -9,6 +9,7 @@ export declare function severityOf(diagnostic: Diagnostic): EditorMarkerSeverity
 export declare function markerOf(diagnostic: Diagnostic): EditorMarker;
 export declare function problemCountsOf(diagnostics: readonly Diagnostic[]): ProblemCounts;
 export declare function comparePositions(left: EditorPosition, right: EditorPosition): number;
+export declare function endOfInsertion(start: EditorPosition, text: string): EditorPosition;
 export declare function shiftPosition(position: EditorPosition, change: EditorContentChange): EditorPosition;
 export declare function shiftRange(range: EditorRange, changes: readonly EditorContentChange[]): EditorRange;
 export declare function rangeHolds(range: EditorRange, position: EditorPosition): boolean;

package/dist/diagnostics-model.js

@@ -26,7 +26,7 @@ export function comparePositions(left, right) {
     return left.line === right.line ? left.character - right.character : left.line - right.line;
 }
 /* Where an insertion of `text` at `start` ends, counting a line break of any kind once. */
-function endOfInsertion(start, text) {
+export function endOfInsertion(start, text) {
     const lines = text.split(/\r\n|\r|\n/);
     return lines.length === 1
         ? { line: start.line, character: start.character + text.length }

package/dist/diagnostics.d.ts

@@ -21,4 +21,5 @@ export declare class DiagnosticsFeature {
     private reveal;
     private shift;
     private rebuild;
+    private collect;
 }

package/dist/diagnostics.js

@@ -1,3 +1,5 @@
+import { KEY_PRIORITY } from './key-priority.js';
+import { sameRange } from './hover-content.js';
 import { isShortcut } from './shortcut-keys.js';
 import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsAt, severityOf, shiftRange } from './diagnostics-model.js';
 /*
@@ -16,19 +18,19 @@ export class DiagnosticsFeature {
         const reports = project.service.onDiagnostics((report) => {
             if (report.uri === uri) {
                 this.reports.set(report.source, report.diagnostics);
-                this.rebuild(true);
+                this.rebuild();
             }
         });
         const edits = editor.onTextChange((change) => this.shift(change.changes));
         // These keys are the editor's while it has the keyboard; elsewhere the menu's commands answer.
-        const keys = editor.onKeyDown((event) => {
+        const keys = language.onKey((event) => {
             const next = isShortcut(this.language.shortcuts.nextProblem, event);
             if (!next && !isShortcut(this.language.shortcuts.previousProblem, event)) {
                 return false;
             }
             this.step(next ? 1 : -1);
             return true;
-        });
+        }, KEY_PRIORITY.diagnostics);
         language.onDispose(() => {
             keys();
             reports.dispose();
@@ -80,19 +82,35 @@ export class DiagnosticsFeature {
         const severity = project.i18n.t(`editor:language.announce.severity.${severityOf(problem.diagnostic)}`);
         editor.announce(project.i18n.t('editor:language.announce.problem', { severity, message: problem.diagnostic.message }));
     }
+    /* The problems follow the edit as the markers do. Their number does not change, so nobody is told. */
     shift(changes) {
+        let moved = false;
         for (const [server, diagnostics] of this.reports) {
-            this.reports.set(server, diagnostics.map((diagnostic) => ({ ...diagnostic, range: shiftRange(diagnostic.range, changes) })));
+            let shifted = null;
+            for (const [index, diagnostic] of diagnostics.entries()) {
+                const range = shiftRange(diagnostic.range, changes);
+                if (!sameRange(range, diagnostic.range)) {
+                    shifted ??= [...diagnostics];
+                    shifted[index] = { ...diagnostic, range };
+                }
+            }
+            if (shifted !== null) {
+                this.reports.set(server, shifted);
+                moved = true;
+            }
         }
-        this.rebuild(false);
-    }
-    rebuild(draw) {
-        this.list = [...this.reports].flatMap(([server, diagnostics]) => diagnostics.map((diagnostic) => ({ diagnostic, server })));
-        if (draw) {
-            this.language.editor.setMarkers(this.list.map((problem) => markerOf(problem.diagnostic)));
+        if (moved) {
+            this.collect();
         }
+    }
+    rebuild() {
+        this.collect();
+        this.language.editor.setMarkers(this.list.map((problem) => markerOf(problem.diagnostic)));
         for (const listener of [...this.listeners]) {
             listener();
         }
     }
+    collect() {
+        this.list = [...this.reports].flatMap(([server, diagnostics]) => diagnostics.map((diagnostic) => ({ diagnostic, server })));
+    }
 }

package/dist/diff-overlays.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { useSyncExternalStore } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { Button } from '@adecore/ui';
+import { Button, Tooltip } from '@adecore/ui';
 import { formatNumber } from '@adecore/ui/format';
 import { RowHost, LineActionHost } from './row-host.js';
 export function DiffOverlays({ mounted, display, unfold, blocked }) {
@@ -15,7 +15,7 @@ export function DiffOverlays({ mounted, display, unfold, blocked }) {
                     return null;
                 }
                 const text = t('diff.hidden', { count: formatNumber(Math.max(row.oldCount, row.newCount)) });
-                return createPortal(_jsx("div", { className: "adecore-editor-diff-gap", children: row.unfoldable ? (_jsx(Button, { size: "xs", disabled: blocked?.has(row.id), title: blocked?.has(row.id) ? t('diff.contextLimit') : undefined, onClick: () => unfold(row.id), children: text })) : (_jsx("span", { children: text })) }), container, `gap-${row.id}`);
+                return createPortal(_jsx("div", { className: "adecore-editor-diff-gap", children: row.unfoldable && blocked?.has(row.id) === true ? (_jsx(Tooltip, { label: t('diff.contextLimit'), children: _jsx("span", { className: "inline-flex", children: _jsx(Button, { size: "xs", disabled: true, children: text }) }) })) : row.unfoldable ? (_jsx(Button, { size: "xs", onClick: () => unfold(row.id), children: text })) : (_jsx("span", { children: text })) }), container, `gap-${row.id}`);
             }), display.rows.map((row, index) => {
                 if (row.noNewline === undefined) {
                     return null;

package/dist/editor-language.d.ts

@@ -1,5 +1,5 @@
 import { type Keymap } from '@adecore/editor/keymap';
-import type { Editor, EditorPosition } from '@adecore/editor';
+import type { Editor, EditorKeyHandler, EditorPosition } from '@adecore/editor';
 import type { Location } from '@adecore/lsp';
 import { CallHierarchyFeature } from './call-hierarchy.ts';
 import { CodeActionsFeature } from './code-actions.ts';
@@ -61,6 +61,7 @@ export declare class EditorLanguage {
     readonly formatOnType: FormatOnTypeFeature;
     readonly renderedDocs: RenderedDocsFeature;
     private readonly disposers;
+    private readonly keys;
     private disposed;
     constructor(project: ProjectLanguage, editor: Editor, uri: string, languageId: string, timers?: Timers, options?: EditorLanguageOptions);
     get uri(): string;
@@ -71,6 +72,7 @@ export declare class EditorLanguage {
     visit(place: Place): void;
     locations(places: readonly Location[], anchor: EditorPosition, title: string): void;
     onProvidersChanged(listener: () => void): () => void;
+    onKey(handler: EditorKeyHandler, priority?: number): () => void;
     onDispose(dispose: () => void): void;
     dispose(): void;
     private placeOpenedCaret;