Merge pull request #25 from publicodes/feat-improve-completion

Server: improve autocompletion

client/src/extension.ts

@@ -42,10 +42,7 @@ export function activate(context: ExtensionContext) {
     documentSelector: [{ scheme: "file", language: "publicodes" }],
     synchronize: {
       // Notify the server about file changes to '.clientrc files contained in the workspace
-      fileEvents: [
-        workspace.createFileSystemWatcher("**/.clientrc"),
-        workspace.createFileSystemWatcher("**/.publicodes"),
-      ],
+      fileEvents: [workspace.createFileSystemWatcher("**/.clientrc")],
     },
     markdown: {
       isTrusted: true,

client/src/test/completion.test.ts

@@ -17,16 +17,21 @@ suite("Should do completion", () => {
     await testCompletion(docUri, new vscode.Position(7, 20), true);
   });
 
-  test("Complete in expressions", async () => {
-    await testCompletion(docUri, new vscode.Position(2, 18), false);
-  });
+  // TODO: implement correct test
+  // test("Complete in expressions", async () => {
+  //   await testCompletion(docUri, new vscode.Position(11, 12), false, [
+  //     ruleItem("rule a"),
+  //     ruleItem("b"),
+  //     ruleItem("c"),
+  //   ]);
+  // });
 });
 
 async function testCompletion(
   docUri: vscode.Uri,
   position: vscode.Position,
-  shouldBeEmtpy: boolean,
-  // expectedCompletionList?: vscode.CompletionList,
+  shouldBeEmpty: boolean,
+  expectedRulesCompletionItems?: vscode.CompletionItem[],
 ) {
   await activate(docUri);
 
@@ -37,17 +42,32 @@ async function testCompletion(
     position,
   )) as vscode.CompletionList;
 
-  if (shouldBeEmtpy) {
+  if (shouldBeEmpty) {
     assert.ok(actualCompletionList.items.length === 0);
   } else {
     assert.ok(actualCompletionList.items.length > 0);
-    // assert.ok(
-    //   actualCompletionList.items.length === expectedCompletionList.items.length,
-    // );
-    // expectedCompletionList.items.forEach((expectedItem, i) => {
-    //   const actualItem = actualCompletionList.items[i];
-    //   assert.equal(actualItem.label, expectedItem.label);
-    //   assert.equal(actualItem.kind, expectedItem.kind);
-    // });
+    const actualRulesCompletionItems = actualCompletionList.items.filter(
+      (item) => {
+        return (
+          item.kind !== vscode.CompletionItemKind.Property &&
+          item.kind !== vscode.CompletionItemKind.Keyword
+        );
+      },
+    );
+    console.log(actualRulesCompletionItems);
+    console.log(expectedRulesCompletionItems);
+    assert.ok(
+      actualRulesCompletionItems.length ===
+        expectedRulesCompletionItems?.length,
+    );
+    expectedRulesCompletionItems?.forEach((expectedItem, i) => {
+      const actualItem = actualRulesCompletionItems[i];
+      assert.equal(actualItem.label, expectedItem.label);
+      assert.equal(actualItem.kind, expectedItem.kind);
+    });
   }
 }
+
+function ruleItem(label: string): vscode.CompletionItem {
+  return new vscode.CompletionItem(label, vscode.CompletionItemKind.Function);
+}

client/testFixture/completion.publicodes

@@ -1,10 +1,10 @@
 rule a:
     titre: Résultat
-    valeur: b + c
+    valeur: rule a . b + rule a . c
 
 rule a . b:
     valeur: 2
     description: |
         Description.
 
-rule a . c: 3
+rule a . c:

client/testFixture/main.publicodes

@@ -1,10 +1,10 @@
 rule a:
     titre: Résultat
-    valeur: b + c
+    valeur: rule a . b + rule a . c
 
 rule a . b:
     valeur: 2
     description: |
         Description.
 
-rule a . c: 3
+rule a . c:

language-configuration.json

@@ -32,7 +32,7 @@
     "increaseIndentPattern": "^\\s*.*(:|-) ?(&\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$",
     "decreaseIndentPattern": "^\\s+\\}$"
   },
-  "wordPattern": "(^.?[^\\s]+)+|([^\\s\n={[][\\w\\-\\./$%&*:\"']+)",
+  "wordPattern": "",
   "onEnterRules": [
     {
       "beforeText": "^\\s*(moyenne|somme|une de ces conditions|toutes ces conditions|variations|le maximum de|le minimum de|suggestions|références|les règles)\\:\\s*$",

package.json

@@ -67,9 +67,9 @@
         "editor.tabSize": 2,
         "editor.autoIndent": "advanced",
         "editor.quickSuggestions": {
-          "other": true,
-          "comments": false,
-          "strings": true
+          "other": "on",
+          "comments": "off",
+          "strings": "on"
         },
         "editor.wordBasedSuggestions": "off",
         "editor.semanticHighlight.enable": true,