Experiment with using the parser for autocomplete.

First step: find the parsetree expression for the item to be completed.

Author: cristianoc

Diff for: analysis/src/Cli.ml

@@ -68,7 +68,7 @@ Options:
 let main () =
   match Array.to_list Sys.argv with
   | [_; "completion"; path; line; col; currentFile] ->
-    Commands.completion ~path ~line:(int_of_string line)
+    Commands.completion ~debug:false ~path ~line:(int_of_string line)
       ~col:(int_of_string col) ~currentFile
   | [_; "definition"; path; line; col] ->
     Commands.definition ~path ~line:(int_of_string line)

Diff for: analysis/src/Commands.ml

@@ -1,9 +1,44 @@
 open SharedTypes
 
-let completion ~path ~line ~col ~currentFile =
+let posInLoc ~pos ~loc =
+  Utils.tupleOfLexing loc.Location.loc_start <= pos
+  && pos < Utils.tupleOfLexing loc.loc_end
+
+let completionWithParser ~debug ~path ~pos ~currentFile ~textOpt =
+  let text = match textOpt with Some text -> text | None -> assert false in
+  let offset =
+    match PartialParser.positionToOffset text pos with
+    | Some offset -> offset
+    | None -> assert false
+  in
+  let line, col = pos in
+  let offsetNoWhite = PartialParser.skipWhite text offset in
+  let posNoWhite = (line, max 0 col - offset + offsetNoWhite) in
+
+  if Filename.check_suffix path ".res" then (
+    let parser =
+      Res_driver.parsingEngine.parseImplementation ~forPrinter:false
+    in
+    let found = ref false in
+    let expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression) =
+      if posInLoc ~pos:posNoWhite ~loc:expr.pexp_loc then (
+        found := true;
+        if debug then
+          Printf.printf "Found expr:%s\n"
+            (SemanticTokens.locToString expr.pexp_loc));
+      Ast_iterator.default_iterator.expr iterator expr
+    in
+    let {Res_driver.parsetree = structure} = parser ~filename:currentFile in
+    let iterator = {Ast_iterator.default_iterator with expr} in
+    iterator.structure iterator structure |> ignore;
+    if not !found then if debug then Printf.printf "XXX Not found!\n")
+
+let completion ~debug ~path ~line ~col ~currentFile =
   let pos = (line, col) in
+
   let result =
     let textOpt = Files.readFile currentFile in
+    completionWithParser ~debug ~path ~pos ~currentFile ~textOpt;
     let completionItems =
       match NewCompletions.getCompletable ~textOpt ~pos with
       | None -> []
@@ -216,10 +251,9 @@ let format ~path =
       Res_driver.parsingEngine.parseImplementation ~forPrinter:true
         ~filename:path
     in
-    if List.length diagnostics > 0 then ""
-    else
-      Res_printer.printImplementation !Res_cli.ResClflags.width structure
-        comments
+    (* if List.length diagnostics > 0 then ""
+       else *)
+    Res_printer.printImplementation !Res_cli.ResClflags.width structure comments
   else if Filename.check_suffix path ".resi" then
     let {Res_driver.parsetree = signature; comments; diagnostics} =
       Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename:path
@@ -291,7 +325,7 @@ let test ~path =
             let line = line + 1 in
             let col = len - mlen - 3 in
             close_out cout;
-            completion ~path ~line ~col ~currentFile;
+            completion ~debug:true ~path ~line ~col ~currentFile;
             Sys.remove currentFile
           | "hig" ->
             print_endline ("Highlight " ^ path);

Diff for: analysis/src/vendor/res_outcome_printer/res_core.ml

@@ -3527,8 +3527,11 @@ and parseValueOrConstructor p =
       Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
     | token ->
       Parser.next p;
+      let loc = mkLoc startPos p.prevEndPos in
       Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultExpr()
+      let lident = buildLongident ("$"::acc) in
+      Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
+      (* Recover.defaultExpr() *)
   in
   aux p []
 

Diff for: analysis/tests/src/expected/CompletePrioritize1.res.txt

@@ -1,4 +1,5 @@
 Complete tests/src/CompletePrioritize1.res 4:2
