@adecore/editor-react 0.23.1 → 0.24.1

package/dist/holder.js

@@ -1,3 +1,4 @@
+/* One value that an effect sets and a render reads through `useSyncExternalStore`, without a state update inside the effect. */
 export function createHolder() {
     let value = null;
     const listeners = new Set();
@@ -5,7 +6,7 @@ export function createHolder() {
         get: () => value,
         set: (next) => {
             value = next;
-            for (const listener of listeners) {
+            for (const listener of [...listeners]) {
                 listener();
             }
         },

package/dist/host-types.d.ts

@@ -4,6 +4,7 @@ import type { i18n } from 'i18next';
 import type { Keymap } from '@adecore/editor/keymap';
 import type { ProjectFiles } from './workspace-edit.ts';
 import type { Place } from './navigation-history.ts';
+import type { ProblemSource } from './project-problems.ts';
 export interface DiskText {
     text: string;
     mtime: number;
@@ -30,6 +31,7 @@ export interface RenameSuggestionsRequest {
     uri: string;
     languageId: string;
     name: string;
+    kind?: string;
     context: string;
     uses: readonly string[];
 }
@@ -55,6 +57,7 @@ export interface LanguageHost {
     readonly keymap?: Keymap;
     readonly panelBodyHeight?: number;
     onPanelResize?(height: number): void;
+    readonly problemSource?: ProblemSource;
     openPlace?(place: Place): void;
     pathOfUri?(uri: string): string | null;
     serverNames?(uri: string): readonly string[];

package/dist/hover.d.ts

@@ -3,6 +3,9 @@ import type { EditorLanguage } from './editor-language.ts';
 import { type HoverText } from './hover-content.ts';
 import { type Timers } from './timers.ts';
 export declare const SHOW_DELAY_MS = 300;
+export interface HoverSettings {
+    readonly referenceCount?: boolean;
+}
 export declare class HoverFeature {
     private readonly language;
     private readonly timers;
@@ -11,11 +14,13 @@ export declare class HoverFeature {
     private hideTimer;
     private countTimer;
     private inCard;
+    private referenceCount;
     private request;
     private lookup;
     private pinned;
     private held;
     constructor(language: EditorLanguage, timers?: Timers);
+    configure(settings: HoverSettings): void;
     holdCard(inside: boolean): void;
     quickInfo(): void;
     showProblemsAt(position: EditorPosition): boolean;

package/dist/hover.js

@@ -1,3 +1,4 @@
+import { KEY_PRIORITY } from './key-priority.js';
 import { rangeHolds } from './diagnostics-model.js';
 import { hoverTextOf, isEmptyHover, locationsOf } from './hover-content.js';
 import { lineTextOf } from './line-text.js';
@@ -23,6 +24,7 @@ export class HoverFeature {
     hideTimer;
     countTimer;
     inCard = false;
+    referenceCount = true;
     /* Counts every request, so an answer that arrives after the pointer moved on is dropped. */
     request = 0;
     lookup = null;
@@ -56,17 +58,17 @@ export class HoverFeature {
                     this.hide();
                 }
             }),
-            editor.onKeyDown((event) => {
+            language.onKey((event) => {
                 if (isShortcut(this.language.shortcuts.quickInfo, event)) {
                     this.quickInfo();
                     return true;
                 }
-                if (event.key === 'Escape' && this.language.popups.getState().hover !== null && this.language.popups.getState().callHierarchy == null) {
+                if (event.key === 'Escape' && this.language.popups.getState().hover !== null && this.language.popups.getState().callHierarchy === null) {
                     this.hide();
                     return true;
                 }
                 return false;
-            })
+            }, KEY_PRIORITY.hover)
         ];
         language.onDispose(() => {
             for (const off of offs) {
@@ -75,6 +77,12 @@ export class HoverFeature {
             this.hide();
         });
     }
+    configure(settings) {
+        this.referenceCount = settings.referenceCount !== false;
+        if (!this.referenceCount) {
+            this.timers.clear(this.countTimer);
+        }
+    }
     /* The pointer entered or left the card, which is where a link in it is clicked. */
     holdCard(inside) {
         this.inCard = inside;
@@ -219,7 +227,7 @@ export class HoverFeature {
         }
         this.pinned = pinned;
         this.present(position, problems, info, problems[0]?.diagnostic.range ?? range);
-        if (info !== null) {
+        if (info !== null && this.referenceCount) {
             this.scheduleCount(position, request, controller.signal);
         }
     }
@@ -250,7 +258,7 @@ export class HoverFeature {
     /* How many places use the symbol, which can take a while in a large project and so arrives after the card does. */
     async count(position, key, request, signal) {
         const { service } = this.language.project;
-        if (request !== this.request || !service.supports('textDocument/references', this.language.uri)) {
+        if (request !== this.request || !this.referenceCount || !service.supports('textDocument/references', this.language.uri)) {
             return;
         }
         const found = await service.references(this.language.uri, position, false, { signal }).catch(() => null);

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export { EditorLanguage, type EditorLanguageOptions } from './editor-language.ts';
+export { KEY_PRIORITY } from './key-priority.ts';
+export { realTimers, type Timers } from './timers.ts';
 export { DEFAULT_RANGE_LINES, DEFAULT_RANGE_CHARACTERS, type SemanticTokensOptions } from './semantic-tokens.ts';
 export { ProjectLanguage, type FileOperationTarget } from './project-language.ts';
 export type { LanguageDocumentHandle } from './project-language.ts';
@@ -7,6 +9,7 @@ export { EditorView } from './EditorView.tsx';
 export { createHolder } from './holder.ts';
 export type { EditorViewProps } from './EditorView.tsx';
 export { LanguagePopups } from './LanguagePopups.tsx';
+export type { LanguagePopupsProps } from './LanguagePopups.tsx';
 export { AnchoredPopup } from './AnchoredPopup.tsx';
 export { HoverCard } from './HoverCard.tsx';
 export { CompletionPopup } from './CompletionPopup.tsx';
@@ -28,13 +31,14 @@ export type { EditorRendering } from './rendering-context.ts';
 export { FindReplace } from './FindReplace.tsx';
 export { ChangeReview } from './ChangeReview.tsx';
 export type { ChangeReviewProps } from './ChangeReview.tsx';
-export { ProjectProblems, countsOf, compareRows } from './project-problems.ts';
-export type { ProblemFile, ProblemRow } from './project-problems.ts';
+export { ProjectProblems, serviceProblems, countsOf, compareRows } from './project-problems.ts';
+export type { ProblemFile, ProblemRow, ProblemReport, ProblemSource } from './project-problems.ts';
 export { applyWorkspaceEdit, supportedResourceOperations } from './workspace-edit.ts';
 export type { ProjectFiles, StagedFile, WorkspaceEditHost } from './workspace-edit.ts';
 export { useProblemCounts } from './use-problem-counts.ts';
 export type { ProblemCounts } from './diagnostics.ts';
 export type { BlameSource, CodeVisionSettings } from './code-vision.ts';
+export type { HoverSettings } from './hover.ts';
 export type { Problem } from './diagnostics-model.ts';
 export type { PopupState, PopupStore, HoverInfo, HoverView, CompletionView, CompletionDocs, CompletionRow, SignatureView, RenameView, RenameFileView, PeekView, CallHierarchyView, PickView, PickGroup, PickRow, PickPreview, SymbolsView, MenuView, AuthorsView } from './popups.ts';
 export { RowHost, LineActionHost } from './row-host.ts';

package/dist/index.js

@@ -1,4 +1,6 @@
 export { EditorLanguage } from './editor-language.js';
+export { KEY_PRIORITY } from './key-priority.js';
+export { realTimers } from './timers.js';
 export { DEFAULT_RANGE_LINES, DEFAULT_RANGE_CHARACTERS } from './semantic-tokens.js';
 export { ProjectLanguage } from './project-language.js';
 export { EditorView } from './EditorView.js';
@@ -21,7 +23,7 @@ export { EditorContextMenu } from './EditorContextMenu.js';
 export { EditorRenderingProvider } from './rendering.js';
 export { FindReplace } from './FindReplace.js';
 export { ChangeReview } from './ChangeReview.js';
-export { ProjectProblems, countsOf, compareRows } from './project-problems.js';
+export { ProjectProblems, serviceProblems, countsOf, compareRows } from './project-problems.js';
 export { applyWorkspaceEdit, supportedResourceOperations } from './workspace-edit.js';
 export { useProblemCounts } from './use-problem-counts.js';
 export { RowHost, LineActionHost } from './row-host.js';

package/dist/key-priority.d.ts

@@ -0,0 +1,23 @@
+import type { EditorKeyHandler } from '@adecore/editor';
+export declare const KEY_PRIORITY: {
+    readonly pick: 1500;
+    readonly diagnostics: 1400;
+    readonly hover: 1300;
+    readonly completion: 1200;
+    readonly snippets: 1100;
+    readonly signature: 1000;
+    readonly highlights: 900;
+    readonly codeActions: 800;
+    readonly rename: 700;
+    readonly navigation: 600;
+    readonly peek: 500;
+    readonly callHierarchy: 400;
+    readonly symbolPicker: 300;
+    readonly history: 200;
+    readonly renderedDocs: 100;
+};
+export declare class KeyDispatcher {
+    private readonly entries;
+    add(handler: EditorKeyHandler, priority: number): () => void;
+    dispatch(event: KeyboardEvent): boolean;
+}

package/dist/key-priority.js

@@ -0,0 +1,39 @@
+/*
+ * Where each feature of an editor sees a key through `EditorLanguage.onKey`, the highest first. A hundred
+ * apart, so a handler of the app can stand between two features; 0, the default, comes after all of them.
+ */
+export const KEY_PRIORITY = {
+    pick: 1500,
+    diagnostics: 1400,
+    hover: 1300,
+    completion: 1200,
+    snippets: 1100,
+    signature: 1000,
+    highlights: 900,
+    codeActions: 800,
+    rename: 700,
+    navigation: 600,
+    peek: 500,
+    callHierarchy: 400,
+    symbolPicker: 300,
+    history: 200,
+    renderedDocs: 100
+};
+/* Hands a key to its handlers by priority until one takes it; of two of the same priority the one added first. */
+export class KeyDispatcher {
+    entries = [];
+    add(handler, priority) {
+        const entry = { handler, priority };
+        const index = this.entries.findIndex((other) => other.priority < priority);
+        this.entries.splice(index === -1 ? this.entries.length : index, 0, entry);
+        return () => {
+            const at = this.entries.indexOf(entry);
+            if (at !== -1) {
+                this.entries.splice(at, 1);
+            }
+        };
+    }
+    dispatch(event) {
+        return [...this.entries].some((entry) => entry.handler(event));
+    }
+}

package/dist/locales/en.json

@@ -178,7 +178,8 @@
             "details": "Details",
             "none": "No suggestions",
             "transformBusy": "Snippet transforms are busy; try again",
-            "transformFailed": "Snippet transform could not be applied"
+            "transformFailed": "Snippet transform could not be applied",
+            "failed": "Could not insert the suggestion: {{message}}"
         },
         "history": {
             "recent": "Recent locations"

package/dist/locales/nl.json

@@ -178,7 +178,8 @@
             "details": "Details",
             "none": "Geen suggesties",
             "transformBusy": "Snippettransformaties zijn bezig; probeer het opnieuw",
-            "transformFailed": "Snippettransformatie kon niet worden toegepast"
+            "transformFailed": "Snippettransformatie kon niet worden toegepast",
+            "failed": "De suggestie kon niet worden ingevoegd: {{message}}"
         },
         "history": {
             "recent": "Recente plekken"

package/dist/models.d.ts

@@ -1,6 +1,6 @@
 export { isIdentifierCharacter, identifierPrefix, type MatchDetail, matchDetail, matchScore, editRangeOf, itemsOf, prefixFor, type Ranked, rankCompletions, matchedCharacters, qualifierOf, qualifiersOf, snippetToText, METHOD_KIND, FUNCTION_KIND, CONSTRUCTOR_KIND, CLASS_KIND, SNIPPET_FORMAT, type Insertion, type SnippetInsertionOptions, insertionOf, mirroredInsertions, documentationText, completionDocsOf, type KindTone, kindLetterOf, kindToneOf, type RowWindow, rowWindow } from './completion-model.ts';
 export { PARAMETER_HINTS_COMMAND, type CallPlan, type CallSite, isCallItem, hasParameters, planCall, withParentheses } from './completion-call.ts';
-export { type Problem, severityOf, markerOf, comparePositions, shiftPosition, shiftRange, rangeHolds, problemsAt, neighborProblem, codeLabelOf } from './diagnostics-model.ts';
+export { type Problem, severityOf, markerOf, comparePositions, shiftPosition, endOfInsertion, shiftRange, rangeHolds, problemsAt, neighborProblem, codeLabelOf } from './diagnostics-model.ts';
 export { type SignatureBlock, type HoverText, splitSignatures, hoverTextOf, isEmptyHover, locationsOf, sameRange, type DocTag, splitDocTags, type HoverSection, type BaselineLevel, type Baseline, docblockMarkdown, type MarkdownPart, markdownParts, hoverSectionsOf } from './hover-content.ts';
 export { type SignatureViewModel, parameterSpan, signatureViewOf } from './signature-model.ts';
 export { wordRangeAt, type RenameTarget, renameTargetOf, type Occurrences, occurrencesOf, type RenameRow, type RenameFile, renameRowsOf, renamePreviewOf } from './rename-model.ts';
@@ -15,7 +15,7 @@ export { resourceOperationsOf, type ResourceOperationView } from './workspace-ed
 export { MAX_DECLARATIONS, type CodeVisionDeclaration, type DeclarationSource, startAfterComments, declarationsOf, usagesText } from './code-vision-model.ts';
 export { UNCOMMITTED, mapBlame, type CodeAuthor, type CodeAuthorship, shortName, authorshipOf, authorsText } from './code-authors.ts';
 export { type SnippetTransform, type SnippetStop, type SnippetRange, type SnippetField, type SnippetVariableResolver, type SnippetTemplate, compileSnippet, type ParsedSnippet, parseSnippet, tabOrder } from './snippet.ts';
-export { type LineSpan, lineSpanOf, isEmptyRange, inlineRangeOf, type InlineProblem, problemsOnLines, type InlineAnswer, parseAnswer, fitReplacement, endOfInsertion, type DiffSegment, diffSegments, emphasisOf, offsetOf, textInRange, replaceRange, locateSelection } from './proposal-model.ts';
+export { type LineSpan, lineSpanOf, isEmptyRange, inlineRangeOf, type InlineProblem, problemsOnLines, type InlineAnswer, parseAnswer, fitReplacement, type DiffSegment, diffSegments, emphasisOf, offsetOf, textInRange, replaceRange, locateSelection } from './proposal-model.ts';
 export { type LineReplacement, replaceLines, replaceAllLines } from './line-edits.ts';
 export { replacedWords } from './word-diff.ts';
 export { type FindOptions, type FindQuery, EMPTY_FIND_QUERY, type TextMatch, type CompiledFind, MATCH_LIMIT, compileFind, matchesIn, stepIndex } from './find-query.ts';

package/dist/models.js

@@ -1,6 +1,6 @@
 export { isIdentifierCharacter, identifierPrefix, matchDetail, matchScore, editRangeOf, itemsOf, prefixFor, rankCompletions, matchedCharacters, qualifierOf, qualifiersOf, snippetToText, METHOD_KIND, FUNCTION_KIND, CONSTRUCTOR_KIND, CLASS_KIND, SNIPPET_FORMAT, insertionOf, mirroredInsertions, documentationText, completionDocsOf, kindLetterOf, kindToneOf, rowWindow } from './completion-model.js';
 export { PARAMETER_HINTS_COMMAND, isCallItem, hasParameters, planCall, withParentheses } from './completion-call.js';
-export { severityOf, markerOf, comparePositions, shiftPosition, shiftRange, rangeHolds, problemsAt, neighborProblem, codeLabelOf } from './diagnostics-model.js';
+export { severityOf, markerOf, comparePositions, shiftPosition, endOfInsertion, shiftRange, rangeHolds, problemsAt, neighborProblem, codeLabelOf } from './diagnostics-model.js';
 export { splitSignatures, hoverTextOf, isEmptyHover, locationsOf, sameRange, splitDocTags, docblockMarkdown, markdownParts, hoverSectionsOf } from './hover-content.js';
 export { parameterSpan, signatureViewOf } from './signature-model.js';
 export { wordRangeAt, renameTargetOf, occurrencesOf, renameRowsOf, renamePreviewOf } from './rename-model.js';
@@ -15,7 +15,7 @@ export { resourceOperationsOf } from './workspace-edit.js';
 export { MAX_DECLARATIONS, startAfterComments, declarationsOf, usagesText } from './code-vision-model.js';
 export { UNCOMMITTED, mapBlame, shortName, authorshipOf, authorsText } from './code-authors.js';
 export { compileSnippet, parseSnippet, tabOrder } from './snippet.js';
-export { lineSpanOf, isEmptyRange, inlineRangeOf, problemsOnLines, parseAnswer, fitReplacement, endOfInsertion, diffSegments, emphasisOf, offsetOf, textInRange, replaceRange, locateSelection } from './proposal-model.js';
+export { lineSpanOf, isEmptyRange, inlineRangeOf, problemsOnLines, parseAnswer, fitReplacement, diffSegments, emphasisOf, offsetOf, textInRange, replaceRange, locateSelection } from './proposal-model.js';
 export { replaceLines, replaceAllLines } from './line-edits.js';
 export { replacedWords } from './word-diff.js';
 export { EMPTY_FIND_QUERY, MATCH_LIMIT, compileFind, matchesIn, stepIndex } from './find-query.js';

package/dist/navigation.js

@@ -1,4 +1,5 @@
 import { StaleResultError, fileUriToPath } from '@adecore/lsp';
+import { KEY_PRIORITY } from './key-priority.js';
 import { basenameOf } from './paths.js';
 import { rangeHolds } from './diagnostics-model.js';
 import { placesOfName } from './symbol-links.js';
@@ -62,14 +63,14 @@ export class NavigationFeature {
                 void this.go('definition', click.position);
                 return true;
             }),
-            editor.onKeyDown((event) => {
+            language.onKey((event) => {
                 const found = SHORTCUT_KINDS.find(([, name]) => isShortcut(this.language.shortcuts[name], event));
                 if (found === undefined) {
                     return false;
                 }
                 void this.go(found[0]);
                 return true;
-            })
+            }, KEY_PRIORITY.navigation)
         ];
         language.onDispose(() => {
             for (const off of offs) {

package/dist/peek.js

@@ -1,4 +1,5 @@
 import { StaleResultError } from '@adecore/lsp';
+import { KEY_PRIORITY } from './key-priority.js';
 import { uniquePlaces } from './navigation.js';
 import { PEEK_READ_FILES, definitionSnippetOf, peekFilesOf, snippetOf } from './peek-model.js';
 import { isShortcut } from './shortcut-keys.js';
@@ -35,7 +36,7 @@ export class PeekFeature {
         this.timers = timers;
         const { editor } = language;
         const offs = [
-            editor.onKeyDown((event) => {
+            language.onKey((event) => {
                 if (isShortcut(this.language.shortcuts.peekReferences, event)) {
                     void this.open();
                     return true;
@@ -45,7 +46,7 @@ export class PeekFeature {
                     return true;
                 }
                 return this.key(event);
-            }),
+            }, KEY_PRIORITY.peek),
             editor.onTextChange(() => this.close())
         ];
         language.onDispose(() => {

package/dist/pick.js

@@ -1,3 +1,4 @@
+import { KEY_PRIORITY } from './key-priority.js';
 import { realTimers } from './timers.js';
 const PREVIEW_DELAY_MS = 120;
 /*
@@ -21,7 +22,7 @@ export class PickFeature {
         this.timers = timers;
         const { editor } = language;
         const offs = [
-            editor.onKeyDown((event) => this.key(event)),
+            language.onKey((event) => this.key(event), KEY_PRIORITY.pick),
             editor.onTextChange(() => this.close()),
             editor.onCaret(() => this.close()),
             editor.onBlur(() => this.close())

package/dist/popup-focus.d.ts

@@ -0,0 +1,5 @@
+import type { FocusEvent, MouseEvent } from 'react';
+export declare function keepFocusOutOfList(focusBack: () => void): {
+    onMouseDown(event: MouseEvent): void;
+    onFocus(event: FocusEvent): void;
+};

package/dist/popup-focus.js

@@ -0,0 +1,12 @@
+/*
+ * The handlers for a popup list whose rows the keyboard never enters: the text it belongs to keeps the
+ * focus, and the active row is only `aria-activedescendant` or a highlight. Chromium reports that row as
+ * the focused element, so a tool that focuses it before it types would otherwise pull the keys out of the
+ * text. A press on the list moves no focus, and a row that gets it anyway hands it straight back.
+ */
+export function keepFocusOutOfList(focusBack) {
+    return {
+        onMouseDown: (event) => event.preventDefault(),
+        onFocus: () => focusBack()
+    };
+}

package/dist/popups.d.ts

@@ -141,7 +141,7 @@ export interface PopupState {
     readonly pick: PickView | null;
     readonly rename: RenameView | null;
     readonly peek: PeekView | null;
-    readonly callHierarchy?: CallHierarchyView | null;
+    readonly callHierarchy: CallHierarchyView | null;
     readonly symbols: SymbolsView | null;
     readonly menu: MenuView | null;
     readonly authors: AuthorsView | null;

package/dist/project-language.js

@@ -2,7 +2,7 @@ import { disposeSnippetTransforms } from './snippet-transform-queue.js';
 import i18next, {} from 'i18next';
 import { fileUriToPath, pathToFileUri } from '@adecore/lsp';
 import { NavigationHistory } from './navigation-history.js';
-import { ProjectProblems } from './project-problems.js';
+import { ProjectProblems, serviceProblems } from './project-problems.js';
 import { applyWorkspaceEdit } from './workspace-edit.js';
 import { relativeTo } from './paths.js';
 import { PANEL_BODY_HEIGHT } from './panel-size.js';
@@ -85,7 +85,7 @@ export class ProjectLanguage {
         this.folder = host.folder ?? '';
         this.files = host.files ?? null;
         this.panelBodyHeight = host.panelBodyHeight ?? PANEL_BODY_HEIGHT;
-        this.problems = new ProjectProblems(service, (uri) => this.pathOfLocation(uri) ?? uri);
+        this.problems = new ProjectProblems(host.problemSource ?? serviceProblems(service, (uri) => this.pathOfLocation(uri) ?? uri));
     }
     /* Open panels of other editors of the project follow a resize. */
     onPanelBodyChange(listener) {
@@ -211,9 +211,10 @@ export class ProjectLanguage {
             void holder.sync.ready
                 .catch(() => undefined)
                 .then(() => {
-                if (!this.holders.has(uri)) {
-                    return this.service.closeDocument(uri);
+                if (this.holders.has(uri)) {
+                    return undefined;
                 }
+                return this.service.closeDocument(uri);
             })
                 .catch(() => undefined);
         }

package/dist/project-problems.d.ts

@@ -9,12 +9,21 @@ export interface ProblemFile {
     readonly rows: readonly ProblemRow[];
 }
 export declare function compareRows(left: ProblemRow, right: ProblemRow): number;
+export interface ProblemReport {
+    readonly path: string;
+    readonly server: string;
+    readonly diagnostics: readonly Diagnostic[];
+}
+export type ProblemSource = (listener: (report: ProblemReport) => void) => () => void;
+export declare function serviceProblems(service: LanguageService, pathOf?: (uri: string) => string): ProblemSource;
 export declare class ProjectProblems {
     private readonly reports;
+    private readonly files;
     private readonly listeners;
     private readonly stop;
+    private order;
     private snapshot;
-    constructor(service: LanguageService, pathOf?: (uri: string) => string);
+    constructor(source: ProblemSource | LanguageService, pathOf?: (uri: string) => string);
     report(path: string, server: string, diagnostics: readonly Diagnostic[]): void;
     getSnapshot: () => readonly ProblemFile[];
     subscribe: (listener: () => void) => (() => void);

package/dist/project-problems.js

@@ -5,22 +5,38 @@ export function compareRows(left, right) {
     return (SEVERITY_ORDER[severityOf(left.diagnostic)] - SEVERITY_ORDER[severityOf(right.diagnostic)] ||
         comparePositions(left.diagnostic.range.start, right.diagnostic.range.start));
 }
+/* The diagnostics a service reports, by the stored path `pathOf` gives each URI. */
+export function serviceProblems(service, pathOf = (uri) => uri) {
+    return (listener) => {
+        const subscription = service.onDiagnostics((report) => listener({ path: pathOf(report.uri), server: report.source, diagnostics: report.diagnostics }));
+        return () => subscription.dispose();
+    };
+}
 /*
  * Each report replaces the previous diagnostics from that source for the file. Files with no
  * remaining problems drop out. Hints remain editor annotations rather than listed problems.
  */
 export class ProjectProblems {
     reports = new Map();
+    files = new Map();
     listeners = new Set();
     stop;
+    /* The paths of `files` in order; null once a file came or went. */
+    order = [];
+    /* Made on first read after a report, so a project nobody lists does no sorting. */
     snapshot = [];
-    constructor(service, pathOf = (uri) => uri) {
-        const subscription = service.onDiagnostics((report) => this.report(pathOf(report.uri), report.source, report.diagnostics));
-        this.stop = () => subscription.dispose();
+    /* A service stands for `serviceProblems(service, pathOf)`. */
+    constructor(source, pathOf) {
+        const listen = typeof source === 'function' ? source : serviceProblems(source, pathOf);
+        this.stop = listen((report) => this.report(report.path, report.server, report.diagnostics));
     }
     report(path, server, diagnostics) {
         const kept = diagnostics.filter((diagnostic) => severityOf(diagnostic) !== 'hint');
         const servers = this.reports.get(path) ?? new Map();
+        if (kept.length === 0 && !servers.has(server)) {
+            // A clean file reported clean again, as servers do after every edit.
+            return;
+        }
         if (kept.length === 0) {
             servers.delete(server);
         }
@@ -29,22 +45,30 @@ export class ProjectProblems {
         }
         if (servers.size === 0) {
             this.reports.delete(path);
+            this.files.delete(path);
+            this.order = null;
         }
         else {
+            if (!this.files.has(path)) {
+                this.order = null;
+            }
             this.reports.set(path, servers);
+            const rows = [...servers].flatMap(([name, list]) => list.map((diagnostic) => ({ diagnostic, server: name }))).sort(compareRows);
+            this.files.set(path, { path, rows });
         }
-        this.snapshot = [...this.reports]
-            .map(([file, byServer]) => ({
-            path: file,
-            rows: [...byServer].flatMap(([name, list]) => list.map((diagnostic) => ({ diagnostic, server: name }))).sort(compareRows)
-        }))
-            .sort((left, right) => left.path.localeCompare(right.path));
+        this.snapshot = null;
         for (const listener of [...this.listeners]) {
             listener();
         }
     }
     /* The same array until the next report, which is what a store a component reads must hand out. */
-    getSnapshot = () => this.snapshot;
+    getSnapshot = () => {
+        if (this.snapshot === null) {
+            this.order ??= [...this.files.keys()].sort((left, right) => left.localeCompare(right));
+            this.snapshot = this.order.map((path) => this.files.get(path));
+        }
+        return this.snapshot;
+    };
     subscribe = (listener) => {
         this.listeners.add(listener);
         return () => {

package/dist/proposal-model.d.ts

@@ -21,7 +21,6 @@ export interface InlineAnswer {
 }
 export declare function parseAnswer(text: string): InlineAnswer;
 export declare function fitReplacement(selected: string, replacement: string): string;
-export declare function endOfInsertion(start: EditorPosition, text: string): EditorPosition;
 export interface DiffSegment {
     readonly kind: 'same' | 'added' | 'removed';
     readonly text: string;

package/dist/proposal-model.js

@@ -94,14 +94,6 @@ export function fitReplacement(selected, replacement) {
     }
     return breaks === '\n' ? fitted : fitted.replace(/\n/g, breaks);
 }
-/* Where the caret stands after `text` was typed at `start`. */
-export function endOfInsertion(start, text) {
-    const lines = text.split('\n');
-    if (lines.length === 1) {
-        return { line: start.line, character: start.character + text.length };
-    }
-    return { line: start.line + lines.length - 1, character: lines.at(-1).length };
-}
 function linesOf(text) {
     const lines = text.replace(/\r\n/g, '\n').split('\n');
     return lines.length > 1 && lines.at(-1) === '' ? lines.slice(0, -1) : lines;

package/dist/rename-model.d.ts

@@ -1,5 +1,5 @@
 import type { EditorPosition, EditorRange } from '@adecore/editor';
-import type { Location, PrepareRenameResult, TextEdit, WorkspaceEdit } from '@adecore/lsp';
+import type { DocumentSymbolResult, Location, PrepareRenameResult, TextEdit, WorkspaceEdit } from '@adecore/lsp';
 export declare function wordRangeAt(lineText: string, position: EditorPosition): EditorRange | null;
 export interface RenameTarget {
     readonly range: EditorRange;
@@ -12,6 +12,7 @@ export interface Occurrences {
     readonly files: number;
 }
 export declare function occurrencesOf(locations: readonly Location[], uri: string): Occurrences;
+export declare function renameKindOf(result: DocumentSymbolResult, name: string, places: readonly EditorRange[]): string | undefined;
 export interface RenameRow {
     readonly line: number;
     readonly before: string;

package/dist/rename-model.js

@@ -1,4 +1,5 @@
 import { isIdentifierCharacter } from './completion-model.js';
+import { rangeHolds } from './diagnostics-model.js';
 import { textEntriesOf } from './workspace-edit.js';
 /* The identifier the caret is in or touches; null where there is none. */
 export function wordRangeAt(lineText, position) {
@@ -36,6 +37,62 @@ export function occurrencesOf(locations, uri) {
         files: new Set(locations.map((location) => location.uri)).size
     };
 }
+/* LSP's SymbolKind in words, indexed by its number. */
+const SYMBOL_KINDS = [
+    '',
+    'file',
+    'module',
+    'namespace',
+    'package',
+    'class',
+    'method',
+    'property',
+    'field',
+    'constructor',
+    'enum',
+    'interface',
+    'function',
+    'variable',
+    'constant',
+    'string',
+    'number',
+    'boolean',
+    'array',
+    'object',
+    'key',
+    'null',
+    'enum member',
+    'struct',
+    'event',
+    'operator',
+    'type parameter'
+];
+/*
+ * The kind of the symbol a rename names, in words, from the outline of the open file: the symbol whose name
+ * holds one of the places of the name there. Undefined when the outline does not list it, as with most locals.
+ */
+export function renameKindOf(result, name, places) {
+    if (result === null || result.length === 0) {
+        return undefined;
+    }
+    const named = (range) => places.some((place) => rangeHolds(range, place.start));
+    if ('range' in result[0]) {
+        let found;
+        const walk = (symbols) => {
+            for (const symbol of symbols) {
+                if (named(symbol.selectionRange)) {
+                    found = symbol;
+                }
+                walk(symbol.children ?? []);
+            }
+        };
+        walk(result);
+        return found === undefined ? undefined : SYMBOL_KINDS[found.kind];
+    }
+    // A flat list only gives the whole span of a symbol, so the name has to match as well.
+    const found = result.find((symbol) => 'location' in symbol && symbol.name === name && named(symbol.location.range));
+    return found === undefined ? undefined : SYMBOL_KINDS[found.kind];
+}
 function lineStarts(text) {
     const starts = [0];
     for (let index = 0; index < text.length; index++) {

package/dist/rename.d.ts

@@ -14,6 +14,7 @@ export declare class RenameFeature {
     private finish;
     private light;
     private suggest;
+    private kindOf;
     private linesOf;
     private publish;
     private tell;