@adecore/editor-react 0.22.1 → 0.23.1

package/dist/completion-model.d.ts

@@ -1,7 +1,8 @@
+import type { SnippetTransformJob } from './snippet-transform-protocol.ts';
 import type { EditorContentChange, EditorPosition, EditorRange } from '@adecore/editor';
-import type { CompletionItem, CompletionResult, MarkupContent } from '@adecore/lsp';
+import { type CompletionItem, type CompletionResult, type MarkupContent } from '@adecore/lsp';
 import type { CompletionDocs } from './popups.ts';
-import { type SnippetStop } from './snippet.ts';
+import { type SnippetField, type SnippetStop, type SnippetTemplate, type SnippetVariableResolver } from './snippet.ts';
 export declare function isIdentifierCharacter(character: string): boolean;
 export declare function identifierPrefix(before: string): string;
 export declare function opensCompletion(before: string, text: string): boolean;
@@ -34,12 +35,21 @@ export declare const CLASS_KIND = 7;
 export declare const SNIPPET_FORMAT = 2;
 export declare function isCallableKind(kind: number | undefined): boolean;
 export interface Insertion {
+    readonly limited?: true;
     readonly range: EditorRange;
     readonly text: string;
     readonly stops: readonly SnippetStop[];
+    readonly fields?: readonly SnippetField[];
+    readonly variableTransforms?: readonly SnippetTransformJob[];
 }
-export declare function insertionOf(item: CompletionItem, caret: EditorPosition, lineBefore: string, replace: boolean, lineAfter?: string): Insertion;
-export declare function mirroredInsertions(carets: readonly EditorRange[], primary: EditorRange, caret: EditorPosition, text: (range: EditorRange) => string, insertion: Insertion): EditorContentChange[];
+export interface SnippetInsertionOptions {
+    readonly resolve?: SnippetVariableResolver;
+    readonly variableTransforms?: readonly string[];
+    readonly template?: SnippetTemplate;
+    readonly indentationBefore?: string;
+}
+export declare function insertionOf(item: CompletionItem, caret: EditorPosition, lineBefore: string, replace: boolean, lineAfter?: string, options?: SnippetInsertionOptions): Insertion;
+export declare function mirroredInsertions(carets: readonly EditorRange[], primary: EditorRange, caret: EditorPosition, text: (range: EditorRange) => string, insertion: Insertion, includeSelections?: boolean): EditorContentChange[];
 export declare function documentationText(documentation: string | MarkupContent | undefined): string;
 export declare const SOURCE_LINE: RegExp;
 export declare function completionDocsOf(item: CompletionItem, highlightLanguage: string): CompletionDocs | null;

package/dist/completion-model.js

@@ -1,6 +1,8 @@
+import { applyCompletionDefaults } from '@adecore/lsp';
 import { comparePositions } from './diagnostics-model.js';
 import { escapeMarkdown, isEmptyHover, splitSignatures } from './hover-content.js';
