Find multiple references to the same file.

Author: cristianoc

analysis/.depend

@@ -26,7 +26,7 @@ src/ProcessAttributes.cmx : src/SharedTypes.cmx src/PrepareUtils.cmx
 src/ProcessCmt.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
     src/Shared.cmx src/ProcessAttributes.cmx src/Packages.cmx src/Log.cmx \
     src/FindFiles.cmx src/Files.cmx src/BuildSystem.cmx
-src/Protocol.cmx : src/Uri2.cmx src/vendor/Json.cmx
+src/Protocol.cmx : src/vendor/Json.cmx
 src/References.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
     src/ProcessCmt.cmx src/Log.cmx src/Infix.cmx
 src/Shared.cmx : src/PrintType.cmx src/Log.cmx src/Files.cmx

analysis/src/Commands.ml

@@ -130,16 +130,14 @@ let references ~path ~line ~col =
           allReferences
           |> List.fold_left
                (fun acc (uri2, references) ->
-                 if references = [] then [Protocol.stringifyFileLocation uri2]
-                 else
-                   (references
-                   |> List.map (fun loc ->
-                          Protocol.stringifyLocation
-                            {
-                              uri = Uri2.toString uri2;
-                              range = Utils.cmtLocToRange loc;
-                            }))
-                   @ acc)
+                 (references
+                 |> List.map (fun loc ->
+                        Protocol.stringifyLocation
+                          {
+                            uri = Uri2.toString uri2;
+                            range = Utils.cmtLocToRange loc;
+                          }))
+                 @ acc)
                []
         in
         "[\n" ^ (allLocs |> String.concat ",\n") ^ "\n]")

analysis/src/ProcessCmt.ml

@@ -733,6 +733,14 @@ struct
        Hashtbl.find extra.externalReferences moduleName
       else []))
 
+  let addFileReference moduleName loc =
+    Hashtbl.replace extra.fileReferences moduleName
+      (loc
+      ::
+      (if Hashtbl.mem extra.fileReferences moduleName then
+       Hashtbl.find extra.fileReferences moduleName
+      else []))
+
   let env = QueryEnv.fromFile Collector.file
 
   let addForPath path lident loc typ tip =
@@ -767,9 +775,9 @@ struct
   let addForPathParent path loc =
     let locType =
       match fromCompilerPath ~env path with
-      | `GlobalMod name ->
-        (* TODO track external references to filenames to handle renames well *)
-        TopLevelModule name
+      | `GlobalMod moduleName ->
+        addFileReference moduleName loc;
+        TopLevelModule moduleName
       | `Stamp stamp ->
         addReference stamp loc;
         LModule (LocalReference (stamp, Module))

analysis/src/Protocol.ml

@@ -56,9 +56,6 @@ let stringifyLocation h =
   Printf.sprintf {|{"uri": "%s", "range": %s}|} (Json.escape h.uri)
     (stringifyRange h.range)
 
-let stringifyFileLocation uri =
-  Printf.sprintf {|{"uri": "%s"}|} (Json.escape (Uri2.toString uri))
-
 let stringifyDocumentSymbolItem i =
   Printf.sprintf
     {|{

analysis/src/References.ml

@@ -467,15 +467,16 @@ let forLocalStamp ~full:{file; extra; package} stamp tip =
 
 let allReferencesForLocItem ~full:({file; package} as full) locItem =
   match locItem.locType with
-  | TopLevelModule moduleName -> (
-    match Hashtbl.find_opt package.pathsForModule moduleName with
-    | None -> []
-    | Some paths -> (
-      match getSrc paths with
+  | TopLevelModule moduleName ->
+    let locs =
+      match Hashtbl.find_opt full.extra.fileReferences moduleName with
       | None -> []
-      | Some src ->
-        let uri, loc = (Uri2.fromPath src, Utils.topLoc src) in
-        [(uri, [])]))
+      | Some locs ->
+        locs
+        |> List.map (fun loc ->
+               (Uri2.fromPath loc.Location.loc_start.pos_fname, [loc]))
+    in
+    locs
   | Typed (_, _, NotFound) | LModule NotFound | Constant _ -> []
   | TypeDefinition (_, _, stamp) -> forLocalStamp ~full stamp Type
   | Typed (_, _, (LocalReference (stamp, tip) | Definition (stamp, tip)))

analysis/src/SharedTypes.ml

@@ -193,6 +193,7 @@ type openTracker = {
 type extra = {
   internalReferences : (int, Location.t list) Hashtbl.t;
   externalReferences : (string, (path * tip * Location.t) list) Hashtbl.t;
+  fileReferences : (string, Location.t list) Hashtbl.t;
   mutable locItems : locItem list;
   (* This is the "open location", like the location...
      or maybe the >> location of the open ident maybe *)
@@ -218,6 +219,7 @@ let initExtra () =
   {
     internalReferences = Hashtbl.create 10;
     externalReferences = Hashtbl.create 10;
+    fileReferences = Hashtbl.create 10;
     locItems = [];
     opens = Hashtbl.create 10;
   }
@@ -246,7 +248,8 @@ let locKindToString = function
 
 let locTypeToString = function
   | Typed (name, e, locKind) ->
-    "Typed " ^ name ^ " " ^ Shared.typeToString e ^ " " ^ locKindToString locKind
+    "Typed " ^ name ^ " " ^ Shared.typeToString e ^ " "
+    ^ locKindToString locKind
   | Constant _ -> "Constant"
   | LModule locKind -> "LModule " ^ locKindToString locKind
   | TopLevelModule _ -> "TopLevelModule"

analysis/tests/src/Cross.res

@@ -1,2 +1,9 @@
 let crossRef = References.x
-//               ^ref
+//               ^ref
+
+let crossRef2 = References.x
+
+
+module Ref = References
+
+let crossRef3 = References.x

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

@@ -1,5 +1,8 @@
 References tests/src/Cross.res 0:17
 [
-{"uri": "References.res"}
+{"uri": "Cross.res", "range": {"start": {"line": 0, "character": 15}, "end": {"line": 0, "character": 25}}},
+{"uri": "Cross.res", "range": {"start": {"line": 3, "character": 16}, "end": {"line": 3, "character": 26}}},
+{"uri": "Cross.res", "range": {"start": {"line": 6, "character": 13}, "end": {"line": 6, "character": 23}}},
+{"uri": "Cross.res", "range": {"start": {"line": 8, "character": 16}, "end": {"line": 8, "character": 26}}}
 ]
 

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

@@ -1,5 +1,7 @@
 References tests/src/References.res 0:4
 [
+{"uri": "Cross.res", "range": {"start": {"line": 8, "character": 27}, "end": {"line": 8, "character": 28}}},
+{"uri": "Cross.res", "range": {"start": {"line": 3, "character": 27}, "end": {"line": 3, "character": 28}}},
 {"uri": "Cross.res", "range": {"start": {"line": 0, "character": 26}, "end": {"line": 0, "character": 27}}},
 {"uri": "References.res", "range": {"start": {"line": 7, "character": 8}, "end": {"line": 7, "character": 9}}},
 {"uri": "References.res", "range": {"start": {"line": 3, "character": 8}, "end": {"line": 3, "character": 9}}},