@adecore/editor-react 0.17.0-beta.1 → 0.17.0-beta.2

package/dist/navigation.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError, fileUriToPath } from '@adecore/lsp';
 import { basenameOf } from './paths.js';
 import { rangeHolds } from './diagnostics-model.js';
@@ -16,9 +15,6 @@ const SHORTCUT_KINDS = [
     ['implementation', 'goToImplementation']
 ];
 const TOAST_ID = 'language-navigation';
-function say(key, options) {
-    return i18next.t(`editor:language.navigation.${key}`, options);
-}
 /* The places of a result, each once: the two servers of a Vue file may both know the same one. `target` is the whole declaration when the server gave it. */
 export function uniquePlaces(result) {
     const seen = new Set();
@@ -80,7 +76,7 @@ export class NavigationFeature {
     async go(kind, position = this.language.editor.getCaret()) {
         const { project, uri, editor } = this.language;
         if (!this.supports(kind)) {
-            this.tell(say('unavailable'));
+            this.tell(this.say('unavailable'));
             return;
         }
         let result;
@@ -96,13 +92,13 @@ export class NavigationFeature {
         }
         catch (error) {
             if (!(error instanceof StaleResultError)) {
-                this.tell(say('failed', { message: error instanceof Error ? error.message : String(error) }));
+                this.tell(this.say('failed', { message: error instanceof Error ? error.message : String(error) }));
             }
             return;
         }
         const places = uniqueLocations(result);
         if (places.length === 0) {
-            this.tell(say('none'));
+            this.tell(this.say('none'));
         }
         else if (kind === 'definition' && places.length === 1 && places[0].uri === uri && rangeHolds(places[0].range, position)) {
             // The name is its own definition, so what a person wants to see is where it is used.
@@ -112,7 +108,7 @@ export class NavigationFeature {
             this.language.goTo(places[0]);
         }
         else {
-            this.language.locations(places, position, say(`titles.${kind}`));
+            this.language.locations(places, position, this.say(`titles.${kind}`));
         }
         editor.focus();
     }
@@ -136,7 +132,7 @@ export class NavigationFeature {
                 this.language.goTo(places[0]);
             }
             else if (places.length > 1) {
-                this.language.locations(places, anchor, say('titles.symbol'));
+                this.language.locations(places, anchor, this.say('titles.symbol'));
             }
         }
         catch {
@@ -146,6 +142,9 @@ export class NavigationFeature {
     tell(title) {
         this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title });
     }
+    say(key, options) {
+        return this.language.project.i18n.t(`editor:language.navigation.${key}`, options);
+    }
 }
 /* How a place reads in a list: the file and the line, with the folder it is in. */
 export function locationRow(location, stored) {

package/dist/peek.d.ts

@@ -25,5 +25,6 @@ export declare class PeekFeature {
     private key;
     private step;
     private tell;
+    private say;
 }
 export {};

package/dist/peek.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError } from '@adecore/lsp';
 import { uniquePlaces } from './navigation.js';
 import { PEEK_READ_FILES, definitionSnippetOf, peekFilesOf, snippetOf } from './peek-model.js';
@@ -13,9 +12,6 @@ const KINDS = {
 function placeKey(location) {
     return `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`;
 }
-function say(key, options) {
-    return i18next.t(`editor:language.peek.${key}`, options);
-}
 /*
  * The references of the name at the caret, between the lines of the file under the line it is on. The
  * editor keeps the keyboard: arrows pick a reference, Enter goes to it and Escape closes the peek; typing
@@ -62,7 +58,7 @@ export class PeekFeature {
         const { editor, project, uri } = this.language;
         const method = KINDS[kind].method;
         if (!project.service.supports(method, uri)) {
-            this.tell(say(KINDS[kind].unavailable));
+            this.tell(this.say(KINDS[kind].unavailable));
             return;
         }
         const token = ++this.token;
@@ -72,7 +68,7 @@ export class PeekFeature {
         }
         catch (error) {
             if (!(error instanceof StaleResultError)) {
-                this.tell(say('failed', { message: error instanceof Error ? error.message : String(error) }));
+                this.tell(this.say('failed', { message: error instanceof Error ? error.message : String(error) }));
             }
             return;
         }
@@ -84,7 +80,7 @@ export class PeekFeature {
             other.range.start.line === location.range.start.line &&
             other.range.start.character === location.range.start.character) === index);
         if (unique.length === 0) {
-            this.tell(say(KINDS[kind].none));
+            this.tell(this.say(KINDS[kind].none));
             return;
         }
         const uris = [...new Set(unique.map((location) => location.uri))].slice(0, PEEK_READ_FILES);
@@ -213,4 +209,7 @@ export class PeekFeature {
     tell(title) {
         this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title });
     }
+    say(key, options) {
+        return this.language.project.i18n.t(`editor:language.peek.${key}`, options);
+    }
 }

package/dist/project-language.d.ts

@@ -1,3 +1,4 @@
+import { type i18n } from 'i18next';
 import { type ApplyWorkspaceEditResult, type LanguageService, type WorkspaceEdit } from '@adecore/lsp';
 import type { Editor, EditorPosition } from '@adecore/editor';
 import { NavigationHistory, type Place } from './navigation-history.ts';
@@ -12,6 +13,7 @@ export interface LanguageDocumentHandle {
 export declare class ProjectLanguage {
     readonly service: LanguageService;
     readonly host: LanguageHost;
+    readonly i18n: i18n;
     readonly folder: string;
     readonly problems: ProjectProblems;
     readonly history: NavigationHistory;

package/dist/project-language.js

@@ -1,3 +1,4 @@
+import i18next, {} from 'i18next';
 import { fileUriToPath } from '@adecore/lsp';
 import { NavigationHistory } from './navigation-history.js';
 import { ProjectProblems } from './project-problems.js';
@@ -55,6 +56,7 @@ class DocumentSync {
 export class ProjectLanguage {
     service;
     host;
+    i18n;
     folder;
     problems;
     history = new NavigationHistory();
@@ -66,6 +68,7 @@ export class ProjectLanguage {
     constructor(service, host = {}) {
         this.service = service;
         this.host = host;
+        this.i18n = host.i18n ?? i18next;
         this.folder = host.folder ?? '';
         this.files = host.files ?? null;
         this.problems = new ProjectProblems(service, (uri) => this.pathOfLocation(uri) ?? uri);

package/dist/rename.d.ts

@@ -17,4 +17,5 @@ export declare class RenameFeature {
     private suggest;
     private linesOf;
     private publish;
+    private say;
 }

package/dist/rename.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError } from '@adecore/lsp';
 import { occurrencesOf, renamePreviewOf, renameTargetOf, wordRangeAt } from './rename-model.js';
 import { isShortcut } from './shortcut-keys.js';
@@ -8,9 +7,6 @@ const TOAST_ID = 'language-rename';
 const SAMPLE_LOCATIONS = 8;
 const SAMPLE_OTHER_FILES = 3;
 const CONTEXT_LINES = 3;
-function say(key, options) {
-    return i18next.t(`editor:language.rename.${key}`, options);
-}
 /*
  * Renaming a symbol. The input sits on the symbol itself, every place the name has lights up while the
  * new one is typed, Enter applies the server's edit at once and Shift+Enter lists what it would change first.
@@ -48,7 +44,7 @@ export class RenameFeature {
     async start() {
         const { editor, project, uri } = this.language;
         if (!project.service.supports(METHOD, uri)) {
-            this.tell('error', say('unavailable'));
+            this.tell('error', this.say('unavailable'));
             return;
         }
         this.cancel();
@@ -60,13 +56,13 @@ export class RenameFeature {
         }
         catch (error) {
             if (!(error instanceof StaleResultError)) {
-                this.tell('error', say('nothing'));
+                this.tell('error', this.say('nothing'));
             }
             return;
         }
         const target = renameTargetOf(answer, (range) => editor.textInRange(range), () => wordRangeAt(editor.textInRange({ start: { line: caret.line, character: 0 }, end: { line: caret.line, character: Number.MAX_SAFE_INTEGER } }), caret));
         if (target === null) {
-            this.tell('error', say('nothing'));
+            this.tell('error', this.say('nothing'));
             return;
         }
         const session = { target, original: editor.textInRange(target.range), edit: null, names: new AbortController() };
@@ -93,7 +89,7 @@ export class RenameFeature {
                 return;
             }
             if (edit === null) {
-                this.fail(say('refused'));
+                this.fail(this.say('refused'));
                 return;
             }
             session.edit = edit;
@@ -114,7 +110,7 @@ export class RenameFeature {
         }
         catch (error) {
             if (this.session === session) {
-                this.fail(error instanceof StaleResultError ? say('stale') : error instanceof Error ? error.message : String(error));
+                this.fail(error instanceof StaleResultError ? this.say('stale') : error instanceof Error ? error.message : String(error));
             }
         }
     }
@@ -140,14 +136,14 @@ export class RenameFeature {
             this.finish();
         }
         else {
-            this.fail(result.failureReason ?? say('refused'));
+            this.fail(result.failureReason ?? this.say('refused'));
         }
     }
     /* The input stays, with the reason under it, so the name can be changed and tried again. */
     fail(message) {
         if (this.session !== null) {
             this.session.edit = null;
-            this.publish({ phase: 'input', busy: false, files: [], error: say('failed', { message }) });
+            this.publish({ phase: 'input', busy: false, files: [], error: this.say('failed', { message }) });
         }
     }
     /* The name was changed, which answers the failure under it. */
@@ -255,4 +251,7 @@ export class RenameFeature {
             }
         });
     }