-import { parseSnippet, tabOrder } from './snippet.js';
+import { compileSnippet, parseSnippet, tabOrder } from './snippet.js';
+import { indentSnippet } from './snippet-indent.js';
 const IDENTIFIER_CHARACTER = /[\p{L}\p{N}\p{M}_$]/u;
 export function isIdentifierCharacter(character) {
     return IDENTIFIER_CHARACTER.test(character);
@@ -117,35 +119,23 @@ export function editRangeOf(item, replace) {
 }
 /* Items from a result, with the list's defaults filled in so each carries its own edit range and format. */
 export function itemsOf(result) {
-    if (result === null) {
-        return { items: [], incomplete: false };
-    }
-    if (Array.isArray(result)) {
-        return { items: result, incomplete: false };
-    }
-    const list = result;
-    const defaults = list.itemDefaults;
-    if (defaults === undefined) {
-        return { items: list.items, incomplete: list.isIncomplete };
-    }
+    const list = result === null || Array.isArray(result) ? undefined : result;
+    const items = result === null ? [] : Array.isArray(result) ? result : result.items;
     return {
-        incomplete: list.isIncomplete,
-        items: list.items.map((item) => {
-            const next = { ...item };
-            if (defaults.insertTextFormat !== undefined && next.insertTextFormat === undefined) {
-                next.insertTextFormat = defaults.insertTextFormat;
+        incomplete: list?.isIncomplete ?? false,
+        items: items.flatMap((item) => {
+            if (typeof item?.label !== 'string') {
+                return [];
             }
-            if (defaults.commitCharacters !== undefined && next.commitCharacters === undefined) {
-                next.commitCharacters = defaults.commitCharacters;
+            try {
+                return [applyCompletionDefaults(item, list?.itemDefaults, { onInvalidRange: () => undefined })];
             }
-            if (next.textEdit === undefined && defaults.editRange !== undefined) {
-                const text = item.textEditText ?? item.insertText ?? item.label;
-                next.textEdit =
-                    'start' in defaults.editRange
-                        ? { range: defaults.editRange, newText: text }
-                        : { insert: defaults.editRange.insert, replace: defaults.editRange.replace, newText: text };
+            catch (error) {
+                if (error instanceof TypeError || error instanceof RangeError) {
+                    return [];
+                }
+                throw error;
             }
-            return next;
         })
     };
 }
@@ -236,7 +226,7 @@ function withoutCall(snippet) {
  * What goes into the text for an item and the range it takes the place of, given the caret. `lineAfter` is
  * the rest of the line after the caret: an item that would add a call does not when a parenthesis follows.
  */
-export function insertionOf(item, caret, lineBefore, replace, lineAfter = '') {
+export function insertionOf(item, caret, lineBefore, replace, lineAfter = '', options = {}) {
     const raw = item.textEdit?.newText ?? item.insertText ?? item.label;
     const edit = editRangeOf(item, replace);
     const range = edit === null
@@ -244,17 +234,34 @@ export function insertionOf(item, caret, lineBefore, replace, lineAfter = '') {
         : // The word grew since the answer came, so what was typed since belongs to what is replaced.
             { start: edit.start, end: comparePositions(edit.end, caret) < 0 && edit.end.line === caret.line ? caret : edit.end };
     if (item.insertTextFormat !== SNIPPET_FORMAT) {
-        return { range, text: raw, stops: [] };
+        const adjusted = item.insertTextMode === 2
+            ? indentSnippet({ text: raw, stops: [] }, options.indentationBefore ?? lineBefore.slice(0, range.start.character))
+            : { text: raw, stops: [] };
+        return { range, text: adjusted.text, stops: [], ...(adjusted.limited ? { limited: true } : {}) };
     }
     const followed = range.end.line === caret.line && lineAfter.slice(Math.max(0, range.end.character - caret.character)).startsWith('(');
-    const parsed = parseSnippet(followed && isCallableKind(item.kind) ? withoutCall(raw) : raw);
-    return { range, text: parsed.text, stops: tabOrder(parsed) };
+    const source = followed && isCallableKind(item.kind) ? withoutCall(raw) : raw;
+    const template = options.template?.source === source ? options.template : compileSnippet(source);
+    const rendered = template.render(options.resolve, options.variableTransforms);
+    const parsed = item.insertTextMode === 2 ? indentSnippet(rendered, options.indentationBefore ?? lineBefore.slice(0, range.start.character)) : rendered;
+    return {
+        range,
+        text: parsed.text,
+        stops: tabOrder(parsed),
+        fields: parsed.fields,
+        ...(options.variableTransforms !== undefined || rendered.transforms === undefined
+            ? {}
+            : {
+                variableTransforms: rendered.transforms.map((range) => ({ ...range.transform, value: rendered.text.slice(range.start, range.end) }))
+            }),
+        ...(parsed.limited ? { limited: true } : {})
+    };
 }
 /*
  * The same insertion at every other caret that has the word the primary caret has before it, so a name typed at
  * several carets is completed at all of them. A caret that is inside a selection, or after other text, is left alone.
  */
-export function mirroredInsertions(carets, primary, caret, text, insertion) {
+export function mirroredInsertions(carets, primary, caret, text, insertion, includeSelections = false) {
     const before = insertion.range.start.line === caret.line ? caret.character - insertion.range.start.character : -1;
     const after = insertion.range.end.line === caret.line ? insertion.range.end.character - caret.character : -1;
     if (before < 0 || after < 0) {
@@ -263,11 +270,11 @@ export function mirroredInsertions(carets, primary, caret, text, insertion) {
     const typed = text({ start: insertion.range.start, end: caret });
     const replaced = text({ start: caret, end: insertion.range.end });
     return carets.flatMap((other) => {
-        const at = other.start;
+        const at = includeSelections ? other.end : other.start;
         if (comparePositions(other.start, primary.start) === 0 && comparePositions(other.end, primary.end) === 0) {
             return [];
         }
-        if (comparePositions(other.start, other.end) !== 0 || at.character < before) {
+        if ((!includeSelections && comparePositions(other.start, other.end) !== 0) || at.character < before) {
             return [];
         }
         const range = { start: { line: at.line, character: at.character - before }, end: { line: at.line, character: at.character + after } };

package/dist/completion.d.ts

@@ -18,12 +18,16 @@ export declare class CompletionFeature {
     private requestTimer;
     private refreshTimer;
     private resolveTimer;
+    private textRevision;
+    private acceptSequence;
+    private disposed;
     private readonly resolved;
     constructor(language: EditorLanguage, timers?: Timers);
     get isOpen(): boolean;
     invoke(): void;
     move(delta: number): void;
     accept(replace: boolean, index?: number, commit?: string): Promise<void>;
+    private refuseLargeCompletion;
     private placeMirroredCarets;
     private surroundings;
     private afterInsert;

package/dist/completion.js

@@ -1,7 +1,13 @@
-import { StaleResultError } from '@adecore/lsp';
+import { SnippetTransformQueueError } from './snippet-transform-queue.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';
 import { comparePositions, shiftPosition } from './diagnostics-model.js';
-import { completionDocsOf, identifierPrefix, insertionOf, isIdentifierCharacter, itemsOf, matchedCharacters, mirroredInsertions, opensCompletion, prefixFor, qualifiersOf, rankCompletions } from './completion-model.js';
+import { completionDocsOf, editRangeOf, identifierPrefix, insertionOf, isIdentifierCharacter, itemsOf, matchedCharacters, mirroredInsertions, opensCompletion, prefixFor, qualifiersOf, rankCompletions } from './completion-model.js';
 import { PARAMETER_HINTS_COMMAND, isCallItem, planCall, withParentheses } from './completion-call.js';
+import { compileSnippet } from './snippet.js';
+import { createSnippetResolver } from './snippet-variables.js';
+import { wordRangeAt } from './rename-model.js';
 import { RecentChoices, recentChoicesOf } from './recent-choices.js';
 import { shikiLanguageOf } from './language-ids.js';
 import { textBeforeOf } from './line-text.js';
@@ -16,6 +22,40 @@ const RESOLVE_DELAY_MS = 120;
 const PAGE = 8;
 const LINES_BACK = 60;
 const TOAST_ID = 'language-completion';
+const MAX_COMPLETION_CHARACTERS = 2_000_000;
+const MAX_COMPLETION_RANGES = 1_000;
+class CompletionLimitError extends Error {
+}
+function mapCompletionEdits(item, changes, mapRange) {
+    // Changes apply one after another, so each is checked against the range as the earlier ones left it.
+    const overlapsChange = (range) => {
+        let { start, end } = range;
+        for (const change of changes) {
+            if (comparePositions(start, change.range.end) < 0 && comparePositions(change.range.start, end) < 0) {
+                return true;
+            }
+            start = shiftPosition(start, change);
+            end = shiftPosition(end, change);
+        }
+        return false;
+    };
+    let valid = true;
+    const map = (range) => {
+        valid &&= !overlapsChange(range);
+        return mapRange(range);
+    };
+    const edit = item.textEdit;
+    const mapped = {
+        ...item,
+        ...(edit === undefined
+            ? {}
+            : { textEdit: 'range' in edit ? { ...edit, range: map(edit.range) } : { ...edit, insert: map(edit.insert), replace: map(edit.replace) } }),
+        ...(item.additionalTextEdits === undefined
+            ? {}
+            : { additionalTextEdits: item.additionalTextEdits.map((edit) => ({ ...edit, range: map(edit.range) })) })
+    };
+    return valid ? mapped : null;
+}
 /*
  * The suggestions that open while a word is typed. A single typed identifier character or a trigger
  * character of the server asks for the list; every character after that only filters the list that
@@ -41,6 +81,9 @@ export class CompletionFeature {
     requestTimer;
     refreshTimer;
     resolveTimer;
+    textRevision = 0;
+    acceptSequence = 0;
+    disposed = false;
     resolved = new Map();
     constructor(language, timers = realTimers) {
         this.language = language;
@@ -50,9 +93,13 @@ export class CompletionFeature {
             editor.onKeyDown((event) => this.key(event)),
             editor.onTextChange((change) => this.edited(change)),
             editor.onCaret((position) => this.caretMoved(position)),
-            editor.onBlur(() => this.close())
+            editor.onBlur(() => {
+                this.acceptSequence++;
+                this.close();
+            })
         ];
         language.onDispose(() => {
+            this.disposed = true;
             for (const off of offs) {
                 off();
             }
@@ -64,6 +111,7 @@ export class CompletionFeature {
     }
     /* Asks for suggestions at the caret now, as Ctrl+Space does. */
     invoke() {
+        this.language.pick.close();
         this.explicit = true;
         this.beginRequest({ triggerKind: 1 }, 0);
     }
@@ -84,7 +132,28 @@ export class CompletionFeature {
         if (entry === undefined) {
             return;
         }
-        const { editor, project, uri } = this.language;
+        const { editor, project, uri, snippets } = this.language;
+        const acceptSequence = ++this.acceptSequence;
+        const snippetToken = snippets.token;
+        const inSnippet = snippets.isActive;
+        const exitChanges = [];
+        if (snippets.hasPendingTransforms) {
+            this.close();
+            if (!(await snippets.settleTransforms(() => !this.disposed && acceptSequence === this.acceptSequence && snippets.token === snippetToken, (changes, map) => exitChanges.push({ changes, map })))) {
+                return;
+            }
+        }
+        const acceptedSelections = editor.getSelections();
+        const revision = this.textRevision;
+        const current = () => {
+            if (this.disposed || acceptSequence !== this.acceptSequence || revision !== this.textRevision || (inSnippet && snippets.token !== snippetToken)) {
+                return false;
+            }
+            const selections = editor.getSelections();
+            return (selections.length === acceptedSelections.length &&
+                selections.every((range, index) => comparePositions(range.start, acceptedSelections[index].start) === 0 &&
+                    comparePositions(range.end, acceptedSelections[index].end) === 0));
+        };
         recentChoicesOf(this.language.languageId).record(entry.item);
         let item = this.resolved.get(entry.item) ?? entry.item;
         const needsResolve = !this.resolved.has(entry.item) && project.service.providerOptions('completionItem/resolve', uri) !== undefined;
@@ -93,44 +162,185 @@ export class CompletionFeature {
             // 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);
         }
+        if (!current()) {
+            return;
+        }
+        for (const { changes, map } of exitChanges) {
+            const mapped = mapCompletionEdits(item, changes, map);
+            if (mapped === null) {
+                return;
+            }
+            item = mapped;
+        }
         const caret = editor.getCaret();
         const lineBefore = textBeforeOf(editor, caret);
         const lineAfter = editor.textInRange({ start: caret, end: { line: caret.line, character: Number.MAX_SAFE_INTEGER } });
-        // A character that commits is typed after the name, so a call is not added before it.
-        const planned = insertionOf(item, caret, lineBefore, replace, commit === undefined ? lineAfter : '(');
-        const { before, rest } = this.surroundings(planned, caret, lineAfter);
-        const plan = commit === undefined ? planCall({ item, languageId: this.language.languageId, insertion: planned, before, rest, replace }) : { action: 'none' };
-        const main = plan.action === 'add' ? withParentheses(planned, plan.inside) : planned;
-        const extras = (item.additionalTextEdits ?? []).map((edit) => ({ range: edit.range, text: edit.newText }));
-        // An import above the insertion moves it, and the tab stops are measured from where it ends up.
-        const start = extras
-            .filter((extra) => comparePositions(extra.range.end, main.range.start) <= 0)
-            .sort((left, right) => comparePositions(right.range.start, left.range.start))
-            .reduce((place, extra) => shiftPosition(place, extra), main.range.start);
-        // A name typed at several carets is completed at all of them, and the other carets end behind what was put in.
         const carets = editor.getSelections();
-        const mirrored = mirroredInsertions(carets, editor.getSelection(), caret, (range) => editor.textInRange(range), main);
-        editor.applyEdits([{ range: main.range, text: main.text }, ...mirrored, ...extras]);
-        const landed = editor.getSelections();
-        if (commit === undefined) {
-            this.language.snippets.begin(start, main.text, main.stops);
-            if (plan.action === 'add' && plan.inside && mirrored.length > 0) {
-                this.placeMirroredCarets(carets, mirrored, landed);
+        const source = item.textEdit?.newText ?? item.insertText ?? item.label;
+        if (source.length * carets.length > MAX_COMPLETION_CHARACTERS) {
+            this.refuseLargeCompletion();
+            return;
+        }
+        let characters = 0;
+        let ranges = 0;
+        const now = new Date();
+        const template = item.insertTextFormat === 2 ? compileSnippet(item.textEdit?.newText ?? item.insertText ?? item.label) : undefined;
+        const finishes = new Map();
+        const renderAt = (position, selection) => {
+            const line = editor.textInRange({ start: { line: position.line, character: 0 }, end: { line: position.line, character: Number.MAX_SAFE_INTEGER } });
+            const word = wordRangeAt(line, position);
+            const resolver = createSnippetResolver({
+                uri,
+                languageId: this.language.languageId,
+                position,
+                selection,
+                selectedText: editor.textInRange(selection),
+                currentLine: line,
+                currentWord: word === null ? '' : editor.textInRange(word),
+                cursorIndex: Math.max(0, carets.findIndex((range) => comparePositions(range.start, selection.start) === 0 && comparePositions(range.end, selection.end) === 0)),
+                cursorCount: carets.length,
+                folder: project.host.folder,
+                path: fileUriToPath(uri) ?? project.host.pathOfUri?.(uri) ?? undefined
+            }, project.host.resolveSnippetVariable?.bind(project.host), { now });
+            const atItem = position === caret || item.textEdit === undefined
+                ? item
+                : { ...item, textEdit: undefined, insertText: item.textEdit?.newText ?? item.insertText };
+            const editStart = editRangeOf(atItem, replace)?.start;
+            // A commit character follows the name, so accepting must not also add a call.
+            const finish = (variableTransforms) => {
+                const insertion = insertionOf(atItem, position, line.slice(0, position.character), replace, commit === undefined ? line.slice(position.character) : '(', {
+                    template,
+                    variableTransforms,
+                    resolve: resolver,
+                    indentationBefore: editStart === undefined ? undefined : editor.textInRange({ start: { line: editStart.line, character: 0 }, end: editStart })
+                });
+                return commit === undefined ? insertion : { ...insertion, text: insertion.text + commit };
+            };
+            const rendered = finish();
+            finishes.set(rendered, finish);
+            characters += rendered.text.length;
+            ranges +=
+                (rendered.variableTransforms?.length ?? 0) +
+                    (rendered.fields?.reduce((count, field) => count + field.ranges.length + (field.linked?.length ?? 0), 1) ?? rendered.stops.length);
+            if (rendered.limited || characters > MAX_COMPLETION_CHARACTERS || ranges > MAX_COMPLETION_RANGES) {
+                throw new CompletionLimitError();
             }
-            if (plan.action === 'enter') {
-                const end = editor.getCaret();
-                editor.setCaret({ line: end.line, character: end.character + plan.shift });
+            return rendered;
+        };
+        try {
+            const planned = renderAt(caret, editor.getSelection());
+            const { before, rest } = this.surroundings(planned, caret, lineAfter);
+            const plan = commit === undefined ? planCall({ item, languageId: this.language.languageId, insertion: planned, before, rest, replace }) : { action: 'none' };
+            let main = plan.action === 'add' ? withParentheses(planned, plan.inside) : planned;
+            const extras = (item.additionalTextEdits ?? []).map((edit) => ({ range: edit.range, text: edit.newText }));
+            const instances = new Map();
+            const continuing = inSnippet && snippets.isActive && snippetToken === snippets.token;
+            const mirrored = mirroredInsertions(carets, editor.getSelection(), caret, (range) => editor.textInRange(range), main, continuing).map((insertion) => {
+                const selection = carets.find((range) => range.start.line === insertion.range.start.line &&
+                    range.start.character >= insertion.range.start.character &&
+                    range.start.character <= insertion.range.end.character);
+                const position = selection[continuing ? 'end' : 'start'];
+                const own = renderAt(position, selection);
+                const rendered = plan.action === 'add' ? withParentheses(own, plan.inside) : own;
+                const edit = { ...insertion, text: rendered.text };
+                const instance = { ...rendered, range: insertion.range };
+                instances.set(edit, instance);
+                const finish = finishes.get(own);
+                if (finish !== undefined) {
+                    finishes.set(instance, (values) => ({ ...finish(values), range: insertion.range }));
+                }
+                return edit;
+            });
+            const drafts = [...mirrored.map((edit) => instances.get(edit)), main];
+            const jobs = [];
+            const keys = new Map();
+            const slots = drafts.map((draft) => (draft.variableTransforms ?? []).map((job) => {
+                const key = JSON.stringify(job);
+                let slot = keys.get(key);
+                if (slot === undefined) {
+                    slot = jobs.length;
+                    keys.set(key, slot);
+                    jobs.push(job);
+                }
+                return slot;
+            }));
+            if (jobs.length > MAX_TRANSFORM_JOBS || jobs.reduce((sum, job) => sum + job.value.length, 0) > MAX_TRANSFORM_WORK) {
+                throw new CompletionLimitError();
             }
+            if (jobs.length > 0 && project.host.snippetTransformWorker !== undefined) {
+                const values = await snippets.transformVariables(jobs, current);
+                if (!current()) {
+                    return;
+                }
+                if (values !== null) {
+                    const transformed = drafts.map((draft, index) => slots[index].length === 0 ? draft : finishes.get(draft)(slots[index].map((slot) => values[slot])));
+                    if (transformed.some((draft) => draft.limited) ||
+                        transformed.reduce((sum, draft) => sum + draft.text.length, 0) > MAX_COMPLETION_CHARACTERS) {
+                        throw new CompletionLimitError();
+                    }
+                    main = transformed.at(-1);
+                    mirrored.forEach((edit, index) => {
+                        edit.text = transformed[index].text;
+                        instances.set(edit, transformed[index]);
+                    });
+                }
+            }
+            const primary = { range: main.range, text: main.text };
+            const changes = [primary, ...mirrored, ...extras];
+            if (changes.reduce((total, edit) => total + edit.text.length, 0) > MAX_COMPLETION_CHARACTERS) {
+                throw new CompletionLimitError();
+            }
+            // Imports and earlier carets move each insertion independently; the primary instance stays last.
+            const starts = [...mirrored, primary].map((insertion) => changes
+                .filter((change) => change !== insertion && comparePositions(change.range.end, insertion.range.start) <= 0)
+                .sort((left, right) => comparePositions(right.range.start, left.range.start))
+                .reduce((place, change) => shiftPosition(place, change), insertion.range.start));
+            const applied = inSnippet ? snippets.applyEdits(changes, snippetToken, extras) : editor.applyEdits(changes);
+            if (!applied) {
+                return;
+            }
+            const landed = editor.getSelections();
+            if (commit === undefined) {
+                this.language.snippets.beginInstances([...mirrored, primary].map((insertion, index) => {
+                    const rendered = insertion === primary ? main : instances.get(insertion);
+                    return { start: starts[index], text: rendered.text, stops: rendered.stops, fields: rendered.fields };
+                }), { nested: continuing && snippets.isActive });
+                if (plan.action === 'add' && plan.inside && mirrored.length > 0 && main.fields === undefined) {
+                    this.placeMirroredCarets(carets, mirrored, landed);
+                }
+                if (plan.action === 'enter') {
+                    const end = editor.getCaret();
+                    editor.setCaret({ line: end.line, character: end.character + plan.shift });
+                }
+            }
+            else {
+                if (this.triggerCharacters().includes(commit)) {
+                    this.beginRequest({ triggerKind: 2, triggerCharacter: commit }, 0);
+                }
+            }
+            this.afterInsert(item, commit, lineBefore);
+            editor.focus();
         }
-        else {
-            const end = editor.getCaret();
-            editor.applyEdits([{ range: { start: end, end }, text: commit }]);
-            if (this.triggerCharacters().includes(commit)) {
-                this.beginRequest({ triggerKind: 2, triggerCharacter: commit }, 0);
+        catch (error) {
+            if (!current()) {
+                return;
+            }
+            if (error instanceof SnippetTransformQueueError) {
+                project.host.notify?.({ id: TOAST_ID, kind: 'error', title: project.i18n.t('editor:language.completion.transformBusy') });
+            }
+            else if (error instanceof CompletionLimitError || (error instanceof SnippetTransformError && error.kind === 'range')) {
+                this.refuseLargeCompletion();
+            }
+            else if (error instanceof SnippetTransformError) {
+                project.host.notify?.({ id: TOAST_ID, kind: 'error', title: project.i18n.t('editor:language.completion.transformFailed') });
+            }
+            else {
+                throw error;
             }
         }
-        this.afterInsert(item, commit, lineBefore);
-        editor.focus();
+    }
+    refuseLargeCompletion() {
+        this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.completion.tooLarge') });
     }
     /* The carets that got the same `()` go inside it like the primary one, which the snippet already placed. */
     placeMirroredCarets(before, mirrored, landed) {
@@ -183,7 +393,7 @@ export class CompletionFeature {
     async resolveNow(item) {
         const { editor, project, uri } = this.language;
         try {
-            return await project.service.resolveCompletion(uri, item);
+            return { ...item, ...(await project.service.resolveCompletion(uri, item)) };
         }
         catch (error) {
             if (!(error instanceof StaleResultError)) {
@@ -192,7 +402,7 @@ 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 : await project.service.resolveCompletion(uri, fresh).catch(() => fresh);
+            return fresh === undefined ? item : { ...fresh, ...(await project.service.resolveCompletion(uri, fresh).catch(() => fresh)) };
         }
         catch {
             return item;
@@ -268,6 +478,7 @@ export class CompletionFeature {
         return this.ranked[this.active]?.item.commitCharacters?.includes(event.key) === true;
     }
     edited(change) {
+        this.textRevision++;
         if (change.source !== 'input' || change.changes.length !== 1) {
             this.close();
             return;
@@ -340,17 +551,21 @@ export class CompletionFeature {
         this.controller?.abort();
         const controller = new AbortController();
         this.controller = controller;
-        let result;
+        let normalized;
         try {
-            result = await project.service.completion(uri, position, context, { signal: controller.signal });
+            const result = await project.service.completion(uri, position, context, { signal: controller.signal });
+            if (request !== this.request || this.controller !== controller || controller.signal.aborted) {
+                return;
+            }
+            normalized = itemsOf(result);
         }
         catch {
+            if (request === this.request && this.controller === controller && !controller.signal.aborted) {
+                this.close();
+            }
             return;
         }
-        if (request !== this.request) {
-            return;
-        }
-        const { items, incomplete } = itemsOf(result);
+        const { items, incomplete } = normalized;
         this.pool = items;
         this.incomplete = incomplete;
         this.resolved.clear();
@@ -428,7 +643,7 @@ export class CompletionFeature {
             void project.service
                 .resolveCompletion(uri, entry.item)
                 .then((item) => {
-                this.resolved.set(entry.item, item);
+                this.resolved.set(entry.item, { ...entry.item, ...item });
                 if (this.ranked[this.active]?.item === entry.item) {
                     this.publish();
                 }

package/dist/diagnostics.js

@@ -1,5 +1,5 @@
 import { isShortcut } from './shortcut-keys.js';
-import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsAt, shiftRange } from './diagnostics-model.js';
+import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsAt, severityOf, shiftRange } from './diagnostics-model.js';
 /*
  * The problems the servers report for one file. A report from a server replaces the one before it
  * from the same server, the editor draws them, and each one follows its text through edits made
@@ -54,7 +54,7 @@ export class DiagnosticsFeature {
             return false;
         }
         const { start } = target.diagnostic.range;
-        this.reveal(start, comparePositions(start, caret) > 0 ? 'centerDown' : 'centerUp');
+        this.reveal(target, comparePositions(start, caret) > 0 ? 'centerDown' : 'centerUp');
         return true;
     }
     /* Puts the caret on the first problem of the file. */
@@ -63,7 +63,7 @@ export class DiagnosticsFeature {
         if (target === null) {
             return false;
         }
-        this.reveal(target.diagnostic.range.start, 'center');
+        this.reveal(target, 'center');
         return true;
     }
     onChange(listener) {
@@ -72,11 +72,13 @@ export class DiagnosticsFeature {
             this.listeners.delete(listener);
         };
     }
-    reveal(position, reveal) {
-        const { editor } = this.language;
-        editor.setCaret(position, reveal);
+    reveal(problem, reveal) {
+        const { editor, project } = this.language;
+        editor.setCaret(problem.diagnostic.range.start, reveal);
         editor.focus();
         this.language.hover.showProblemsAt(editor.getCaret());
+        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 }));
     }
     shift(changes) {
         for (const [server, diagnostics] of this.reports) {

package/dist/diff-expansion.d.ts

@@ -0,0 +1,9 @@
+import { type DiffDocument } from '@adecore/merge';
+export interface DiffLimits {
+    readonly rows: number;
+    readonly characters: number;
+    readonly lineLength: number;
+}
+export declare const DEFAULT_UNFOLD_LIMITS: DiffLimits;
+export declare function fitsDiff(document: DiffDocument, unfolded: ReadonlyMap<number, number>, limits: DiffLimits, maxRows?: number): boolean;
+export declare function expandDiff(document: DiffDocument, unfolded: ReadonlyMap<number, number>, id: number, limits: DiffLimits): ReadonlyMap<number, number>;