work around problem with finding stdlib files (#146)

* work around problem with finding stdlib files
JuliaDebug · Mar 16, 2019 · c0a3c75 · c0a3c75
1 parent 351a081
commit c0a3c75
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/Manifest.toml b/Manifest.toml
@@ -4,10 +4,10 @@
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[CodeTracking]]
-deps = ["Test", "UUIDs"]
-git-tree-sha1 = "12aa4d41c7926afd7a71af5af603a4d8b94292c2"
+deps = ["InteractiveUtils", "Test", "UUIDs"]
+git-tree-sha1 = "983f5f7a57c604322917ab8bc5b86ba914d3c345"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
-version = "0.3.1"
+version = "0.3.2"
 
 [[Distributed]]
 deps = ["Random", "Serialization", "Sockets"]

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
@@ -4,10 +4,10 @@
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[CodeTracking]]
-deps = ["Test", "UUIDs"]
-git-tree-sha1 = "591b73b37c92ed7d55d3a14e266829c21aa3a7eb"
+deps = ["InteractiveUtils", "Test", "UUIDs"]
+git-tree-sha1 = "983f5f7a57c604322917ab8bc5b86ba914d3c345"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
-version = "0.3.0"
+version = "0.3.2"
 
 [[Dates]]
 deps = ["Printf"]
@@ -19,9 +19,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[DocStringExtensions]]
 deps = ["LibGit2", "Markdown", "Pkg", "Test"]
-git-tree-sha1 = "1df01539a1c952cef21f2d2d1c092c2bcf0177d7"
+git-tree-sha1 = "4d30e889c9f106a51ffa4791a88ffd4765bf20c3"
 uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.6.0"
+version = "0.7.0"
 
 [[Documenter]]
 deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "LibGit2", "Logging", "Markdown", "Pkg", "REPL", "Random", "Test", "Unicode"]

diff --git a/src/types.jl b/src/types.jl
@@ -187,7 +187,8 @@ function truncate!(frame)
 end
 
 function Base.show(io::IO, frame::Frame)
-    println(io, "Frame for ", scopeof(frame))
+    frame_loc = CodeTracking.replace_buildbot_stdlibpath(repr(scopeof(frame)))
+    println(io, "Frame for ", frame_loc)
     pc = frame.pc
     ns = nstatements(frame.framecode)
     range = get(io, :limit, false) ? (max(1, pc-2):min(ns, pc+2)) : (1:ns)

diff --git a/src/utils.jl b/src/utils.jl
@@ -155,7 +155,7 @@ function lineoffset(framecode::FrameCode)
 end
 
 getline(ln) = isexpr(ln, :line) ? ln.args[1] : ln.line
-getfile(ln) = String(isexpr(ln, :line) ? ln.args[2] : ln.file)
+getfile(ln) = CodeTracking.maybe_fixup_stdlib_path(String(isexpr(ln, :line) ? ln.args[2] : ln.file))
 
 """
     loc = whereis(frame, pc=frame.pc)

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -394,3 +394,10 @@ fr = JuliaInterpreter.enter_call(f)
 file, line = JuliaInterpreter.whereis(fr)
 @test file == @__FILE__
 @test line == (@__LINE__() - 4)
+
+# Test path to files in stdlib
+fr = JuliaInterpreter.enter_call(Test.eval, 1)
+file, line = JuliaInterpreter.whereis(fr)
+@test isfile(file)
+@test isfile(JuliaInterpreter.getfile(fr.framecode.src.linetable[1]))
+@test occursin(Sys.STDLIB, repr(fr))