+    say(key, options) {
+        return this.language.project.i18n.t(`editor:language.rename.${key}`, options);
+    }
 }

package/dist/semantic-tokens.js

@@ -25,14 +25,12 @@ export class SemanticTokensFeature {
             }
         }, PAUSE_MS, timers);
         const edits = editor.onTextChange(() => this.refresher.later());
-        const providers = project.service.onProvidersChanged((changed) => {
-            if (changed === uri) {
-                this.refresher.now();
-            }
+        const providers = language.onProvidersChanged(() => {
+            this.refresher.now();
         });
         language.onDispose(() => {
             edits();
-            providers.dispose();
+            providers();
             this.refresher.dispose();
             editor.setSemanticTokens(null);
         });

package/dist/symbol-picker.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError } from '@adecore/lsp';
 import { basenameOf } from './paths.js';
 import { entriesOf, workspaceEntriesOf } from './symbol-picker-model.js';
@@ -28,7 +27,7 @@ export class SymbolPickerFeature {
     async open() {
         const { project, uri, popups } = this.language;
         if (!project.service.supports('textDocument/documentSymbol', uri)) {
-            this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: i18next.t('editor:language.symbols.unavailable') });
+            this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.symbols.unavailable') });
             return;
         }
         try {
@@ -40,7 +39,7 @@ export class SymbolPickerFeature {
                 this.language.project.host.notify?.({
                     id: TOAST_ID,
                     kind: 'error',
-                    title: i18next.t('editor:language.symbols.failed', { message: error instanceof Error ? error.message : String(error) })
+                    title: this.language.project.i18n.t('editor:language.symbols.failed', { message: error instanceof Error ? error.message : String(error) })
                 });
             }
         }

package/dist/symbols.js

@@ -75,14 +75,12 @@ export class SymbolsFeature {
             }
         }, PAUSE_MS, timers);
         const edits = editor.onTextChange(() => this.refresher.later());
