@adecore/editor-react 0.17.0 → 0.18.1

package/dist/completion-model.d.ts

@@ -4,6 +4,7 @@ import type { CompletionDocs } from './popups.ts';
 import { type SnippetStop } from './snippet.ts';
 export declare function isIdentifierCharacter(character: string): boolean;
 export declare function identifierPrefix(before: string): string;
+export declare function opensCompletion(before: string, text: string): boolean;
 export interface MatchDetail {
     readonly score: number;
     readonly positions: readonly number[];

package/dist/completion-model.js

@@ -21,6 +21,19 @@ export function identifierPrefix(before) {
     lastPrefix = characters.slice(start).join('');
     return lastPrefix;
 }
+const OPENS_VALUE = /(?:[-=!<>&|?+*/%^:,]|(?:^|[^\p{L}\p{N}_$])(?:return|new|case|in|of|instanceof|typeof|keyof|await|yield|throw|extends|implements|as|is|not|and|or|echo|print|use|import|from|clone))$/u;
+const NOT_A_VALUE = /(?:\+\+|--|\/\/|\/\*\*?|^\s*[-+*])$/;
+/*
+ * Whether `text`, typed after `before` on its line, puts the caret where a value or a name comes next, so the list
+ * opens without a word typed: an opening bracket, or a space after an operator, a comma or a keyword. A comment
+ * opener, a list marker and `++` or `--` open nothing.
+ */
+export function opensCompletion(before, text) {
+    if (text === '(' || text === '()' || text === '[' || text === '[]') {
+        return true;
+    }
+    return text === ' ' && OPENS_VALUE.test(before) && !NOT_A_VALUE.test(before);
+}
 function run(start, length) {
     return Array.from({ length }, (_, offset) => start + offset);
 }

package/dist/completion.js

@@ -1,6 +1,6 @@
 import { StaleResultError } from '@adecore/lsp';
 import { comparePositions, shiftPosition } from './diagnostics-model.js';
-import { completionDocsOf, identifierPrefix, insertionOf, isIdentifierCharacter, itemsOf, matchedCharacters, mirroredInsertions, prefixFor, qualifiersOf, rankCompletions } from './completion-model.js';
+import { completionDocsOf, identifierPrefix, insertionOf, isIdentifierCharacter, itemsOf, matchedCharacters, mirroredInsertions, opensCompletion, prefixFor, qualifiersOf, rankCompletions } from './completion-model.js';
 import { PARAMETER_HINTS_COMMAND, isCallItem, planCall, withParentheses } from './completion-call.js';
 import { RecentChoices, recentChoicesOf } from './recent-choices.js';
 import { shikiLanguageOf } from './language-ids.js';
@@ -281,6 +281,11 @@ export class CompletionFeature {
             this.close();
             this.beginRequest({ triggerKind: 2, triggerCharacter: last }, 0);
         }
+        else if (isEmpty(range) &&
+            opensCompletion(this.language.editor.textInRange({ start: { line: range.start.line, character: 0 }, end: range.start }), text)) {
+            this.close();
+            this.beginRequest({ triggerKind: 1 }, START_DELAY_MS);
+        }
         else if (this.isOpen) {
             if (text === '' || typedIdentifier) {
                 this.refilter();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "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",
-    "@adecore/lsp": "0.17.0",
-    "@adecore/merge": "0.17.0",
+    "@adecore/editor": "0.18.1",
+    "@adecore/lsp": "0.18.1",
+    "@adecore/merge": "0.18.1",
     "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",
+    "@adecore/ui": "^0.18.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "i18next": "^26.4.2",

package/src/completion-model.ts

@@ -29,6 +29,22 @@ export function identifierPrefix(before: string): string {
     return lastPrefix;
 }
 
+const OPENS_VALUE =
+    /(?:[-=!<>&|?+*/%^:,]|(?:^|[^\p{L}\p{N}_$])(?:return|new|case|in|of|instanceof|typeof|keyof|await|yield|throw|extends|implements|as|is|not|and|or|echo|print|use|import|from|clone))$/u;
+const NOT_A_VALUE = /(?:\+\+|--|\/\/|\/\*\*?|^\s*[-+*])$/;
+
+/*
+ * Whether `text`, typed after `before` on its line, puts the caret where a value or a name comes next, so the list
+ * opens without a word typed: an opening bracket, or a space after an operator, a comma or a keyword. A comment
+ * opener, a list marker and `++` or `--` open nothing.
+ */
+export function opensCompletion(before: string, text: string): boolean {
+    if (text === '(' || text === '()' || text === '[' || text === '[]') {
+        return true;
+    }
+    return text === ' ' && OPENS_VALUE.test(before) && !NOT_A_VALUE.test(before);
+}
+
 export interface MatchDetail {
     /* Lower is better. */
     readonly score: number;

package/src/completion.ts

@@ -10,6 +10,7 @@ import {
     itemsOf,
     matchedCharacters,
     mirroredInsertions,
+    opensCompletion,
     prefixFor,
     qualifiersOf,
     rankCompletions,
@@ -312,6 +313,12 @@ export class CompletionFeature {
         if (text.length > 0 && triggers.includes(last) && text.length === 1) {
             this.close();
             this.beginRequest({ triggerKind: 2, triggerCharacter: last }, 0);
+        } else if (
+            isEmpty(range) &&
+            opensCompletion(this.language.editor.textInRange({ start: { line: range.start.line, character: 0 }, end: range.start }), text)
+        ) {
+            this.close();
+            this.beginRequest({ triggerKind: 1 }, START_DELAY_MS);
         } else if (this.isOpen) {
             if (text === '' || typedIdentifier) {
                 this.refilter();