Proper fix that avoids introducing references to ghost locations.

This also finds as reference the value defined in the interface.

Author: cristianoc

CHANGELOG.md

@@ -39,7 +39,7 @@
 
 - Fix issue where code analysis would not track types in inner modules across implementations and interfaces https://github.com/rescript-association/reanalyze/issues/186
 
-- Fix issue with references to elements defined in an interface file https://github.com/rescript-lang/rescript-vscode/issues/645
+- Fix issue with references to elements defined in an interface file https://github.com/rescript-lang/rescript-vscode/pull/646
 
 ## v1.8.2
 

analysis/src/Commands.ml

@@ -172,11 +172,9 @@ let references ~path ~pos ~debug =
                  | Some loc -> loc
                  | None -> Uri.toTopLevelLoc uri2
                in
-               if loc.loc_ghost then acc
-               else
-                 Protocol.stringifyLocation
-                   {uri = Uri.toString uri2; range = Utils.cmtLocToRange loc}
-                 :: acc)
+               Protocol.stringifyLocation
+                 {uri = Uri.toString uri2; range = Utils.cmtLocToRange loc}
+               :: acc)
              [])
   in
   print_endline

analysis/src/ProcessCmt.ml

@@ -19,7 +19,7 @@ let rec forTypeSignatureItem ~(env : SharedTypes.Env.t) ~(exported : Exported.t)
     let oldDeclared = Stamps.findValue env.stamps stamp in
     let declared =
       addDeclared
-        ~name:(Location.mknoloc (Ident.name ident))
+        ~name:(Location.mkloc (Ident.name ident) loc)
         ~extent:loc ~stamp ~env ~item val_attributes
         (Exported.add exported Exported.Value)
         Stamps.addValue
@@ -107,7 +107,7 @@ let rec forTypeSignatureItem ~(env : SharedTypes.Env.t) ~(exported : Exported.t)
     let declared =
       addDeclared ~extent:md_loc
         ~item:(forTypeModule env md_type)
-        ~name:(Location.mknoloc (Ident.name ident))
+        ~name:(Location.mkloc (Ident.name ident) md_loc)
         ~stamp:(Ident.binding_time ident) ~env md_attributes
         (Exported.add exported Exported.Module)
         Stamps.addModule

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

@@ -14,6 +14,8 @@ Hover src/Hover.res 22:11
 {"contents": {"kind": "markdown", "value": "```rescript\nint => int\n```\n\nSome doc comment"}}
 
 Hover src/Hover.res 26:6
+getLocItem #8: heuristic for JSX with at most one child
+heuristic for: [makeProps, make, createElement], give the loc of `make` 
 {"contents": {"kind": "markdown", "value": "```rescript\nint\n```"}}
 
 Hover src/Hover.res 33:4

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

@@ -16,6 +16,7 @@ References src/References.res 9:19
 
 References src/References.res 20:12
 [
+{"uri": "References.res", "range": {"start": {"line": 13, "character": 2}, "end": {"line": 13, "character": 13}}},
 {"uri": "References.res", "range": {"start": {"line": 18, "character": 11}, "end": {"line": 18, "character": 13}}},
 {"uri": "References.res", "range": {"start": {"line": 20, "character": 11}, "end": {"line": 20, "character": 13}}}
 ]