Connect nested modules of an applied functor to their declarations

Codex review on #9084: uses of a module path such as `M.Nested` were
recorded only under the renamed stamp. They are now also recorded under
the original, like value uses. The originals are taken from the functor's
result signature: when the argument is a path, the application's
signature was already renamed by the compiler and doesn't carry the
body's stamps.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kbf3gLMawVgtmiKy3TMBc3
Claude-Session: https://claude.ai/code/session_01Kr4cjoUi2f5VpMvE6wT9bo
Signed-off-by: Christoph Knittel <ck@cca.io>

Author: cknitt

analysis/src/process_cmt.ml

@@ -719,7 +719,15 @@ and for_module ~env (mod_expr : Typedtree.module_expr) module_name =
     if Ident.current_time () < renamed_stamp_floor then
       Ident.set_current_time renamed_stamp_floor;
     let renamed = Subst.modtype Subst.identity mod_expr.mod_type in
-    record_renamed_stamps env.renamed_stamps mod_expr.mod_type renamed;
+    (* The functor's result signature has the identifiers of the body's
+       declarations; the application's has them only when the argument is
+       not a path, else the compiler already renamed them. *)
+    let functor_result =
+      match functor_.mod_type with
+      | Mty_functor (_, _, result) -> result
+      | mty -> mty
+    in
+    record_renamed_stamps env.renamed_stamps functor_result renamed;
     for_type_module ~name:module_name ~env renamed
   | Tmod_unpack (_expr, module_type) ->
     let env = env |> Env.add_module ~name:module_name in

analysis/src/process_extra.ml

@@ -176,7 +176,7 @@ let add_for_path_parent ~env ~extra path loc =
       add_file_reference ~extra module_name loc;
       TopLevelModule module_name
     | Stamp stamp ->
-      add_reference ~extra stamp loc;
+      add_reference_with_original ~env ~extra stamp loc;
       LModule (LocalReference (stamp, Module))
     | NotFound -> LModule NotFound
     | Global (module_name, path) ->
@@ -185,7 +185,7 @@ let add_for_path_parent ~env ~extra path loc =
     | Exported (env, name) -> (
       match Exported.find env.exported Exported.Module name with
       | Some stamp ->
-        add_reference ~extra stamp loc;
+        add_reference_with_original ~env ~extra stamp loc;
         LModule (LocalReference (stamp, Module))
       | None -> LModule NotFound)
   in

tests/analysis_tests/tests/src/AppliedFunctor.res

@@ -28,3 +28,20 @@ let t: IntSet.t = []
 
 // let s2 = IntSet.
 //                 ^com
+
+module WithNested = (O: Ord) => {
+  module Nested = {
+    //     ^ref
+    let value = 1
+  }
+}
+
+module IntOrd = {
+  type t = int
+  let compare = (a: int, b) => a - b
+}
+
+module N = WithNested(IntOrd)
+
+let n = N.Nested.value
+//        ^ref

tests/analysis_tests/tests/src/expected/AppliedFunctor.res.txt

@@ -132,3 +132,39 @@ Path IntSet.
   }
 ]
 
+References src/AppliedFunctor.res 32:11
+[
+  {
+    "range": {
+      "end": { "character": 15, "line": 32 },
+      "start": { "character": 9, "line": 32 }
+    },
+    "uri": "file:///AppliedFunctor.res"
+  },
+  {
+    "range": {
+      "end": { "character": 16, "line": 45 },
+      "start": { "character": 10, "line": 45 }
+    },
+    "uri": "file:///AppliedFunctor.res"
+  }
+]
+
+References src/AppliedFunctor.res 45:10
+[
+  {
+    "range": {
+      "end": { "character": 15, "line": 32 },
+      "start": { "character": 9, "line": 32 }
+    },
+    "uri": "file:///AppliedFunctor.res"
+  },
+  {
+    "range": {
+      "end": { "character": 16, "line": 45 },
+      "start": { "character": 10, "line": 45 }
+    },
+    "uri": "file:///AppliedFunctor.res"
+  }
+]
+