@adecore/editor-react 0.44.1 → 0.44.3

package/dist/completion.d.ts

@@ -67,6 +67,7 @@ export declare class CompletionFeature {
     private key;
     private commits;
     private edited;
+    private typedIntoShown;
     private caretMoved;
     private triggerCharacters;
     private beginRequest;

package/dist/completion.js

@@ -658,7 +658,7 @@ export class CompletionFeature {
     this.textRevision++;
     // The rows were given, so typing only filters them.
     if (this.shown && this.isOpen) {
-      if (change.source === 'input' && change.changes.length === 1 && Array.from(change.changes[0].text).every(isIdentifierCharacter)) {
+      if (change.source === 'input' && change.changes.length === 1 && this.typedIntoShown(change.changes[0])) {
         this.refilter();
       } else {
         this.close();
@@ -702,6 +702,14 @@ export class CompletionFeature {
       this.close();
     }
   }
+  /* Whether a change put word characters into the typed prefix of the given rows; anything else leaves their ranges pointing at other text. */
+  typedIntoShown({
+    range,
+    text
+  }) {
+    const start = this.start;
+    return text !== '' && isEmptyRange(range) && start !== null && range.start.line === start.line && range.start.character >= start.character && Array.from(text).every(isIdentifierCharacter);
+  }
   caretMoved(position) {
     if (this.start === null) {
       return;

package/dist/editor-language.js

@@ -240,9 +240,9 @@ export class EditorLanguage {
   async prepareSave(reason = 1) {
     const {
       service
-    } = this.project;
+    } = this;
     await service.willSave?.(this.uri, reason).catch(() => undefined);
-    if (service.willSaveWaitUntil === undefined) {
+    if (this.disposed || service.willSaveWaitUntil === undefined) {
       return;
     }
     const controller = new AbortController();
@@ -251,7 +251,7 @@ export class EditorLanguage {
       const edits = await service.willSaveWaitUntil(this.uri, reason, {
         signal: controller.signal
       });
-      if (!controller.signal.aborted && edits !== null && edits.length > 0) {
+      if (!this.disposed && !controller.signal.aborted && edits !== null && edits.length > 0) {
         this.editor.applyEdits(edits.map(edit => ({
           range: edit.range,
           text: edit.newText

package/dist/history.js

@@ -82,7 +82,10 @@ export class HistoryFeature {
       project,
       uri
     } = this.language;
-    project.edits.map(uri, change.changes);
+    // The places belong to the file and the other editors of it hear the same change, so one editor moves them.
+    if (project.holdsFirst(uri, editor)) {
+      project.edits.map(uri, change.changes);
+    }
     this.editing = true;
     queueMicrotask(() => {
       this.editing = false;

package/dist/inline-completion.d.ts

@@ -31,6 +31,7 @@ export declare class InlineCompletionFeature {
     accept(): boolean;
     cycle(step: 1 | -1): void;
     hide(): void;
+    private tab;
     private key;
     private edited;
     private moved;

package/dist/inline-completion.js

@@ -62,7 +62,7 @@ export class InlineCompletionFeature {
     const {
       editor
     } = language;
-    const offs = [language.onKey(event => this.key(event), KEY_PRIORITY.inlineCompletion), editor.onTextChange(change => this.edited(change)), editor.onCaret(() => queueMicrotask(() => this.moved()))];
+    const offs = [language.onKey(event => this.key(event), KEY_PRIORITY.inlineCompletion), language.onKey(event => this.tab(event), KEY_PRIORITY.inlineAccept), editor.onTextChange(change => this.edited(change)), editor.onCaret(() => queueMicrotask(() => this.moved()))];
     language.onDispose(() => {
       this.hide();
       for (const off of offs) {
@@ -139,6 +139,16 @@ export class InlineCompletionFeature {
       this.language.editor.setGhostText(null);
     }
   }
+  /* Tab takes the suggestion on screen before any feature that expands on Tab; without one it is left alone. */
+  tab(event) {
+    if (this.current === null || event.isComposing) {
+      return false;
+    }
+    if (event.key === 'Tab' && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
+      return this.accept();
+    }
+    return false;
+  }
   key(event) {
     if (isShortcut(this.language.shortcuts.suggestInline, event) && this.enabled) {
       this.trigger();
@@ -147,9 +157,6 @@ export class InlineCompletionFeature {
     if (this.current === null || event.isComposing) {
       return false;
     }
-    if (event.key === 'Tab' && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
-      return this.accept();
-    }
     if (event.key === 'Escape') {
       this.hide();
       return true;

package/dist/key-priority.d.ts

@@ -4,6 +4,7 @@ export declare const KEY_PRIORITY: {
     readonly diagnostics: 1500;
     readonly hover: 1400;
     readonly completion: 1300;
+    readonly inlineAccept: 1250;
     readonly snippets: 1200;
     readonly templates: 1150;
     readonly markup: 1100;

package/dist/key-priority.js

@@ -7,6 +7,8 @@ export const KEY_PRIORITY = {
   diagnostics: 1500,
   hover: 1400,
   completion: 1300,
+  // Tab only: a suggestion on screen is taken before a template or an abbreviation expands, so the spacing of a hundred bends here too.
+  inlineAccept: 1250,
   snippets: 1200,
   // Between snippets and markup, so the spacing of a hundred bends here: Tab has to reach the templates after a running snippet and before Emmet.
   templates: 1150,

package/dist/project-language.d.ts

@@ -57,6 +57,7 @@ export declare class ProjectLanguage {
     noteCaret(place: Place): void;
     jumpTo(place: Place): void;
     takeCaret(uri: string, line: number): EditorPosition | null;
+    holdsFirst(uri: string, editor: Editor): boolean;
     openEditors(): readonly {
         uri: string;
         editor: Editor;

package/dist/project-language.js

@@ -278,6 +278,10 @@ export class ProjectLanguage {
     this.pendingCaret = null;
     return pending.position;
   }
+  /* Whether the editor is the first to hold the document, the one whose changes stand for the document's. */
+  holdsFirst(uri, editor) {
+    return this.holders.get(uri)?.editors[0] === editor;
+  }
   /* The editors that hold a document, one per uri in the order the documents were first opened. */
   openEditors() {
     return [...this.holders].flatMap(([uri, holder]) => holder.editors[0] === undefined ? [] : [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.44.1",
+  "version": "0.44.3",
   "type": "module",
   "description": "Language-enabled editors, feature coordination and React popups over injected language services.",
   "license": "FSL-1.1-MIT",
@@ -62,9 +62,9 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor": "0.44.1",
-    "@adecore/lsp": "0.44.1",
-    "@adecore/merge": "0.44.1",
+    "@adecore/editor": "0.44.3",
+    "@adecore/lsp": "0.44.3",
+    "@adecore/merge": "0.44.3",
     "emmet": "^2.4.11",
     "lucide-react": "^1.61.0",
     "react-markdown": "^10.1.0",
@@ -73,14 +73,14 @@
     "zustand": "^5.0.16"
   },
   "peerDependencies": {
-    "@adecore/ui": "^0.44.1",
+    "@adecore/ui": "^0.44.3",
     "i18next": "^26.4.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "react-i18next": "^17.0.15"
   },
   "devDependencies": {
-    "@adecore/ui": "0.44.1",
+    "@adecore/ui": "0.44.3",
     "@types/bun": "^1.4.4",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",

package/src/completion.ts

@@ -728,7 +728,7 @@ export class CompletionFeature {
 
         // The rows were given, so typing only filters them.
         if (this.shown && this.isOpen) {
-            if (change.source === 'input' && change.changes.length === 1 && Array.from(change.changes[0]!.text).every(isIdentifierCharacter)) {
+            if (change.source === 'input' && change.changes.length === 1 && this.typedIntoShown(change.changes[0]!)) {
                 this.refilter();
             } else {
                 this.close();
@@ -768,6 +768,20 @@ export class CompletionFeature {
         }
     }
 
+    /* Whether a change put word characters into the typed prefix of the given rows; anything else leaves their ranges pointing at other text. */
+    private typedIntoShown({ range, text }: EditorContentChange): boolean {
+        const start = this.start;
+
+        return (
+            text !== '' &&
+            isEmptyRange(range) &&
+            start !== null &&
+            range.start.line === start.line &&
+            range.start.character >= start.character &&
+            Array.from(text).every(isIdentifierCharacter)
+        );
+    }
+
     private caretMoved(position: EditorPosition): void {
         if (this.start === null) {
             return;

package/src/editor-language.ts

@@ -249,16 +249,16 @@ export class EditorLanguage {
      * as the specification allows. Call it, then save, then let the service send `didSave`.
      */
     async prepareSave(reason: TextDocumentSaveReason = 1): Promise<void> {
-        const { service } = this.project;
+        const { service } = this;
         await service.willSave?.(this.uri, reason).catch(() => undefined);
-        if (service.willSaveWaitUntil === undefined) {
+        if (this.disposed || service.willSaveWaitUntil === undefined) {
             return;
         }
         const controller = new AbortController();
         const timer = this.timers.set(() => controller.abort(), SAVE_PARTICIPANT_MS);
         try {
             const edits = await service.willSaveWaitUntil(this.uri, reason, { signal: controller.signal });
-            if (!controller.signal.aborted && edits !== null && edits.length > 0) {
+            if (!this.disposed && !controller.signal.aborted && edits !== null && edits.length > 0) {
                 this.editor.applyEdits(edits.map((edit) => ({ range: edit.range, text: edit.newText })));
             }
         } catch {

package/src/history.ts

@@ -98,7 +98,11 @@ export class HistoryFeature {
     private edited(change: EditorTextChange): void {
         const { editor, project, uri } = this.language;
 
-        project.edits.map(uri, change.changes);
+        // The places belong to the file and the other editors of it hear the same change, so one editor moves them.
+        if (project.holdsFirst(uri, editor)) {
+            project.edits.map(uri, change.changes);
+        }
+
         this.editing = true;
 
         queueMicrotask(() => {

package/src/inline-completion.ts

@@ -69,6 +69,7 @@ export class InlineCompletionFeature {
         const { editor } = language;
         const offs = [
             language.onKey((event) => this.key(event), KEY_PRIORITY.inlineCompletion),
+            language.onKey((event) => this.tab(event), KEY_PRIORITY.inlineAccept),
             editor.onTextChange((change) => this.edited(change)),
             editor.onCaret(() => queueMicrotask(() => this.moved()))
         ];
@@ -146,6 +147,17 @@ export class InlineCompletionFeature {
         }
     }
 
+    /* Tab takes the suggestion on screen before any feature that expands on Tab; without one it is left alone. */
+    private tab(event: KeyboardEvent): boolean {
+        if (this.current === null || event.isComposing) {
+            return false;
+        }
+        if (event.key === 'Tab' && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
+            return this.accept();
+        }
+        return false;
+    }
+
     private key(event: KeyboardEvent): boolean {
         if (isShortcut(this.language.shortcuts.suggestInline, event) && this.enabled) {
             this.trigger();
@@ -154,9 +166,6 @@ export class InlineCompletionFeature {
         if (this.current === null || event.isComposing) {
             return false;
         }
-        if (event.key === 'Tab' && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
-            return this.accept();
-        }
         if (event.key === 'Escape') {
             this.hide();
             return true;

package/src/key-priority.ts

@@ -9,6 +9,8 @@ export const KEY_PRIORITY = {
     diagnostics: 1500,
     hover: 1400,
     completion: 1300,
+    // Tab only: a suggestion on screen is taken before a template or an abbreviation expands, so the spacing of a hundred bends here too.
+    inlineAccept: 1250,
     snippets: 1200,
     // Between snippets and markup, so the spacing of a hundred bends here: Tab has to reach the templates after a running snippet and before Emmet.
     templates: 1150,

package/src/project-language.ts

@@ -323,6 +323,11 @@ export class ProjectLanguage {
         return pending.position;
     }
 
+    /* Whether the editor is the first to hold the document, the one whose changes stand for the document's. */
+    holdsFirst(uri: string, editor: Editor): boolean {
+        return this.holders.get(uri)?.editors[0] === editor;
+    }
+
     /* The editors that hold a document, one per uri in the order the documents were first opened. */
     openEditors(): readonly { uri: string; editor: Editor }[] {
         return [...this.holders].flatMap(([uri, holder]) => (holder.editors[0] === undefined ? [] : [{ uri, editor: holder.editors[0] }]));