Skip to content

Commit 6a11330

Browse files
committed
More debug cleanup.
1 parent c37c5df commit 6a11330

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

analysis/src/References.ml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,9 @@ let alternateDeclared ~(file : File.t) ~package declared tip =
190190
match Hashtbl.find_opt package.pathsForModule file.moduleName with
191191
| None -> None
192192
| Some paths -> (
193-
maybeLog ("paths for " ^ file.moduleName);
194193
match paths with
195194
| IntfAndImpl {resi; res} -> (
196-
maybeLog "Have both!!";
195+
maybeLog ("alternateDeclared for " ^ file.moduleName ^ " has both resi and res");
197196
let alternateUri = if Uri2.isInterface file.uri then res else resi in
198197
match Cmt.fromUri ~uri:(Uri2.fromPath alternateUri) with
199198
| None -> None
@@ -204,7 +203,10 @@ let alternateDeclared ~(file : File.t) ~package declared tip =
204203
with
205204
| None -> None
206205
| Some declared -> Some (file, extra, declared)))
207-
| _ -> None)
206+
| _ ->
207+
maybeLog ("alternateDeclared for " ^ file.moduleName ^ " not found");
208+
209+
None)
208210

209211
let rec resolveModuleReference ?(pathsSeen = []) ~file ~package
210212
(declared : moduleKind declared) =
@@ -307,15 +309,18 @@ let definition ~file ~package stamp tip =
307309
let definitionForLocItem ~full:{file; package} locItem =
308310
match locItem.locType with
309311
| Typed (_, _, Definition (stamp, tip)) -> (
310-
maybeLog "Trying to find a defintion for a definition";
312+
maybeLog
313+
("Typed Definition stamp:" ^ string_of_int stamp ^ " tip:"
314+
^ tipToString tip);
311315
match declaredForTip ~stamps:file.stamps stamp tip with
312316
| None -> None
313317
| Some declared ->
314-
maybeLog "Declared";
318+
maybeLog ("Declared " ^ declared.name.txt);
315319
if declared.isExported then (
316320
maybeLog ("exported, looking for alternate " ^ file.moduleName);
317321
match alternateDeclared ~package ~file declared tip with
318-
| None -> None
322+
| None ->
323+
None
319324
| Some (file, _extra, declared) ->
320325
let loc = validateLoc declared.name.loc declared.extentLoc in
321326
Some (file.uri, loc))

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Dependency dirs: tests/node_modules/@rescript/react/lib/bs/./src tests/node_modu
2727
Opens from bsconfig:
2828
locItems:
2929
0:4-0:5 Typed m (Belt.List.t<'a>, 'a => 'b) => Belt.List.t<'b> (Definition Value)
30-
[ref] Trying to find a defintion for a definition
31-
[ref] Declared
30+
[ref] Typed Definition stamp:1002 tip:Value
31+
[ref] Declared m
3232
[ref] exported, looking for alternate Debug
33-
[ref] paths for Debug
33+
[ref] alternateDeclared for Debug not found
3434
null
3535

0 commit comments

Comments
 (0)