Use module type to resolve references.

Author: cristianoc

analysis/src/Hover.ml

@@ -45,9 +45,10 @@ let rec showModule ~docstring ~(file : SharedTypes.file) ~name
   | None -> showModuleTopLevel ~docstring ~name file.contents.topLevel
   | Some {item = Structure {topLevel}} ->
     showModuleTopLevel ~docstring ~name topLevel
-  | Some ({item = Constraint (_, moduleType)} as declared) ->
+  | Some ({item = Constraint (_moduleItem, moduleTypeItem)} as declared) ->
     (* show the interface *)
-    showModule ~docstring ~file ~name (Some {declared with item = moduleType})
+    showModule ~docstring ~file ~name
+      (Some {declared with item = moduleTypeItem})
   | Some {item = Ident path} ->
     Some ("Unable to resolve module reference " ^ Path.name path)
 

analysis/src/References.ml

@@ -197,8 +197,8 @@ let alternateDeclared ~file ~package declared tip =
 let rec resolveModuleReference ~file ~package (declared : moduleKind declared) =
   match declared.item with
   | Structure _ -> Some (file, Some declared)
-  | Constraint (moduleItem, _moduleTypeItem) ->
-    resolveModuleReference ~file ~package {declared with item = moduleItem}
+  | Constraint (_moduleItem, moduleTypeItem) ->
+    resolveModuleReference ~file ~package {declared with item = moduleTypeItem}
   | Ident path -> (
     let env = ProcessCmt.fileEnv file in
     match ProcessCmt.fromCompilerPath ~env path with

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

@@ -32,13 +32,13 @@ Hover tests/src/Hover.res 47:13
 {"contents": "```rescript\nmodule Logger = {\n  let log: string => unit\n}\n```"}
 
 Hover tests/src/Hover.res 52:7
-{"contents": "```rescript\nmodule JsLogger = {\n  let log: string => unit\n  let _oneMore: int\n}\n```"}
+{"contents": "```rescript\nmodule Logger = {\n  let log: string => unit\n}\n```"}
 
 Definition tests/src/Hover.res 58:14
-{"uri": "Hover.res", "range": {"start": {"line": 52, "character": 7}, "end": {"line": 52, "character": 15}}}
+{"uri": "Hover.res", "range": {"start": {"line": 47, "character": 12}, "end": {"line": 47, "character": 18}}}
 
 Hover tests/src/Hover.res 62:9
-{"contents": "```rescript\nmodule IdDefinedTwice = {\n  let x: int\n  let y: int\n  let x: int\n}\n```"}
+{"contents": "```rescript\nmodule IdDefinedTwice = {\n  let y: int\n  let x: int\n}\n```"}
 
 Hover tests/src/Hover.res 71:7
 {"contents": "```rescript\nmodule A = {\n  let x: int\n}\n```"}