Towards better treatment of modules and module types.

Fixes #178

Author: cristianoc

analysis/src/Commands.ml

@@ -170,6 +170,9 @@ let documentSymbol ~path =
           | MValue v -> (v |> SharedTypes.variableKind, [])
           | MType (t, _) -> (t.decl |> SharedTypes.declarationKind, [])
           | Module (Structure contents) -> (Module, getItems contents)
+          | Module (Constraint (_, Structure contents)) ->
+            (Module, getItems contents)
+          | Module (Constraint _) -> (Module, [])
           | Module (Ident _) -> (Module, [])
         in
         if extentLoc.loc_ghost then siblings

analysis/src/Hover.ml

@@ -45,7 +45,9 @@ let showModule ~docstring ~(file : SharedTypes.file) ~name
   | None -> showModuleTopLevel ~docstring ~name file.contents.topLevel
   | Some {item = Structure {topLevel}} ->
     showModuleTopLevel ~docstring ~name topLevel
-  | Some {item = Ident _} -> Some "Unable to resolve module reference"
+  | Some {item = Constraint(Structure {topLevel}, _)} ->
+    showModuleTopLevel ~docstring ~name topLevel
+  | Some _ -> Some "Unable to resolve module reference"
 
 let newHover ~(file : SharedTypes.file) ~package locItem =
   match locItem.SharedTypes.locType with

analysis/src/ProcessCmt.ml

@@ -375,6 +375,7 @@ let rec forItem ~env ~(exported : exported) item =
              | _ -> Types.Trec_next
            in
            decl |> forTypeDeclaration ~env ~exported ~recStatus)
+  | Tstr_modtype _ -> []
   | _ -> []
 
 and forModule env mod_desc moduleName =
@@ -422,12 +423,14 @@ and forModule env mod_desc moduleName =
     (* e.g. when the same id is defined twice (e.g. make with @react.component) *)
     (* skip the constraint and use the original module definition *)
     forModule env expr.mod_desc moduleName
-  | Tmod_constraint (_expr, typ, _constraint, _coercion) ->
+  | Tmod_constraint (expr, typ, _constraint, _coercion) ->
     (* TODO do this better I think *)
+    let forMod = forModule env expr.mod_desc moduleName in
     let env =
       {env with modulePath = ExportedModule (moduleName, env.modulePath)}
     in
-    forModuleType env typ
+    let forModTyp = forModuleType env typ in
+    Constraint (forMod, forModTyp)
 
 and forStructure ~env items =
   let exported = initExported () in
@@ -636,6 +639,7 @@ and findInModule ~env kind path =
   match kind with
   | Structure {exported} ->
     resolvePathInner ~env:{env with qExported = exported} ~path
+  | Constraint (_, k) -> findInModule ~env k path
   | Ident modulePath -> (
     let stamp, moduleName, fullPath = joinPaths modulePath path in
     if stamp = 0 then Some (`Global (moduleName, fullPath))

analysis/src/References.ml

@@ -197,7 +197,8 @@ let alternateDeclared ~file ~package declared tip =
 let resolveModuleReference ~file ~package (declared : moduleKind declared) =
   match declared.item with
   | Structure _ -> Some (file, Some declared)
-  | Ident path -> (
+  | Constraint ((Structure _ | Constraint _), _) -> Some (file, Some declared)
+  | Ident path | Constraint (Ident path, _) -> (
     let env = ProcessCmt.fileEnv file in
     match ProcessCmt.fromCompilerPath ~env path with
     | `Not_found -> None

analysis/src/SharedTypes.ml

@@ -117,7 +117,10 @@ and moduleContents = {
   topLevel : moduleItem declared list;
 }
 
-and moduleKind = Ident of Path.t | Structure of moduleContents
+and moduleKind =
+  | Ident of Path.t
+  | Structure of moduleContents
+  | Constraint of moduleKind * moduleKind
 
 type 't stampMap = (int, 't) Hashtbl.t
 

analysis/tests/src/Hover.res

@@ -44,3 +44,12 @@ let make2 = (~name:string) => React.string(name)
 
 let num = 34
 //        ^hov
+
+module type Logger = {
+  let log: string => unit
+}
+
+module JsLogger: Logger = {
+//     ^hov
+  let log = (msg: string) => Js.log(msg)
+}

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

@@ -0,0 +1,3 @@
+Hover tests/src/A.res 4:7
+{"contents": "```rescript\nmodule JsLogger = {\n  let log: string => unit\n}\n```"}
+

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

@@ -28,3 +28,6 @@ Hover tests/src/Hover.res 41:13
 Hover tests/src/Hover.res 44:10
 {"contents": "```rescript\nint\n```"}
 
+Hover tests/src/Hover.res 51:7
+{"contents": "```rescript\nmodule JsLogger = {\n  let log: string => unit\n}\n```"}
+