handle jsx context

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -978,25 +978,25 @@ and getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
     in
     let targetLabel =
       if lowercaseComponent then
-        let rec digToTypeForCompletion path ~env =
+        let rec digToTypeForCompletion path =
           match
             path
             |> getCompletionsForPath ~completionContext:Type ~exact:true
                  ~package ~opens ~allFiles ~pos ~env ~scope
           with
-          | {kind = Type {kind = Abstract (Some (p, _))}; env} :: _ ->
+          | {kind = Type {kind = Abstract (Some (p, _))}} :: _ ->
             (* This case happens when what we're looking for is a type alias.
                This is the case in newer rescript-react versions where
                ReactDOM.domProps is an alias for JsxEvent.t. *)
             let pathRev = p |> Utils.expandPath in
-            pathRev |> List.rev |> digToTypeForCompletion ~env
-          | {kind = Type {kind = Record fields}; env} :: _ -> (
+            pathRev |> List.rev |> digToTypeForCompletion
+          | {kind = Type {kind = Record fields}} :: _ -> (
             match fields |> List.find_opt (fun f -> f.fname.txt = propName) with
             | None -> None
             | Some f -> Some (f.fname.txt, f.typ, env))
           | _ -> None
         in
-        ["ReactDOM"; "domProps"] |> digToTypeForCompletion ~env
+        ["ReactDOM"; "domProps"] |> digToTypeForCompletion
       else
         CompletionJsx.getJsxLabels ~componentPath:pathToComponent
           ~findTypeOfValue ~package

analysis/src/CompletionFrontEnd.ml

@@ -665,6 +665,19 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
                expr iterator arg.exp;
                resetCurrentCtxPath previousCtxPath))
     | Some argCompletable -> setResult argCompletable
+  and iterateJsxProps ~iterator (props : CompletionJsx.jsxProps) =
+    props.props
+    |> List.iter (fun (prop : CompletionJsx.prop) ->
+           let previousCtxPath = !currentCtxPath in
+           setCurrentCtxPath
+             (CJsxPropValue
+                {
+                  pathToComponent =
+                    Utils.flattenLongIdent ~jsx:true props.compName.txt;
+                  propName = prop.name;
+                });
+           expr iterator prop.exp;
+           resetCurrentCtxPath previousCtxPath)
   and expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression) =
     let oldInJsxContext = !inJsxContext in
     let processed = ref false in
@@ -796,6 +809,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
               | [prefix] when Char.lowercase_ascii prefix.[0] = prefix.[0] ->
                 ChtmlElement {prefix}
               | _ -> Cpath (CPId (compNamePath, Module)))
+          else iterateJsxProps ~iterator jsxProps
         | Pexp_apply
             ( {pexp_desc = Pexp_ident {txt = Lident "|."}},
               [

analysis/tests/src/CompletionInferValues.res

@@ -31,3 +31,17 @@ let reactEventFn = (cb: ReactEvent.Mouse.t => unit) => {
 
 // reactEventFn(event => { event->pr });
 //                                  ^com
+
+module Div = {
+  @react.component
+  let make = (~onMouseEnter: option<JsxEvent.Mouse.t => unit>=?) => {
+    let _ = onMouseEnter
+    React.null
+  }
+}
+
+// let _ = <div onMouseEnter={event => { event->pr }} />
+//                                                ^com
+
+// let _ = <Div onMouseEnter={event => { event->pr }} />
+//                                                ^com

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

@@ -1364,6 +1364,9 @@ posCursor:[336:26] posNoWhite:[336:25] Found expr:[336:16->338:5]
 posCursor:[336:26] posNoWhite:[336:25] Found pattern:[336:20->338:5]
 posCursor:[336:26] posNoWhite:[336:25] Found type:[336:23->338:5]
 Ptyp_constr Res:[336:23->338:5]
+posCursor:[336:26] posNoWhite:[336:25] Found pattern:[336:20->338:5]
+posCursor:[336:26] posNoWhite:[336:25] Found type:[336:23->338:5]
+Ptyp_constr Res:[336:23->338:5]
 Completable: Cpath Type[Res]
 Raw opens: 2 Shadow.B.place holder ... Shadow.A.place holder
 Resolved opens 2 Completion.res Completion.res

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

@@ -99,3 +99,31 @@ Completable: Cpath Value[event]->pr
     "documentation": null
   }]
 
+Complete src/CompletionInferValues.res 42:50
+posCursor:[42:50] posNoWhite:[42:49] Found expr:[42:12->42:56]
+JSX <div:[42:12->42:15] onMouseEnter[42:16->42:28]=...[42:36->42:52]> _children:42:54
+posCursor:[42:50] posNoWhite:[42:49] Found expr:[42:36->42:52]
+posCursor:[42:50] posNoWhite:[42:49] Found expr:[42:41->42:50]
+Completable: Cpath Value[event]->pr <<jsx>>
+[{
+    "label": "JsxEvent.Mouse.preventDefault",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => unit",
+    "documentation": null
+  }]
+
+Complete src/CompletionInferValues.res 45:50
+posCursor:[45:50] posNoWhite:[45:49] Found expr:[45:12->45:56]
+JSX <Div:[45:12->45:15] onMouseEnter[45:16->45:28]=...[45:36->45:52]> _children:45:54
+posCursor:[45:50] posNoWhite:[45:49] Found expr:[45:36->45:52]
+posCursor:[45:50] posNoWhite:[45:49] Found expr:[45:41->45:50]
+Completable: Cpath Value[event]->pr <<jsx>>
+[{
+    "label": "JsxEvent.Mouse.preventDefault",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => unit",
+    "documentation": null
+  }]
+

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

@@ -7,6 +7,9 @@ posCursor:[6:26] posNoWhite:[6:25] Found expr:[6:16->8:5]
 posCursor:[6:26] posNoWhite:[6:25] Found pattern:[6:20->8:5]
 posCursor:[6:26] posNoWhite:[6:25] Found type:[6:23->8:5]
 Ptyp_constr Res:[6:23->8:5]
+posCursor:[6:26] posNoWhite:[6:25] Found pattern:[6:20->8:5]
+posCursor:[6:26] posNoWhite:[6:25] Found type:[6:23->8:5]
+Ptyp_constr Res:[6:23->8:5]
 Completable: Cpath Type[Res]
 [{
     "label": "RescriptReactErrorBoundary",