-        const providers = project.service.onProvidersChanged((changed) => {
-            if (changed === uri) {
-                this.refresher.now();
-            }
+        const providers = language.onProvidersChanged(() => {
+            this.refresher.now();
         });
         language.onDispose(() => {
             edits();
-            providers.dispose();
+            providers();
             this.refresher.dispose();
             editor.setBlocks(null);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.17.0-beta.1",
+  "version": "0.17.0-beta.2",
   "type": "module",
   "description": "Language-enabled editors, feature coordination and React popups over injected language services.",
   "license": "FSL-1.1-MIT",
@@ -57,9 +57,9 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor": "0.17.0-beta.1",
-    "@adecore/lsp": "0.17.0-beta.1",
-    "@adecore/merge": "0.17.0-beta.1",
+    "@adecore/editor": "0.17.0-beta.2",
+    "@adecore/lsp": "0.17.0-beta.2",
+    "@adecore/merge": "0.17.0-beta.2",
     "zustand": "^5.0.15",
     "lucide-react": "^1.47.0",
     "react-markdown": "^10.1.0",
@@ -67,7 +67,7 @@
     "remark-breaks": "^4.0.0"
   },
   "peerDependencies": {
-    "@adecore/ui": "^0.17.0-beta.1",
+    "@adecore/ui": "^0.17.0-beta.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "i18next": "^26.4.2",

package/src/EditorView.tsx

@@ -1,5 +1,5 @@
 import { createHolder } from './holder.ts';
-import { useLayoutEffect, useMemo, useRef, useSyncExternalStore, type Ref } from 'react';
+import { useLayoutEffect, useMemo, useRef, useSyncExternalStore, type ReactNode, type Ref } from 'react';
 import type { Editor, EditorEngine, EditorOptions } from '@adecore/editor';
 import { EditorLanguage } from './editor-language.ts';
 import { LanguagePopups } from './LanguagePopups.tsx';
@@ -14,9 +14,11 @@ export interface EditorViewProps {
     className?: string;
     ref?: Ref<HTMLDivElement>;
     onMount?(editor: Editor, language: EditorLanguage | null): void | (() => void);
+    /* Rows of the app in the context menu, between the refactorings and the clipboard rows. */
+    contextMenuItems?(language: EditorLanguage): ReactNode;
 }
 
-export function EditorView({ engine, options, project, uri, languageId, className, ref, onMount }: EditorViewProps) {
+export function EditorView({ engine, options, project, uri, languageId, className, ref, onMount, contextMenuItems }: EditorViewProps) {
     const element = useRef<HTMLDivElement>(null);
     const holder = useMemo(() => createHolder<EditorLanguage>(), []);
     const language = useSyncExternalStore(holder.subscribe, holder.get, holder.get);
@@ -39,7 +41,7 @@ export function EditorView({ engine, options, project, uri, languageId, classNam
     return (
         <div className={className} ref={ref} style={{ position: 'relative', minHeight: 0 }}>
             <div ref={element} style={{ position: 'absolute', inset: 0 }} />
-            {language !== null && <LanguagePopups language={language} />}
+            {language !== null && <LanguagePopups language={language} contextMenuItems={contextMenuItems} />}
         </div>
     );
 }

package/src/LanguagePopups.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useReducer } from 'react';
+import { useEffect, useReducer, type ReactNode } from 'react';
 import { useStore } from 'zustand';
 import type { EditorLanguage } from './editor-language.ts';
 import { AnchoredPopup } from './AnchoredPopup.tsx';
@@ -15,9 +15,9 @@ import { SignatureCard } from './SignatureCard.tsx';
 /*
  * Every card a language feature opens over the editor. Each feature keeps its own state and these
  * only draw it, placed by the screen position of the character it belongs to, which is read again
- * whenever the editor scrolls or resizes.
+ * whenever the editor scrolls or resizes. `contextMenuItems` adds rows of the app to the context menu.
  */
-export function LanguagePopups({ language }: { language: EditorLanguage }) {
+export function LanguagePopups({ language, contextMenuItems }: { language: EditorLanguage; contextMenuItems?: (language: EditorLanguage) => ReactNode }) {
     const [, redraw] = useReducer((count: number) => count + 1, 0);
     const hover = useStore(language.popups, (state) => state.hover);
     const completion = useStore(language.popups, (state) => state.completion);
@@ -51,7 +51,11 @@ export function LanguagePopups({ language }: { language: EditorLanguage }) {
             )}
             {completion !== null && completionRect !== null && <CompletionPopup language={language} view={completion} rect={completionRect} />}
             {pick !== null && pickRect !== null && <PickPopup language={language} view={pick} rect={pickRect} />}
-            {menu !== null && <EditorContextMenu language={language} view={menu} />}
+            {menu !== null && (
+                <EditorContextMenu language={language} view={menu}>
+                    {contextMenuItems?.(language)}
+                </EditorContextMenu>
+            )}
             {symbols !== null && <SymbolPicker language={language} view={symbols} />}
             {peek !== null && <PeekPanel language={language} view={peek} />}
             {authors !== null && <CodeAuthorsCard language={language} view={authors} />}

package/src/code-actions.ts

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { ErrorCodes, LspError, StaleResultError, type CodeAction, type Command, type Diagnostic, type Position } from '@adecore/lsp';
 import type { EditorPosition, EditorRange } from '@adecore/editor';
 import {
@@ -49,10 +48,6 @@ interface AskOptions {
     readonly groups?: readonly ActionGroup[];
 }
 
-function say(key: string, options?: Record<string, unknown>): string {
-    return i18next.t(`editor:language.actions.${key}`, options);
-}
-
 /*
  * What the language servers offer to do at the caret or the selection: a lightbulb in the gutter on the line
  * that has something, a list under the caret (Mod+.) grouped by kind with the change an action would make
@@ -72,12 +67,10 @@ export class CodeActionsFeature {
 
     constructor(language: EditorLanguage, timers: Timers = realTimers) {
         this.language = language;
-        const { editor, project, uri } = language;
+        const { editor } = language;
         this.refresher = new Refresher((signal) => this.hint(signal), PAUSE_MS, timers);
-        const providers = project.service.onProvidersChanged((changed) => {
-            if (changed === uri) {
-                this.refresher.later();
-            }
+        const providers = language.onProvidersChanged(() => {
+            this.refresher.later();
         });
         const offs = [
             editor.onCaret(() => {
@@ -98,7 +91,7 @@ export class CodeActionsFeature {
                 return false;
             }),
             language.diagnostics.onChange(() => this.refresher.later()),
-            () => providers.dispose()
+            providers
         ];
         language.onDispose(() => {
             for (const off of offs) {
@@ -137,7 +130,7 @@ export class CodeActionsFeature {
         const entries = await this.request(everything, ['source.organizeImports'], INVOKED);
         const entry = entries?.find((candidate) => candidate.action.kind?.startsWith('source.organizeImports') === true);
         if (entry === undefined) {
-            this.tell('success', say(entries === null ? 'unavailable' : 'organized'));
+            this.tell('success', this.say(entries === null ? 'unavailable' : 'organized'));
             return;
         }
         await this.apply(entry);
@@ -146,13 +139,13 @@ export class CodeActionsFeature {
     async formatDocument(): Promise<void> {
         const { editor, project, uri } = this.language;
         if (!project.service.supports('textDocument/formatting', uri)) {
-            this.tell('error', say('noFormatter'));
+            this.tell('error', this.say('noFormatter'));
             return;
         }
         try {
             const edits = await project.service.formatting(uri, { ...editor.getIndentation() });
             if (edits !== null && edits.length > 0 && !editor.applyEdits(edits.map((edit) => ({ range: edit.range, text: edit.newText })))) {
-                this.tell('error', say('readOnly'));
+                this.tell('error', this.say('readOnly'));
             }
         } catch (error) {
             this.fail(error);
@@ -175,7 +168,7 @@ export class CodeActionsFeature {
 
     private async ask(options: AskOptions): Promise<void> {
         if (!this.supported) {
-            this.tell('error', say('unavailable'));
+            this.tell('error', this.say('unavailable'));
             return;
         }
         // The press on a card or the gutter may have taken the focus, and the list answers to the editor's keys.
@@ -193,13 +186,13 @@ export class CodeActionsFeature {
             return;
         }
         if (entries.length === 0) {
-            this.tell('success', say('none'));
+            this.tell('success', this.say('none'));
             return;
         }
         const byId = new Map(entries.map((entry) => [entry.id, entry]));
         const groups: PickGroup[] = (options.groups ?? ACTION_GROUPS).flatMap((group): PickGroup[] => {
             const rows = entries.filter((entry) => entry.group === group).map((entry) => ({ id: entry.id, label: entry.action.title, detail: '' }));
-            return rows.length === 0 ? [] : [{ title: say(`groups.${group}`), rows }];
+            return rows.length === 0 ? [] : [{ title: this.say(`groups.${group}`), rows }];
         });
         this.language.completion.close();
         this.language.pick.open({
@@ -278,7 +271,7 @@ export class CodeActionsFeature {
         if (signal.aborted || this.asking) {
             return;
         }
-        editor.setGutterAction(entries?.some(isHint) === true ? { line: editor.getCaret().line, label: say('show') } : null);
+        editor.setGutterAction(entries?.some(isHint) === true ? { line: editor.getCaret().line, label: this.say('show') } : null);
     }
 
     private async resolve(entry: ActionEntry, signal?: AbortSignal): Promise<CodeAction> {
@@ -325,9 +318,9 @@ export class CodeActionsFeature {
             return null;
         }
         const notes = [
-            ...(found.hiddenLines > 0 ? [say('moreLines', { count: found.hiddenLines })] : []),
-            ...(found.otherFiles > 0 ? [say('otherFiles', { count: found.otherFiles })] : []),
-            ...(found.moves > 0 ? [say('moves', { count: found.moves })] : [])
+            ...(found.hiddenLines > 0 ? [this.say('moreLines', { count: found.hiddenLines })] : []),
+            ...(found.otherFiles > 0 ? [this.say('otherFiles', { count: found.otherFiles })] : []),
+            ...(found.moves > 0 ? [this.say('moves', { count: found.moves })] : [])
         ];
         return { removed: found.removed, added: found.added, note: notes.length === 0 ? null : notes.join(' · ') };
     }
@@ -353,7 +346,7 @@ export class CodeActionsFeature {
             if (action.edit !== undefined) {
                 const result = await project.applyWorkspaceEdit(action.edit);
                 if (!result.applied) {
-                    this.tell('error', say('failed', { message: result.failureReason ?? say('refused') }));
+                    this.tell('error', this.say('failed', { message: result.failureReason ?? this.say('refused') }));
                     return;
                 }
             }
@@ -381,7 +374,11 @@ export class CodeActionsFeature {
 
     private fail(error: unknown): void {
         if (!(error instanceof StaleResultError)) {
-            this.tell('error', say('failed', { message: error instanceof Error ? error.message : String(error) }));
+            this.tell('error', this.say('failed', { message: error instanceof Error ? error.message : String(error) }));
         }
     }
+
+    private say(key: string, options?: Record<string, unknown>): string {
+        return this.language.project.i18n.t(`editor:language.actions.${key}`, options);
+    }
 }

package/src/code-authors.ts

@@ -1,4 +1,4 @@
-import i18next from 'i18next';
+import type { i18n } from 'i18next';
 import { diffLines, splitLines } from '@adecore/merge';
 import type { GitBlameCommit, GitBlameResult } from './host-types.ts';
 import { formatNumber } from '@adecore/ui/format';
@@ -94,10 +94,10 @@ export function authorshipOf(commits: readonly GitBlameCommit[], mapped: Int32Ar
 }
 
 /* The row's words: the author with most lines, how many others wrote some, and a star when the range is edited since the commit. */
-export function authorsText(authorship: CodeAuthorship): string {
+export function authorsText(authorship: CodeAuthorship, i18n: i18n): string {
     const main = authorship.authors[0];
     if (main === undefined) {
-        return i18next.t('editor:language.codeVision.newCode');
+        return i18n.t('editor:language.codeVision.newCode');
     }
     const others = authorship.authors.length - 1;
     return `${main.name}${others > 0 ? ` +${formatNumber(others)}` : ''}${authorship.modified ? ' *' : ''}`;

package/src/code-vision-model.ts

@@ -1,6 +1,6 @@
 import type { DocumentSymbol, DocumentSymbolResult, Position, SymbolInformation } from '@adecore/lsp';
 import { formatNumber } from '@adecore/ui/format';
-import i18next from 'i18next';
+import type { i18n } from 'i18next';
 
 /* More declarations than this in one file and the rows are left out, which is the file that is too big for them to be quiet. */
 export const MAX_DECLARATIONS = 3000;
@@ -223,8 +223,8 @@ export function declarationsOf(result: DocumentSymbolResult, source: Declaration
 }
 
 /* "No usages", "1 usage" and "N usages". */
-export function usagesText(count: number): string {
+export function usagesText(count: number, i18n: i18n): string {
     return count === 0
-        ? i18next.t('editor:language.codeVision.usagesNone')
-        : i18next.t('editor:language.codeVision.usages', { count, formatted: formatNumber(count) });
+        ? i18n.t('editor:language.codeVision.usagesNone')
+        : i18n.t('editor:language.codeVision.usages', { count, formatted: formatNumber(count) });
 }

package/src/code-vision.ts

@@ -62,7 +62,7 @@ export class CodeVisionFeature {
     constructor(language: EditorLanguage, onSymbols: (listener: (result: DocumentSymbolResult) => void) => () => void, timers: Timers = realTimers) {
         this.language = language;
         this.timers = timers;
-        const { editor, project, uri } = language;
+        const { editor } = language;
         const offs = [
             onSymbols((result) => this.read(result)),
             editor.onTextChange(() => {
@@ -74,19 +74,17 @@ export class CodeVisionFeature {
                 this.scrollTimer = this.timers.set(() => this.plan(), SCROLL_PAUSE_MS);
             })
         ];
-        const providers = project.service.onProvidersChanged((changed) => {
-            if (changed === uri) {
-                this.failed.clear();
-                this.publish();
-                this.plan();
-            }
+        const providers = language.onProvidersChanged(() => {
+            this.failed.clear();
+            this.publish();
+            this.plan();
         });
         language.onDispose(() => {
             this.disposed = true;
             for (const off of offs) {
                 off();
             }
-            providers.dispose();
+            providers();
             this.timers.clear(this.scrollTimer);
             for (const controller of this.running.values()) {
                 controller.abort();
@@ -209,7 +207,11 @@ export class CodeVisionFeature {
             const entries: EditorCodeVisionEntry[] = [];
             const known = this.counts.get(declaration.id);
             if (counted && declaration.usages && known !== undefined) {
-                entries.push({ id: 'usages', text: usagesText(known.count), activate: () => void this.language.peek.open(declaration.position) });
+                entries.push({
+                    id: 'usages',
+                    text: usagesText(known.count, this.language.project.i18n),
+                    activate: () => void this.language.peek.open(declaration.position)
+                });
             }
             if (mapped !== null && declaration.authors) {
                 let authorship = this.authorships.get(declaration.id);
@@ -220,7 +222,7 @@ export class CodeVisionFeature {
                 const shown = authorship;
                 entries.push({
                     id: 'authors',
-                    text: authorsText(shown),
+                    text: authorsText(shown, this.language.project.i18n),
                     ...(shown.authors.length > 0 ? { icon: shown.authors.length > 1 ? ('users' as const) : ('user' as const) } : {}),
                     activate: (anchor) => this.showAuthors(declaration, shown, anchor)
                 });

package/src/completion.ts

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError, type CompletionContext, type CompletionItem } from '@adecore/lsp';
 import type { EditorContentChange, EditorPosition, EditorRange, EditorTextChange } from '@adecore/editor';
 import { comparePositions, shiftPosition } from './diagnostics-model.ts';
@@ -399,7 +398,7 @@ export class CompletionFeature {
         const asked = this.explicit && !refresh;
         this.refilter();
         if (asked && !this.isOpen && !this.incomplete) {
-            this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: i18next.t('editor:language.completion.none') });
+            this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.completion.none') });
         } else if (asked && this.ranked.length === 1 && !this.incomplete) {
             // One answer to a list that was asked for is the one wanted.
             void this.accept(false, 0);