+Found expr:(5,2)->(5,4)
 [{
     "label": "Test.add",
     "kind": 12,

Diff for: analysis/tests/src/expected/CompletePrioritize2.res.txt

@@ -1,4 +1,5 @@
 Complete tests/src/CompletePrioritize2.res 8:2
+Found expr:(9,2)->(9,4)
 [{
     "label": "Test.add",
     "kind": 12,

Diff for: analysis/tests/src/expected/Completion.res.txt

@@ -1,4 +1,5 @@
 Complete tests/src/Completion.res 0:2
+Found expr:(1,1)->(1,9)
 [{
     "label": "mapReverse",
     "kind": 12,
@@ -68,6 +69,7 @@ Complete tests/src/Completion.res 0:2
   }]
 
 Complete tests/src/Completion.res 1:2
+Found expr:(2,1)->(6,6)
 [{
     "label": "Floatarray",
     "kind": 9,
@@ -287,6 +289,7 @@ Complete tests/src/Completion.res 1:2
   }]
 
 Complete tests/src/Completion.res 2:2
+Found expr:(3,1)->(3,8)
 [{
     "label": "mapi",
     "kind": 12,
@@ -338,6 +341,7 @@ Complete tests/src/Completion.res 2:2
   }]
 
 Complete tests/src/Completion.res 12:2
+Found expr:(13,10)->(13,15)
 [{
     "label": "customDouble",
     "kind": 12,
@@ -347,6 +351,7 @@ Complete tests/src/Completion.res 12:2
   }]
 
 Complete tests/src/Completion.res 19:2
+Found expr:(20,9)->(20,18)
 [{
     "label": "age",
     "kind": 4,
@@ -362,6 +367,8 @@ Complete tests/src/Completion.res 19:2
   }]
 
 Complete tests/src/Completion.res 21:2
+Found expr:(22,1)->(22,11)
+Found expr:(22,10)->(22,11)
 [{
     "label": "Js.Array2.mapi",
     "kind": 12,
@@ -377,6 +384,8 @@ Complete tests/src/Completion.res 21:2
   }]
 
 Complete tests/src/Completion.res 23:2
+Found expr:(24,1)->(24,11)
+Found expr:(24,8)->(24,11)
 [{
     "label": "Js.String2.toUpperCase",
     "kind": 12,
@@ -386,6 +395,8 @@ Complete tests/src/Completion.res 23:2
   }]
 
 Complete tests/src/Completion.res 27:2
+Found expr:(28,1)->(28,6)
+Found expr:(28,5)->(28,6)
 [{
     "label": "Belt.Option.eqU",
     "kind": 12,
@@ -401,6 +412,9 @@ Complete tests/src/Completion.res 27:2
   }]
 
 Complete tests/src/Completion.res 36:2
+Found expr:(37,1)->(46,3)
+Found expr:(37,1)->(41,8)
+Found expr:(37,3)->(37,5)
 [{
     "label": "ForAuto.abc",
     "kind": 12,
@@ -416,6 +430,8 @@ Complete tests/src/Completion.res 36:2
   }]
 
 Complete tests/src/Completion.res 38:2
+Found expr:(39,1)->(39,19)
+Found expr:(39,10)->(39,19)
 [{
     "label": "unsafeGet",
     "kind": 12,
@@ -431,6 +447,8 @@ Complete tests/src/Completion.res 38:2
   }]
 
 Complete tests/src/Completion.res 50:2
+Found expr:(51,13)->(51,28)
+Found expr:(51,27)->(51,28)
 [{
     "label": "zzz",
     "kind": 12,
@@ -440,6 +458,8 @@ Complete tests/src/Completion.res 50:2
   }]
 
 Complete tests/src/Completion.res 52:2
+Found expr:(53,13)->(53,21)
+Found expr:(53,20)->(53,21)
 [{
     "label": "zoo",
     "kind": 4,
@@ -643,6 +663,7 @@ DocumentSymbol tests/src/Completion.res
 ]
 
 Complete tests/src/Completion.res 56:2
+XXX Not found!
 [{
     "label": "react.component",
     "kind": 4,
@@ -652,6 +673,7 @@ Complete tests/src/Completion.res 56:2
   }]
 
 Complete tests/src/Completion.res 58:2
+Found expr:(0,-1)->(69,17)
 [{
     "label": "component",
     "kind": 4,
@@ -661,6 +683,7 @@ Complete tests/src/Completion.res 58:2
   }]
 
 Complete tests/src/Completion.res 60:2
+Found expr:(61,9)->(61,25)
 [{
     "label": "age",
     "kind": 4,
@@ -670,6 +693,7 @@ Complete tests/src/Completion.res 60:2
   }]
 
 Complete tests/src/Completion.res 62:2
+Found expr:(63,9)->(63,24)
 [{
     "label": "name",
     "kind": 4,
@@ -679,6 +703,7 @@ Complete tests/src/Completion.res 62:2
   }]
 
 Complete tests/src/Completion.res 64:2
+Found expr:(65,9)->(65,30)
 [{
     "label": "name",
     "kind": 4,
@@ -688,6 +713,7 @@ Complete tests/src/Completion.res 64:2
   }]
 
 Complete tests/src/Completion.res 67:2
+Found expr:(67,8)->(69,17)
 [{
     "label": "age",
     "kind": 4,
@@ -703,6 +729,7 @@ Complete tests/src/Completion.res 67:2
   }]
 
 Complete tests/src/Completion.res 72:2
+Found expr:(73,8)->(75,18)
 [{
     "label": "age",
     "kind": 4,
@@ -712,6 +739,7 @@ Complete tests/src/Completion.res 72:2
   }]
 
 Complete tests/src/Completion.res 76:2
+Found expr:(77,20)->(80,10)
 [{
     "label": "age",
     "kind": 4,
@@ -727,6 +755,7 @@ Complete tests/src/Completion.res 76:2
   }]
 
 Complete tests/src/Completion.res 79:2
+Found expr:(80,2)->(82,20)
 [{
     "label": "age",
     "kind": 4,
@@ -736,6 +765,7 @@ Complete tests/src/Completion.res 79:2
   }]
 
 Complete tests/src/Completion.res 83:2
+Found expr:(84,13)->(101,20)
 [{
     "label": "name",
     "kind": 4,
@@ -751,6 +781,7 @@ Complete tests/src/Completion.res 83:2
   }]
 
 Complete tests/src/Completion.res 88:3
+Found expr:(89,1)->(93,3)
 [{
     "label": "x",
     "kind": 5,
@@ -766,6 +797,7 @@ Complete tests/src/Completion.res 88:3
   }]
 
 Complete tests/src/Completion.res 90:3
+Found expr:(91,1)->(93,3)
 [{
     "label": "xx",
     "kind": 5,
@@ -781,6 +813,9 @@ Complete tests/src/Completion.res 90:3
   }]
 
 Complete tests/src/Completion.res 96:3
+Found expr:(96,11)->(99,1)
+Found expr:(97,1)->(98,5)
+Found expr:(97,1)->(97,3)
 [{
     "label": "myAmazingFunction",
     "kind": 12,
@@ -790,6 +825,7 @@ Complete tests/src/Completion.res 96:3
   }]
 
 Complete tests/src/Completion.res 100:3
+Found expr:(101,11)->(120,32)
 [{
     "label": "name",
     "kind": 4,

Diff for: analysis/tests/src/expected/Cross.res.txt

@@ -94,5 +94,6 @@ TypeDefinition tests/src/Cross.res 37:37
 {"uri": "DefinitionWithInterface.resi", "range": {"start": {"line": 3, "character": 0}, "end": {"line": 3, "character": 6}}}
 
 Complete tests/src/Cross.res 39:2
+Found expr:(40,1)->(40,26)
 []
 

Diff for: analysis/tests/src/expected/Div.res.txt

@@ -2,6 +2,8 @@ Hover tests/src/Div.res 1:10
 {"contents": "```rescript\n(\n  string,\n  ~props: ReactDOMRe.domProps=?,\n  array<React.element>,\n) => React.element\n```"}
 
 Complete tests/src/Div.res 3:3
+Found expr:(4,2)->(4,15)
+Found expr:(4,6)->(4,15)
 [{
     "label": "dangerouslySetInnerHTML",
     "kind": 4,