Merge pull request #253 from ulugbekna/fix-completion-bug

Fix completion bug #252

Author: ulugbekna

ocaml-lsp-server/src/compl.ml

@@ -135,9 +135,6 @@ let item index full_entry ~compl_info =
     ~sortText:(Printf.sprintf "%04d" index)
     ~data:compl_info ?textEdit ()
 
-let completion_kinds =
-  [ `Constructor; `Labels; `Modules; `Modules_type; `Types; `Values; `Variants ]
-
 let complete doc lsp_position =
   let position = Position.logical lsp_position in
 
@@ -149,8 +146,7 @@ let complete doc lsp_position =
   Document.with_pipeline_exn doc @@ fun pipeline ->
   let completion =
     let complete =
-      Query_protocol.Complete_prefix
-        (prefix, position, completion_kinds, false, true)
+      Query_protocol.Complete_prefix (prefix, position, [], false, true)
     in
     Query_commands.dispatch pipeline complete
   in
@@ -179,9 +175,7 @@ let complete doc lsp_position =
     match items with
     | _ :: _ -> items
     | [] ->
-      let expand =
-        Query_protocol.Expand_prefix (prefix, position, completion_kinds, true)
-      in
+      let expand = Query_protocol.Expand_prefix (prefix, position, [], true) in
       let { Query_protocol.Compl.entries; context = _ } =
         Query_commands.dispatch pipeline expand
       in

ocaml-lsp-server/test/e2e/__tests__/textDocument-completion.test.ts

@@ -250,9 +250,9 @@ describe_opt("textDocument/completion", () => {
     expect(items_top5).toMatchInlineSnapshot(`
       Array [
         Object {
-          "label": "()",
+          "label": "somenum",
           "textEdit": Object {
-            "newText": "()",
+            "newText": "somenum",
             "range": Object {
               "end": Object {
                 "character": 12,
@@ -266,9 +266,9 @@ describe_opt("textDocument/completion", () => {
           },
         },
         Object {
-          "label": "::",
+          "label": "x",
           "textEdit": Object {
-            "newText": "::",
+            "newText": "x",
             "range": Object {
               "end": Object {
                 "character": 12,
@@ -282,9 +282,9 @@ describe_opt("textDocument/completion", () => {
           },
         },
         Object {
-          "label": "Assert_failure",
+          "label": "y",
           "textEdit": Object {
-            "newText": "Assert_failure",
+            "newText": "y",
             "range": Object {
               "end": Object {
                 "character": 12,
@@ -298,9 +298,9 @@ describe_opt("textDocument/completion", () => {
           },
         },
         Object {
-          "label": "Division_by_zero",
+          "label": "max_int",
           "textEdit": Object {
-            "newText": "Division_by_zero",
+            "newText": "max_int",
             "range": Object {
               "end": Object {
                 "character": 12,
@@ -314,9 +314,9 @@ describe_opt("textDocument/completion", () => {
           },
         },
         Object {
-          "label": "End_of_file",
+          "label": "min_int",
           "textEdit": Object {
-            "newText": "End_of_file",
+            "newText": "min_int",
             "range": Object {
               "end": Object {
                 "character": 12,
@@ -432,33 +432,33 @@ describe_opt("textDocument/completion", () => {
         },
       },
       {
-        label: "ListLabels.t",
+        label: "ListLabels.append",
         textEdit: {
           range: {
             start: { line: 0, character: 8 },
             end: { line: 0, character: 10 },
           },
-          newText: "ListLabels.t",
+          newText: "ListLabels.append",
         },
       },
       {
-        label: "ListLabels.append",
+        label: "ListLabels.assoc",
         textEdit: {
           range: {
             start: { line: 0, character: 8 },
             end: { line: 0, character: 10 },
           },
-          newText: "ListLabels.append",
+          newText: "ListLabels.assoc",
         },
       },
       {
-        label: "ListLabels.assoc",
+        label: "ListLabels.assoc_opt",
         textEdit: {
           range: {
             start: { line: 0, character: 8 },
             end: { line: 0, character: 10 },
           },
-          newText: "ListLabels.assoc",
+          newText: "ListLabels.assoc_opt",
         },
       },
     ]);
@@ -563,4 +563,18 @@ describe_opt("textDocument/completion", () => {
       ]
     `);
   });
+
+  it("completion doesn't autocomplete record fields", async () => {
+    openDocument(outdent`
+      type r = {
+        x: int;
+        y: string
+      }
+
+      let _ = 
+    `);
+
+    let items: Array<any> = await queryCompletion(Types.Position.create(5, 8));
+    expect(items.filter(compl => compl.label === "x" || compl.label === "y")).toHaveLength(0);
+  })
 });