add (mostly working) moving into function arguments

zth · cristianoc · commit 799bf0233480 · 2023-03-09T18:56:20.000+01:00
diff --git a/analysis/src/Cfg.ml b/analysis/src/Cfg.ml
@@ -1,3 +1,3 @@
 let supportsSnippets = ref false
 
-let debugFollowCtxPath = false
+let debugFollowCtxPath = ref false
diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml
@@ -1023,12 +1023,14 @@ and getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
     let targetLabel =
       labels
       |> List.find_opt (fun (label, _) ->
-             match argumentLabel with
-             | Unlabelled _ -> label = argumentLabel
-             | Labelled name | Optional name -> (
-               match label with
-               | (Labelled n | Optional n) when name = n -> true
-               | _ -> false))
+             match (argumentLabel, label) with
+             | ( Unlabelled {argumentPosition = pos1},
+                 Completable.Unlabelled {argumentPosition = pos2} ) ->
+               pos1 = pos2
+             | ( (Labelled name1 | Optional name1),
+                 (Labelled name2 | Optional name2) ) ->
+               name1 = name2
+             | _ -> false)
     in
     let expandOption =
       match targetLabel with
diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml
@@ -258,6 +258,25 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
     Utils.flattenLongIdent ~cutAtOffset ~jsx lid.txt
   in
 
+  let currentCtxPath = ref None in
+  let setCurrentCtxPath ctxPath =
+    if !Cfg.debugFollowCtxPath then
+      Printf.printf "setting current ctxPath: %s\n"
+        (Completable.contextPathToString ctxPath);
+    currentCtxPath := Some ctxPath
+  in
+  let resetCurrentCtxPath ctxPath =
+    (match (!currentCtxPath, ctxPath) with
+    | None, None -> ()
+    | _ ->
+      if !Cfg.debugFollowCtxPath then
+        Printf.printf "resetting current ctxPath to: %s\n"
+          (match ctxPath with
+          | None -> "None"
+          | Some ctxPath -> Completable.contextPathToString ctxPath));
+    currentCtxPath := ctxPath
+  in
+
   let found = ref false in
   let result = ref None in
   let scope = ref (Scope.create ()) in
@@ -443,7 +462,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
 
   let case (iterator : Ast_iterator.iterator) (case : Parsetree.case) =
     let oldScope = !scope in
-    scopePattern case.pc_lhs;
+    scopePattern ?contextPath:!currentCtxPath case.pc_lhs;
     completePattern case.pc_lhs;
     Ast_iterator.default_iterator.case iterator case;
     scope := oldScope
@@ -619,7 +638,34 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
       | _ -> ());
     Ast_iterator.default_iterator.attribute iterator (id, payload)
   in
-  let expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression) =
+  let rec iterateFnArguments ~args ~iterator ~isPipe
+      (argCompletable : Completable.t option) =
+    match argCompletable with
+    | None -> (
+      match !currentCtxPath with
+      | None -> ()
+      | Some functionContextPath ->
+        let currentUnlabelledCount = ref (if isPipe then 1 else 0) in
+        args
+        |> List.iter (fun (arg : arg) ->
+               let previousCtxPath = !currentCtxPath in
+               setCurrentCtxPath
+                 (CArgument
+                    {
+                      functionContextPath;
+                      argumentLabel =
+                        (match arg with
+                        | {label = None} ->
+                          let current = !currentUnlabelledCount in
+                          currentUnlabelledCount := current + 1;
+                          Unlabelled {argumentPosition = current}
+                        | {label = Some {name; opt = true}} -> Optional name
+                        | {label = Some {name; opt = false}} -> Labelled name);
+                    });
+               expr iterator arg.exp;
+               resetCurrentCtxPath previousCtxPath))
+    | Some argCompletable -> setResult argCompletable
+  and expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression) =
     let oldInJsxContext = !inJsxContext in
     let processed = ref false in
     let setFound () =
