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

package/src/peek.ts

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError, type Location, type Range } from '@adecore/lsp';
 import type { EditorPosition } from '@adecore/editor';
 import type { EditorLanguage } from './editor-language.ts';
@@ -22,10 +21,6 @@ function placeKey(location: Location): string {
     return `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`;
 }
 
-function say(key: string, options?: Record<string, unknown>): string {
-    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
@@ -75,7 +70,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;
@@ -84,7 +79,7 @@ export class PeekFeature {
             found = await this.fetch(kind, position);
         } 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;
         }
@@ -102,7 +97,7 @@ export class PeekFeature {
                 ) === 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);
@@ -245,4 +240,8 @@ export class PeekFeature {
     private tell(title: string): void {
         this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title });
     }
+
+    private say(key: string, options?: Record<string, unknown>): string {
+        return this.language.project.i18n.t(`editor:language.peek.${key}`, options);
+    }
 }

package/src/project-language.ts

@@ -1,3 +1,4 @@
+import i18next, { type i18n } from 'i18next';
 import { fileUriToPath, type ApplyWorkspaceEditResult, type ContentChange, type LanguageService, type WorkspaceEdit } from '@adecore/lsp';
 import type { Editor, EditorPosition } from '@adecore/editor';
 import { NavigationHistory, type Place } from './navigation-history.ts';
@@ -78,6 +79,7 @@ interface Holder {
 export class ProjectLanguage {
     readonly service: LanguageService;
     readonly host: LanguageHost;
+    readonly i18n: i18n;
     readonly folder: string;
     readonly problems: ProjectProblems;
     readonly history = new NavigationHistory();
@@ -90,6 +92,7 @@ export class ProjectLanguage {
     constructor(service: LanguageService, host: LanguageHost = {}) {
         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/src/rename.ts

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError, type Location, type PrepareRenameResult, type WorkspaceEdit } from '@adecore/lsp';
 import type { EditorRange } from '@adecore/editor';
 import type { EditorLanguage } from './editor-language.ts';
@@ -13,10 +12,6 @@ const SAMPLE_LOCATIONS = 8;
 const SAMPLE_OTHER_FILES = 3;
 const CONTEXT_LINES = 3;
 
-function say(key: string, options?: Record<string, unknown>): string {
-    return i18next.t(`editor:language.rename.${key}`, options);
-}
-
 interface Session {
     readonly target: RenameTarget;
     readonly original: string;
@@ -67,7 +62,7 @@ export class RenameFeature {
     async start(): Promise<void> {
         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();
@@ -78,7 +73,7 @@ export class RenameFeature {
             answer = prepare ? await project.service.prepareRename(uri, caret) : { defaultBehavior: true };
         } catch (error) {
             if (!(error instanceof StaleResultError)) {
-                this.tell('error', say('nothing'));
+                this.tell('error', this.say('nothing'));
             }
             return;
         }
@@ -92,7 +87,7 @@ export class RenameFeature {
                 )
         );
         if (target === null) {
-            this.tell('error', say('nothing'));
+            this.tell('error', this.say('nothing'));
             return;
         }
         const session: Session = { target, original: editor.textInRange(target.range), edit: null, names: new AbortController() };
@@ -120,7 +115,7 @@ export class RenameFeature {
                 return;
             }
             if (edit === null) {
-                this.fail(say('refused'));
+                this.fail(this.say('refused'));
                 return;
             }
             session.edit = edit;
@@ -140,7 +135,7 @@ export class RenameFeature {
             this.publish({ phase: 'preview', busy: false, name: next, files });
         } 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));
             }
         }
     }
@@ -168,7 +163,7 @@ export class RenameFeature {
         if (result.applied) {
             this.finish();
         } else {
-            this.fail(result.failureReason ?? say('refused'));
+            this.fail(result.failureReason ?? this.say('refused'));
         }
     }
 
@@ -176,7 +171,7 @@ export class RenameFeature {
     private fail(message: string): void {
         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 }) });
         }
     }
 
@@ -288,4 +283,8 @@ export class RenameFeature {
             }
         });
     }
+
+    private say(key: string, options?: Record<string, unknown>): string {
+        return this.language.project.i18n.t(`editor:language.rename.${key}`, options);
+    }
 }

package/src/semantic-tokens.ts

