Jump to definition: test jumping directly to the implementation.

When jumping to `Module.x` jump to `Module.res` instead of `Module.resi`.

But for `let x = ...` in `Module.res` still jump to `Module.resi`, and for `let x = ...` in `Module.resi` still jump to `Module.res`.

Author: cristianoc

analysis/src/References.ml

@@ -291,9 +291,16 @@ let definition ~file ~package stamp tip =
     match declaredForTip ~stamps:file.stamps stamp tip with
     | None -> None
     | Some declared ->
-      let loc = validateLoc declared.name.loc declared.extentLoc in
-      let env = QueryEnv.fromFile file in
-      let uri = ProcessCmt.getSourceUri ~env ~package declared.modulePath in
+      let fileImpl, declaredImpl =
+        match alternateDeclared ~package ~file declared tip with
+        | Some (fileImpl, _extra, declaredImpl) when Uri2.isInterface file.uri
+          ->
+          (fileImpl, declaredImpl)
+        | _ -> (file, declared)
+      in
+      let loc = validateLoc declaredImpl.name.loc declaredImpl.extentLoc in
+      let env = QueryEnv.fromFile fileImpl in
+      let uri = ProcessCmt.getSourceUri ~env ~package declaredImpl.modulePath in
       maybeLog ("Inner uri " ^ Uri2.toString uri);
       Some (uri, loc))
 

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

@@ -85,5 +85,5 @@ TypeDefinition tests/src/Cross.res 28:5
 {"uri": "TypeDefinition.res", "range": {"start": {"line": 2, "character": 0}, "end": {"line": 2, "character": 28}}}
 
 Definition tests/src/Cross.res 31:32
-{"uri": "DefinitionWithInterface.resi", "range": {"start": {"line": 0, "character": 4}, "end": {"line": 0, "character": 5}}}
+{"uri": "DefinitionWithInterface.res", "range": {"start": {"line": 0, "character": 4}, "end": {"line": 0, "character": 5}}}