Autocomplete: skip inline comments to decide if a labeled argument was already supplied.

Fixes #250

Author: cristianoc

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## master
 - Find references to files as modules.
+- Autocomplete: skip inline comments to decide if a labeled argument was already supplied.
 
 ## 1.1.2
 

analysis/src/PartialParser.ml

@@ -21,6 +21,18 @@ let rec findBackSkippingCommentsAndStrings text char pair i level =
       loop (findOpenComment text (i - 2)) level
     | _ -> loop (i - 1) level
 
+let rec findLineComment text offset =
+  if offset <= 0 || text.[offset] = '\n' then None
+  else if offset > 0 && text.[offset] = '/' && text.[offset - 1] = '/' then
+    Some (offset - 1)
+  else findLineComment text (offset - 1)
+
+(* Check if the position is inside a `//` comment *)
+let insideLineComment text offset = findLineComment text offset <> None
+
+let skipLineComment text offset =
+  match findLineComment text offset with None -> offset | Some n -> n - 1
+
 let rec skipWhite text i =
   if i < 0 then 0
   else
@@ -38,6 +50,7 @@ let rec startOfLident text i =
 let findCallFromArgument text offset =
   let none = ([], []) in
   let rec loop identsSeen i =
+    let i = skipLineComment text i in
     let i = skipWhite text i in
     if i > 0 then
       match text.[i] with
@@ -244,12 +257,6 @@ let findCompletable text offset =
   in
   if offset > String.length text || offset = 0 then None else loop (offset - 1)
 
-(* Check if the position is inside a `//` comment *)
-let rec insideLineComment text offset =
-  if offset <= 0 || text.[offset] = '\n' then false
-  else if offset > 0 && text.[offset] = '/' && text.[offset - 1] = '/' then true
-  else insideLineComment text (offset - 1)
-
 let findOpens text offset =
   let opens = ref [] in
   let pathOfModuleOpen o =

analysis/tests/src/expected/Completion.res.txt

@@ -585,6 +585,12 @@ Complete tests/src/Completion.res 64:2
 
 Complete tests/src/Completion.res 67:2
 [{
+    "label": "age",
+    "kind": 4,
+    "tags": [],
+    "detail": "int",
+    "documentation": null
+  }, {
     "label": "name",
     "kind": 4,
     "tags": [],