Fix hover on labels in component functions with compiler version 9.1.

Author: cristianoc

Changes.md

@@ -4,6 +4,7 @@
 - Add autocomplete for props in JSX components.
 - Autocomplete: fix issue where `->` autocomplete was overruling `.`. See https://github.com/rescript-lang/rescript-editor-support/issues/99.
 - Add pipe autocomplete for builtin list, array, string, option types. And for string and array literals.
+- Fix hover on labels in component functions with compiler version 9.1.
 
 ## Release 1.0.6 of rescript-vscode
 This [commit](https://github.com/rescript-lang/rescript-editor-support/commit/03ee0d97b250474028d4fb08eac81ddb21ccb082) is vendored in [rescript-vscode 1.0.6](https://github.com/rescript-lang/rescript-vscode/releases/tag/1.0.6).

src/References.ml

@@ -19,11 +19,16 @@ let locsForPos ~extra pos =
 
 let locForPos ~extra pos =
   match locsForPos ~extra pos with
+  | [(loc1, Typed (_, LocalReference _)); ((loc3, _) as l3)] when loc1 = loc3 ->
+    (* JSX and compiler combined: *)
+    (* ~x becomes Props#x *)
+    (* heuristic for: [Props, x], give loc of `x` *)
+    Some l3
   | [
    (loc1, Typed (_, LocalReference _));
    (loc2, Typed (_, GlobalReference ("Js_OO", Tip "unsafe_downgrade", _)));
    ((loc3, _) as l3);
-  ]
+  ]  (* For older compiler 9.0 or earlier *)
     when loc1 = loc2 && loc2 = loc3 ->
     (* JSX and compiler combined: *)
     (* ~x becomes Js_OO.unsafe_downgrade(Props)#x *)
@@ -47,18 +52,18 @@ let definedForLoc ~file ~getModule locKind =
     | Constructor name -> (
       match Query.getConstructor file stamp name with
       | None -> None
-      | Some constructor -> Some ([], `Constructor constructor))
+      | Some constructor -> Some ([], `Constructor constructor) )
     | Field name -> (
       match Query.getField file stamp name with
       | None -> None
-      | Some field -> Some ([], `Field field))
+      | Some field -> Some ([], `Field field) )
     | _ -> (
       maybeLog
-        ("Trying for declared " ^ tipToString tip ^ " " ^ string_of_int stamp
-       ^ " in file " ^ Uri2.toString file.uri);
+        ( "Trying for declared " ^ tipToString tip ^ " " ^ string_of_int stamp
+        ^ " in file " ^ Uri2.toString file.uri );
       match Query.declaredForTip ~stamps:file.stamps stamp tip with
       | None -> None
-      | Some declared -> Some (declared.docstring, `Declared))
+      | Some declared -> Some (declared.docstring, `Declared) )
   in
   match locKind with
   | NotFound -> None
@@ -90,7 +95,7 @@ let definedForLoc ~file ~getModule locKind =
             None
           | Some res ->
             maybeLog "Yes!! got it";
-            Some res))))
+            Some res ) ) ) )
 
 let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
   match Hashtbl.find_opt pathsForModule file.moduleName with
@@ -113,7 +118,7 @@ let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
               ~exported:file.contents.exported declared.name.txt tip
           with
           | None -> None
-          | Some declared -> Some (file, extra, declared))
+          | Some declared -> Some (file, extra, declared) )
       else
         match getUri intfUri with
         | Error e ->
@@ -125,8 +130,8 @@ let alternateDeclared ~file ~pathsForModule ~getUri declared tip =
               ~exported:file.contents.exported declared.name.txt tip
           with
           | None -> None
-          | Some declared -> Some (file, extra, declared)))
-    | _ -> None)
+          | Some declared -> Some (file, extra, declared) ) )
+    | _ -> None )
 
 let resolveModuleReference ~file ~getModule (declared : moduleKind declared) =
   match declared.item with
@@ -143,7 +148,7 @@ let resolveModuleReference ~file ~getModule (declared : moduleKind declared) =
         | None -> None
         | Some md ->
           Some (env.file, Some md)