@@ -33,14 +33,12 @@ export class SemanticTokensFeature {
             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/src/symbol-picker.ts

@@ -1,4 +1,3 @@
-import i18next from 'i18next';
 import { StaleResultError, type Location } from '@adecore/lsp';
 import { basenameOf } from './paths.ts';
 import type { EditorLanguage } from './editor-language.ts';
@@ -33,7 +32,7 @@ export class SymbolPickerFeature {
     async open(): Promise<void> {
         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 {
@@ -44,7 +43,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/src/symbols.ts

@@ -89,14 +89,12 @@ export class SymbolsFeature {
             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/src/workspace-edit.ts

@@ -1,5 +1,13 @@
 import type { Editor, EditorContentChange } from '@adecore/editor';
-import { applyTextEdits, fileUriToPath, type ApplyWorkspaceEditResult, type RenameFile, type TextEdit, type WorkspaceEdit } from '@adecore/lsp';
+import {
+    applyTextEdits,
+    fileUriToPath,
+    type ApplyWorkspaceEditResult,
+    type CreateFile,
+    type RenameFile,
+    type TextEdit,
+    type WorkspaceEdit
+} from '@adecore/lsp';
 import type { DiskText } from './host-types.ts';
 
 /* A file that changed without an editor of this project holding it: its new text waits as an unsaved draft. */
@@ -18,6 +26,8 @@ export interface ProjectFiles {
     save(files: readonly StagedFile[]): Promise<string | null>;
     /* Moves a file or folder on the machine, with what is open on it, and tells the servers it moved; the reason it could not, or null. */
     rename(from: string, to: string): Promise<string | null>;
+    /* Makes a file that is not there with its text, through the machine; the reason it could not, or null. Without it no edit creates a file. */
+    create?(path: string, text: string): Promise<string | null>;
 }
 
 export interface WorkspaceEditHost {
@@ -30,17 +40,20 @@ function refused(failureReason: string): ApplyWorkspaceEditResult {
     return { applied: false, failureReason };
 }
 
-/* One thing an edit does, in the order it says: text edits of a document, or a file that moves. */
+/* One thing an edit does, in the order it says: text edits of a document, a file that is made, or a file that moves. */
 type Step =
     | { readonly kind: 'edits'; readonly uri: string; readonly edits: TextEdit[] }
+    | { readonly kind: 'create'; readonly file: CreateFile }
     | { readonly kind: 'rename'; readonly oldUri: string; readonly newUri: string };
 
-/* 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: WorkspaceEdit): Step[] | null {
     const steps: Step[] = [];
     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 });
         } else {
@@ -55,7 +68,7 @@ function stepsOf(edit: WorkspaceEdit): Step[] | null {
     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: WorkspaceEdit): Map<string, TextEdit[][]> | null {
     const steps = stepsOf(edit);
     if (steps === null) {
@@ -90,19 +103,27 @@ interface PlannedEdits {
     readonly disk: DiskText | null;
 }
 
-type Planned = PlannedEdits | { readonly kind: 'rename'; readonly oldPath: string; readonly newPath: string };
+/* A file to make, with the text every step of the edit leaves in it. */
+interface PlannedCreate {
+    readonly kind: 'create';
+    readonly path: string;
+    text: string;
+}
+
+type Planned = PlannedEdits | PlannedCreate | { readonly kind: 'rename'; readonly oldPath: string; readonly newPath: string };
 
 /*
  * 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: WorkspaceEdit, host: WorkspaceEditHost): Promise<ApplyWorkspaceEditResult> {
     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') {
@@ -111,8 +132,8 @@ export async function applyWorkspaceEdit(edit: WorkspaceEdit, host: WorkspaceEdi
     const moving = planned.some((item) => item.kind === 'rename');
     const staged: StagedFile[] = [];
     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);
             }
@@ -154,8 +175,21 @@ async function plan(steps: readonly Step[], host: WorkspaceEditHost): Promise<Pl
     const texts = new Map<string, { text: string; disk: DiskText | null }>();
     // A file that has moved is read where it still stands: nothing moves until the plan is made.
     const origins = new Map<string, string>();
+    // A file that is made is written once, with what every step leaves in it.
+    const creates = new Map<string, PlannedCreate>();
     const planned: 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);
@@ -167,6 +201,15 @@ async function plan(steps: readonly Step[], host: WorkspaceEditHost): Promise<Pl
             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) {
@@ -192,3 +235,20 @@ async function plan(steps: readonly Step[], host: WorkspaceEditHost): Promise<Pl
     }
     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: CreateFile,
+    host: WorkspaceEditHost,
+    texts: ReadonlyMap<string, { text: string; disk: DiskText | null }>
+): Promise<PlannedCreate | null | string> {
+    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`;
+}