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

package/dist/host-types.d.ts

@@ -1,3 +1,4 @@
+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';
@@ -31,6 +32,7 @@ export interface RenameSuggestionsRequest {
     uses: readonly string[];
 }
 export interface LanguageHost {
+    readonly i18n?: i18n;
     readonly folder?: string;
     readonly files?: ProjectFiles;
     readonly apple?: boolean;

package/dist/hover.js

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { rangeHolds } from './diagnostics-model.js';
 import { hoverTextOf, isEmptyHover, locationsOf } from './hover-content.js';
 import { wordRangeAt } from './rename-model.js';
@@ -197,7 +196,7 @@ export class HoverFeature {
         if (problems.length === 0 && info === null) {
             this.hide();
             if (pinned) {
-                this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: i18next.t('editor:language.hover.none') });
+                this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.hover.none') });
             }
             return;
         }

package/dist/inlay-hints.js

@@ -57,15 +57,13 @@ export class InlayHintsFeature {
                 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();
             scrolls();
-            providers.dispose();
+            providers();
             this.refresher.dispose();
             editor.setInlayHints([]);
         });

package/dist/language-ids.js

@@ -15,7 +15,8 @@ const LSP_IDS = {
     yaml: 'yaml',
     python: 'python',
     shellscript: 'shellscript',
-    docker: 'dockerfile'
+    docker: 'dockerfile',
+    twig: 'twig'
 };
 /* The LSP language id of a file, or null when no language server here knows its language. */
 export function lspLanguageIdOf(language) {
@@ -41,7 +42,8 @@ const PATH_IDS = {
     css: 'css',
     scss: 'scss',
     html: 'html',
-    md: 'markdown'
+    md: 'markdown',
+    twig: 'twig'
 };
 /* The highlighter id for the code of a file we only know by its path, such as a place another file refers to. */
 export function shikiLanguageOfPath(path) {

package/dist/locales/en.json

@@ -6,6 +6,7 @@
             "definition": "Go to definition",
             "references_one": "{{formatted}} reference",
             "references_other": "{{formatted}} references",
+            "line": "Line {{line}}",
             "none": "No information for this position"
         },
         "edit": {

package/dist/locales/nl.json

@@ -6,6 +6,7 @@
             "definition": "Ga naar definitie",
             "references_one": "{{formatted}} referentie",
             "references_other": "{{formatted}} referenties",
+            "line": "Regel {{line}}",
             "none": "Geen informatie voor deze plek"
         },
         "edit": {

package/dist/navigation.d.ts

@@ -14,6 +14,7 @@ export declare class NavigationFeature {
     go(kind: NavigationKind, position?: EditorPosition): Promise<void>;
     goToName(name: string, anchor: EditorPosition, own: Location | null): Promise<void>;
     private tell;
+    private say;
 }
 export declare function locationRow(location: Location, stored: string | null): {
     label: string;

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/dist/workspace-edit.d.ts

@@ -11,6 +11,7 @@ export interface ProjectFiles {
     stage(files: readonly StagedFile[]): void;
     save(files: readonly StagedFile[]): Promise<string | null>;
     rename(from: string, to: string): Promise<string | null>;
+    create?(path: string, text: string): Promise<string | null>;
 }
 export interface WorkspaceEditHost {
     editorOf(uri: string): Editor | undefined;

package/dist/workspace-edit.js

@@ -2,13 +2,16 @@ import { applyTextEdits, fileUriToPath } from '@adecore/lsp';
 function refused(failureReason) {
     return { applied: false, failureReason };
 }
-/* The steps of an edit; null when it creates or deletes a file, which an edit is not applied with. */
+/* The steps of an edit; null when it deletes a file, which an edit is not applied with. */
 function stepsOf(edit) {
     const steps = [];
     for (const change of edit.documentChanges ?? []) {
         if ('textDocument' in change) {
             steps.push({ kind: 'edits', uri: change.textDocument.uri, edits: change.edits });
         }
+        else if (change.kind === 'create') {
+            steps.push({ kind: 'create', file: change });
+        }
         else if (change.kind === 'rename') {
             steps.push({ kind: 'rename', oldUri: change.oldUri, newUri: change.newUri });
         }
@@ -23,7 +26,7 @@ function stepsOf(edit) {
     }
     return steps;
 }
-/* The text edits of an edit per document, as the entries a document has in it; null when it creates or deletes a file. */
+/* The text edits of an edit per document, as the entries a document has in it; null when it deletes a file. */
 export function entriesOf(edit) {
     const steps = stepsOf(edit);
     if (steps === null) {
@@ -48,13 +51,14 @@ function contentChangeOf(edit) {
  * Applies an LSP workspace edit on the client, step by step in the order it says. A file an editor holds takes
  * its edits as one undo step. Any other file gets its new text as an unsaved draft that a person saves, and
  * nothing is written to disk on a server's word alone, unless the edit also moves a file: the edits and the
- * move are then one change, so every file is saved through the machine and the move is made there. The
- * edit is checked against every text first, so one that does not fit changes nothing.
+ * move are then one change, so every file is saved through the machine and the move is made there. A file
+ * the edit creates is made through the machine with the text the edit writes into it. The edit is checked
+ * against every text first, so one that does not fit changes nothing.
  */
 export async function applyWorkspaceEdit(edit, host) {
     const steps = stepsOf(edit);
     if (steps === null) {
-        return refused('Creating and deleting files is not supported yet');
+        return refused('Deleting files is not supported yet');
     }
     const planned = await plan(steps, host);
     if (typeof planned === 'string') {
@@ -63,8 +67,8 @@ export async function applyWorkspaceEdit(edit, host) {
     const moving = planned.some((item) => item.kind === 'rename');
     const staged = [];
     for (const item of planned) {
-        if (item.kind === 'rename') {
-            const reason = await host.files.rename(item.oldPath, item.newPath);
+        if (item.kind === 'rename' || item.kind === 'create') {
+            const reason = item.kind === 'rename' ? await host.files.rename(item.oldPath, item.newPath) : await host.files.create(item.path, item.text);
             if (reason !== null) {
                 return refused(reason);
             }
@@ -105,8 +109,21 @@ async function plan(steps, host) {
     const texts = new Map();
     // A file that has moved is read where it still stands: nothing moves until the plan is made.
     const origins = new Map();
+    // A file that is made is written once, with what every step leaves in it.
+    const creates = new Map();
     const planned = [];
     for (const step of steps) {
+        if (step.kind === 'create') {
+            const made = await planCreate(step.file, host, texts);
+            if (typeof made === 'string') {
+                return made;
+            }
+            if (made !== null) {
+                creates.set(step.file.uri, made);
+                planned.push(made);
+            }
+            continue;
+        }
         if (step.kind === 'rename') {
             const oldPath = fileUriToPath(step.oldUri);
             const newPath = fileUriToPath(step.newUri);
@@ -118,6 +135,16 @@ async function plan(steps, host) {
             continue;
         }
         const source = origins.get(step.uri) ?? step.uri;
+        const created = creates.get(source);
+        if (created !== undefined) {
+            try {
+                created.text = applyTextEdits(created.text, step.edits);
+            }
+            catch (error) {
+                return error instanceof Error ? error.message : String(error);
+            }
+            continue;
+        }
         if (!texts.has(source)) {
             const editor = host.editorOf(source);
             if (editor) {
@@ -145,3 +172,15 @@ async function plan(steps, host) {
     }
     return planned;
 }
+/* A file that is not there yet, or null when it is and the create says to leave it. Making one over a file that is there is not supported. */
+async function planCreate(file, host, texts) {
+    const path = fileUriToPath(file.uri);
+    if (path === null || host.files?.create === undefined) {
+        return `Creating ${file.uri} is not supported here`;
+    }
+    const there = texts.has(file.uri) || host.editorOf(file.uri) !== undefined || (await host.files.read(path)) !== null;
+    if (!there) {
+        return { kind: 'create', path, text: '' };
+    }
+    return file.options?.ignoreIfExists === true && file.options.overwrite !== true ? null : `${path} already exists`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.17.0-beta.1",
+  "version": "0.17.0",
   "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",
+    "@adecore/lsp": "0.17.0",
+    "@adecore/merge": "0.17.0",
     "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",
     "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>
     );
 }