-          (* Some((env.file.uri, validateLoc(md.name.loc, md.extentLoc))) *)))
+          (* Some((env.file.uri, validateLoc(md.name.loc, md.extentLoc))) *) ) )
     | `Global (moduleName, path) -> (
       match getModule moduleName with
       | None -> None
@@ -160,20 +165,20 @@ let resolveModuleReference ~file ~getModule (declared : moduleKind declared) =
             | Some md ->
               Some (env.file, Some md)
               (* Some((env.file.uri, validateLoc(md.name.loc, md.extentLoc))) *)
-            ))))
+            ) ) ) )
     | `Stamp stamp -> (
       match Hashtbl.find_opt file.stamps.modules stamp with
       | None -> None
       | Some md ->
         Some (file, Some md)
-        (* Some((file.uri, validateLoc(md.name.loc, md.extentLoc))) *))
+        (* Some((file.uri, validateLoc(md.name.loc, md.extentLoc))) *) )
     | `GlobalMod name -> (
       match getModule name with
       | None -> None
       | Some file ->
         (* maybeLog("Congrats, found a global mod"); *)
-        Some (file, None))
-    | _ -> None)
+        Some (file, None) )
+    | _ -> None )
 
 let validateLoc (loc : Location.t) (backup : Location.t) =
   if loc.loc_start.pos_cnum = -1 then
@@ -198,18 +203,18 @@ let resolveModuleDefinition ~file ~getModule stamp =
         | None -> Utils.topLoc (Uri2.toPath file.uri)
         | Some declared -> validateLoc declared.name.loc declared.extentLoc
       in
-      Some (file.uri, loc))
+      Some (file.uri, loc) )
 
 let definition ~file ~getModule stamp tip =
   match tip with
   | Constructor name -> (
     match Query.getConstructor file stamp name with
     | None -> None
-    | Some constructor -> Some (file.uri, constructor.cname.loc))
+    | Some constructor -> Some (file.uri, constructor.cname.loc) )
   | Field name -> (
     match Query.getField file stamp name with
     | None -> None
-    | Some field -> Some (file.uri, field.fname.loc))
+    | Some field -> Some (file.uri, field.fname.loc) )
   | Module -> resolveModuleDefinition ~file ~getModule stamp
   | _ -> (
     match Query.declaredForTip ~stamps:file.stamps stamp tip with
@@ -219,7 +224,7 @@ let definition ~file ~getModule stamp tip =
       let env = Query.fileEnv file in
       let uri = Query.getSourceUri ~env ~getModule declared.modulePath in
       maybeLog ("Inner uri " ^ Uri2.toString uri);
-      Some (uri, loc))
+      Some (uri, loc) )
 
 let orLog message v =
   match v with
@@ -242,8 +247,8 @@ let definitionForLoc ~pathsForModule ~file ~getUri ~getModule loc =
         | None -> None
         | Some (file, _extra, declared) ->
           let loc = validateLoc declared.name.loc declared.extentLoc in
-          Some (file.uri, loc))
-      else None)
+          Some (file.uri, loc) )
+      else None )
   | Explanation _
   | Typed (_, NotFound)
   | LModule (NotFound | Definition (_, _))
@@ -258,16 +263,16 @@ let definitionForLoc ~pathsForModule ~file ~getUri ~getModule loc =
       |> orLog "No paths found" |?> getSrc |> orLog "No src found"
     with
     | None -> None
-    | Some src -> Some (Uri2.fromPath src, Utils.topLoc src))
+    | Some src -> Some (Uri2.fromPath src, Utils.topLoc src) )
   | LModule (LocalReference (stamp, tip))
   | Typed (_, LocalReference (stamp, tip)) ->
     maybeLog ("Local defn " ^ tipToString tip);
     definition ~file ~getModule stamp tip
   | LModule (GlobalReference (moduleName, path, tip))
   | Typed (_, GlobalReference (moduleName, path, tip)) -> (
     maybeLog
-      ("Global defn " ^ moduleName ^ " " ^ pathToString path ^ " : "
-     ^ tipToString tip);
+      ( "Global defn " ^ moduleName ^ " " ^ pathToString path ^ " : "
+      ^ tipToString tip );
     match getModule moduleName with
     | None -> None
     | Some file -> (
@@ -280,4 +285,4 @@ let definitionForLoc ~pathsForModule ~file ~getUri ~getModule loc =
         | Some stamp ->
           (* oooh wht do I do if the stamp is inside a pseudo-file? *)
           maybeLog ("Got stamp " ^ string_of_int stamp);
-          definition ~file:env.file ~getModule stamp tip)))
+          definition ~file:env.file ~getModule stamp tip ) ) )

test/src/expected/Hover.res.txt

@@ -20,5 +20,5 @@ Hover src/Hover.res 33:4
 {"contents": "```rescript\nunit => int\n```\n\nDoc comment for functionWithTypeAnnotation"}
 
 Hover src/Hover.res 37:13
-null
+{"contents": "```rescript\nstring\n```"}