typed expression compltion for lowercase JSX tags

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -756,18 +756,12 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
             | Lazy -> ["Lazy"]
             | Char -> ["Char"])
         | TypExpr t -> (
-          let rec expandPath (path : Path.t) =
-            match path with
-            | Pident id -> [Ident.name id]
-            | Pdot (p, s, _) -> s :: expandPath p
-            | Papply _ -> []
-          in
           match t.Types.desc with
           | Tconstr (path, _typeArgs, _)
           | Tlink {desc = Tconstr (path, _typeArgs, _)}
           | Tsubst {desc = Tconstr (path, _typeArgs, _)}
           | Tpoly ({desc = Tconstr (path, _typeArgs, _)}, []) -> (
-            match expandPath path with
+            match Utils.expandPath path with
             | _ :: pathRev ->
               (* type path is relative to the completion environment
                  express it from the root of the file *)
@@ -882,10 +876,33 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env
            ~opens ~allFiles ~pos ~env ~scope
       |> completionsGetTypeEnv
     in
+    let isBuiltin =
+      match pathToComponent with
+      | [elName] when Char.lowercase_ascii elName.[0] = elName.[0] -> true
+      | _ -> false
+    in
     let targetLabel =
-      CompletionJsx.getJsxLabels ~componentPath:pathToComponent ~findTypeOfValue
-        ~package
-      |> List.find_opt (fun (label, _, _) -> label = propName)
+      if isBuiltin then
+        let rec digToTypeForCompletion path ~env =
+          match
+            path
+            |> getCompletionsForPath ~completionContext:Type ~exact:true
+                 ~package ~opens ~allFiles ~pos ~env ~scope
+          with
+          | {kind = Type {kind = Abstract (Some (p, _))}; env} :: _ ->
+            let pathRev = p |> Utils.expandPath in
+            pathRev |> List.rev |> digToTypeForCompletion ~env
+          | {kind = Type {kind = Record fields}; env} :: _ -> (
+            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
+      else
+        CompletionJsx.getJsxLabels ~componentPath:pathToComponent
+          ~findTypeOfValue ~package
+        |> List.find_opt (fun (label, _, _) -> label = propName)
     in
     match targetLabel with
     | None -> []

analysis/src/Utils.ml

@@ -206,3 +206,9 @@ let rangeOfLoc (loc : Location.t) =
   let start = loc |> Loc.start |> mkPosition in
   let end_ = loc |> Loc.end_ |> mkPosition in
   {Protocol.start; end_}
+
+let rec expandPath (path : Path.t) =
+  match path with
+  | Pident id -> [Ident.name id]
+  | Pdot (p, s, _) -> s :: expandPath p
+  | Papply _ -> []

analysis/tests/src/CompletionJsxProps.res

@@ -13,3 +13,6 @@
 // let _ = <CompletionSupport.TestComponent polyArg=#t
 //                                                    ^com
 
+// let _ = <div muted= />
+//                    ^com
+

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

@@ -132,3 +132,21 @@ Completable: Cexpression CJsxPropValue [CompletionSupport, TestComponent] polyAr
     "insertTextFormat": 2
   }]
 
+Complete src/CompletionJsxProps.res 15:22
+posCursor:[15:22] posNoWhite:[15:21] Found expr:[15:12->15:25]
+JSX <div:[15:12->15:15] muted[15:16->15:21]=...__ghost__[0:-1->0:-1]> _children:15:23
+Completable: Cexpression CJsxPropValue [div] muted
+[{
+    "label": "true",
+    "kind": 4,
+    "tags": [],
+    "detail": "bool",
+    "documentation": null
+  }, {
+    "label": "false",
+    "kind": 4,
+    "tags": [],
+    "detail": "bool",
+    "documentation": null
+  }]
+