@@ -773,7 +819,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                   But it should not fire in foo(~a)<---there *)
                not
                  (Loc.end_ expr.pexp_loc = posCursor
-                 && charBeforeCursor = Some ')') ->
+                 && charBeforeCursor = Some ')') -> (
           (* Complete fn argument values and named args when the fn call is piped. E.g. someVar->someFn(<com>). *)
           let args = extractExpApplyArgs ~args in
           let argCompletable =
@@ -786,15 +832,23 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                 ~firstCharBeforeCursorNoWhite
             | None -> None
           in
-
-          setResultOpt argCompletable
+          match argCompletable with
+          | None -> (
+            match exprToContextPath funExpr with
+            | None -> ()
+            | Some funCtxPath ->
+              let oldCtxPath = !currentCtxPath in
+              setCurrentCtxPath funCtxPath;
+              argCompletable |> iterateFnArguments ~isPipe:true ~args ~iterator;
+              resetCurrentCtxPath oldCtxPath)
+          | Some argCompletable -> setResult argCompletable)
         | Pexp_apply ({pexp_desc = Pexp_ident {txt = Lident "|."}}, [_; _]) ->
           (* Ignore any other pipe. *)
           ()
         | Pexp_apply (funExpr, args)
           when not
                  (Loc.end_ expr.pexp_loc = posCursor
-                 && charBeforeCursor = Some ')') ->
+                 && charBeforeCursor = Some ')') -> (
           (* Complete fn argument values and named args when the fn call is _not_ piped. E.g. someFn(<com>). *)
           let args = extractExpApplyArgs ~args in
           if debug then
@@ -822,8 +876,16 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                 ~firstCharBeforeCursorNoWhite
             | None -> None
           in
-
-          setResultOpt argCompletable
+          match argCompletable with
+          | None -> (
+            match exprToContextPath funExpr with
+            | None -> ()
+            | Some funCtxPath ->
+              let oldCtxPath = !currentCtxPath in
+              setCurrentCtxPath funCtxPath;
+              argCompletable |> iterateFnArguments ~isPipe:false ~args ~iterator;
+              resetCurrentCtxPath oldCtxPath)
+          | Some argCompletable -> setResult argCompletable)
         | Pexp_send (lhs, {txt; loc}) -> (
           (* e["txt"]
              If the string for txt is not closed, it could go over several lines.
@@ -850,16 +912,33 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
             match exprToContextPath lhs with
             | Some contextPath -> setResult (Cpath (CPObj (contextPath, label)))
             | None -> ())
-        | Pexp_fun (_lbl, defaultExpOpt, pat, e) ->
+        | Pexp_fun (lbl, defaultExpOpt, pat, e) ->
           let oldScope = !scope in
+          let oldCtxPath = !currentCtxPath in
+          (* TODO: Haven't figured out how to count unlabelled args here yet... *)
+          (* TODO: This is broken *)
+          (match !currentCtxPath with
+          | None -> ()
+          | Some ctxPath ->
+            setCurrentCtxPath
+              (CArgument
+                 {
+                   functionContextPath = ctxPath;
+                   argumentLabel =
+                     (match lbl with
+                     | Nolabel -> Unlabelled {argumentPosition = 0}
+                     | Optional name -> Optional name
+                     | Labelled name -> Labelled name);
+                 }));
           (match defaultExpOpt with
           | None -> ()
           | Some defaultExp -> iterator.expr iterator defaultExp);
-          scopePattern pat;
+          scopePattern ?contextPath:!currentCtxPath pat;
           completePattern pat;
           iterator.pat iterator pat;
           iterator.expr iterator e;
           scope := oldScope;
+          resetCurrentCtxPath oldCtxPath;
           processed := true
         | Pexp_let (recFlag, bindings, e) ->
           let oldScope = !scope in
diff --git a/analysis/src/Scope.ml b/analysis/src/Scope.ml
@@ -26,7 +26,7 @@ let addField ~name ~loc x = Field (name, loc) :: x
 let addModule ~name ~loc x = Module (name, loc) :: x
 let addOpen ~lid x = Open (Utils.flattenLongIdent lid @ ["place holder"]) :: x
 let addValue ~name ~loc ?contextPath x =
-  let showDebug = Cfg.debugFollowCtxPath in
+  let showDebug = !Cfg.debugFollowCtxPath in
   (if showDebug then
    match contextPath with
    | None -> Printf.printf "adding value '%s', no ctxPath\n" name
diff --git a/analysis/tests/src/CompletionInferValues.res b/analysis/tests/src/CompletionInferValues.res
@@ -7,7 +7,7 @@ let someFnWithCallback = (cb: (~num: int, ~someRecord: someRecord, ~isOn: bool)
   let _ = cb
 }
 
-let reactEventFn = (cb: someRecord => unit) => {
+let reactEventFn = (cb: ReactEvent.Mouse.t => unit) => {
   let _ = cb
 }
 
@@ -21,3 +21,13 @@ let reactEventFn = (cb: someRecord => unit) => {
 
 // let x = getSomeRecord(); let aliased = x; aliased.
 //                                                   ^com
+
+// someFnWithCallback((~someRecord, ~num, ~isOn) => someRecord.)
+//                                                             ^com
+
+// Broken because not using the first argument (argument context seems to pile on when they should be plucked off and new one added)
+// let aliasedFn = someFnWithCallback; aliasedFn((~num, ~someRecord, ~isOn) => someRecord.)
+//                                                                                        ^com
+
+// reactEventFn(event => { event->pr });
+//                                  ^com
diff --git a/analysis/tests/src/expected/CompletionInferValues.res.txt b/analysis/tests/src/expected/CompletionInferValues.res.txt
@@ -17,7 +17,7 @@ Completable: Cpath Value[aliased]->f
 
 Complete src/CompletionInferValues.res 18:30
 posCursor:[18:30] posNoWhite:[18:29] Found expr:[18:28->18:30]
-Pexp_field [18:28->18:29] _:[24:0->18:30]
+Pexp_field [18:28->18:29] _:[34:0->18:30]
 Completable: Cpath Value[x].""
 [{
     "label": "name",
@@ -35,7 +35,7 @@ Completable: Cpath Value[x].""
 
 Complete src/CompletionInferValues.res 21:53
 posCursor:[21:53] posNoWhite:[21:52] Found expr:[21:45->21:53]
-Pexp_field [21:45->21:52] _:[24:0->21:53]
+Pexp_field [21:45->21:52] _:[34:0->21:53]
 Completable: Cpath Value[aliased].""
 [{
     "label": "name",
@@ -51,3 +51,51 @@ Completable: Cpath Value[aliased].""
     "documentation": null
   }]
 
+Complete src/CompletionInferValues.res 24:63
+posCursor:[24:63] posNoWhite:[24:62] Found expr:[24:3->24:64]
+Pexp_apply ...[24:3->24:21] (...[24:22->24:63])
+posCursor:[24:63] posNoWhite:[24:62] Found expr:[24:22->24:63]
+posCursor:[24:63] posNoWhite:[24:62] Found expr:[24:36->24:63]
+posCursor:[24:63] posNoWhite:[24:62] Found expr:[24:42->24:63]
+posCursor:[24:63] posNoWhite:[24:62] Found expr:[24:52->24:63]
+Pexp_field [24:52->24:62] _:[24:63->24:63]
+Completable: Cpath Value[someRecord].""
+[{
+    "label": "name",
+    "kind": 5,
+    "tags": [],
+    "detail": "name: string\n\ntype someRecord = {name: string, age: int}",
+    "documentation": null
+  }, {
+    "label": "age",
+    "kind": 5,
+    "tags": [],
+    "detail": "age: int\n\ntype someRecord = {name: string, age: int}",
+    "documentation": null
+  }]
+
+Complete src/CompletionInferValues.res 28:90
+posCursor:[28:90] posNoWhite:[28:89] Found expr:[28:39->28:91]
+Pexp_apply ...[28:39->28:48] (...[28:49->28:90])
+posCursor:[28:90] posNoWhite:[28:89] Found expr:[28:49->28:90]
+posCursor:[28:90] posNoWhite:[28:89] Found expr:[28:56->28:90]
+posCursor:[28:90] posNoWhite:[28:89] Found expr:[28:69->28:90]
+posCursor:[28:90] posNoWhite:[28:89] Found expr:[28:79->28:90]
+Pexp_field [28:79->28:89] _:[28:90->28:90]
+Completable: Cpath Value[someRecord].""
+[]
+
+Complete src/CompletionInferValues.res 31:36
+posCursor:[31:36] posNoWhite:[31:35] Found expr:[31:3->31:39]
+Pexp_apply ...[31:3->31:15] (...[31:16->31:38])
+posCursor:[31:36] posNoWhite:[31:35] Found expr:[31:16->31:38]
+posCursor:[31:36] posNoWhite:[31:35] Found expr:[31:27->31:36]
+Completable: Cpath Value[event]->pr
+[{
+    "label": "ReactEvent.Mouse.preventDefault",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => unit",
+    "documentation": null
+  }]
+
diff --git a/analysis/tests/src/expected/Jsx2.res.txt b/analysis/tests/src/expected/Jsx2.res.txt
@@ -257,6 +257,12 @@ posCursor:[80:6] posNoWhite:[80:5] Found expr:[80:5->83:20]
 Pexp_construct :::[83:0->83:20] [83:0->83:20]
 posCursor:[80:6] posNoWhite:[80:5] Found expr:__ghost__[80:5->83:20]
 Pexp_construct []:__ghost__[80:5->83:20] None
+posCursor:[80:6] posNoWhite:[80:5] Found expr:[80:4->83:19]
+JSX <M:[80:4->80:5] > _children:80:5
+posCursor:[80:6] posNoWhite:[80:5] Found expr:[80:5->83:20]
+Pexp_construct :::[83:0->83:20] [83:0->83:20]
+posCursor:[80:6] posNoWhite:[80:5] Found expr:__ghost__[80:5->83:20]
+Pexp_construct []:__ghost__[80:5->83:20] None
 []
 
 Complete src/Jsx2.res 89:16

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`let supportsSnippets = ref false`
`2`	`2`
`3`		`-let debugFollowCtxPath = false`
	`3`	`+let debugFollowCtxPath = ref false`