Make autocomplete less aggressive

CHANGELOG.md

@@ -6,7 +6,7 @@ CHANGELOG
 
 * **BC BREAK:** Separate files are no longer included in the release (due to using `cm-buildhelper`)
 * Tests are now in TypeScript too
-
+* Autocomplete is now less aggressive
 
 0.8
 ---

src/complete.ts

@@ -121,10 +121,12 @@ export function expressionLanguageCompletion(context: CompletionContext): Comple
   }
 
   if (
-    [Expression, UnaryExpression, BinaryExpression, TernaryExpression].includes(prevNode.type.id) && prevNode.lastChild && !prevNode.lastChild?.type.isError
-    || [Arguments, Array].includes(prevNode.type.id) && prevNode.lastChild && !prevNode.lastChild?.type.isError
-    || [Expression, UnaryExpression, BinaryExpression, TernaryExpression].includes(prevNode.parent?.type.id) && prevNode.type.isError
-    || [Variable, Function].includes(prevNode.parent?.type.id) && prevNode.type.isError
+    /^[\sa-z]*$/.test(lastChar) && (
+      [Expression, UnaryExpression, BinaryExpression, TernaryExpression].includes(prevNode.type.id) && prevNode.lastChild && !prevNode.lastChild?.type.isError
+      || [Arguments, Array].includes(prevNode.type.id) && prevNode.lastChild && !prevNode.lastChild?.type.isError
+      || [Expression, UnaryExpression, BinaryExpression, TernaryExpression].includes(prevNode.parent?.type.id) && prevNode.type.isError
+      || [Variable, Function].includes(prevNode.parent?.type.id) && prevNode.type.isError
+    )
   ) {
     return completeOperatorKeyword(state, config, prevNode, ![Expression, UnaryExpression, BinaryExpression, TernaryExpression, Arguments].includes(prevNode.type.id) ? prevNode.from : pos, pos, explicit);
   }

test/test-complete.ts

@@ -129,7 +129,7 @@ describe("Expression language completion", () => {
   });
 
   it("completes only operators after method call", async () => {
-    const c = await get("obj.firstMethod()‸") ?? [];
+    const c = await get("obj.firstMethod() ‸") ?? [];
     ist(!c.find(x => x.label === 'firstMethod()'));
     ist(!c.find(x => x.label === 'obj'));
     ist(c.find((x: Completion) => x.label === 'starts with'));
@@ -159,6 +159,10 @@ describe("Expression language completion", () => {
     ist(null, await get("1 and‸"));
   });
 
+  it("does not complete right after closing bracket", async () => {
+    ist(null, await get("(1)‸"));
+  });
+
   it("does complete after ternary expression", async () => {
     let c = await get("(foobar ? obj : false).‸") ?? [];
     ist(c.length, 3);