Fix file we look for source code in (#73)

* fix looking up the source file

Author: KristofferC

Manifest.toml

@@ -4,30 +4,25 @@
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[CodeTracking]]
-deps = ["Test", "UUIDs"]
-git-tree-sha1 = "12aa4d41c7926afd7a71af5af603a4d8b94292c2"
+deps = ["InteractiveUtils", "UUIDs"]
+git-tree-sha1 = "983f5f7a57c604322917ab8bc5b86ba914d3c345"
+repo-rev = "master"
+repo-url = "https://github.com/timholy/CodeTracking.jl.git"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
-version = "0.3.1"
-
-[[Distributed]]
-deps = ["Random", "Serialization", "Sockets"]
-uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+version = "0.3.2"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[JuliaInterpreter]]
 deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"]
-git-tree-sha1 = "1057b64c82d57a1b87667995eac5809e15229f4f"
-repo-rev = "master"
+git-tree-sha1 = "96efbbccc646c629601c1ecd2ef855a85fb3f499"
+repo-rev = "b76bc3d3d36a0359ab08db511896fe17645af9fb"
 repo-url = "https://github.com/JuliaDebug/JuliaInterpreter.jl"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
 version = "0.1.1"
 
-[[Logging]]
-uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
-
 [[Markdown]]
 deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
@@ -49,10 +44,6 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 [[Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
-[[Test]]
-deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
-uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
 [[UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

Project.toml

@@ -4,6 +4,7 @@ authors = ["Kristoffer Carlsson <[email protected]>"]
 version = "0.1.0"
 
 [deps]
+CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
 JuliaInterpreter = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

src/locationinfo.jl

@@ -35,9 +35,12 @@ end
 function locinfo(frame::Frame)
     if frame.framecode.scope isa Method
         meth = frame.framecode.scope
-        file, def_line = JuliaInterpreter.whereis(meth)
-        _, current_line = JuliaInterpreter.whereis(frame)
-        return loc_for_fname(file, current_line, def_line)
+        def_file, def_line = JuliaInterpreter.whereis(meth)
+        current_file, current_line = JuliaInterpreter.whereis(frame)
+        if def_file != current_file || def_line > current_line
+            def_line = 0 # We are not sure where the context start in cases like these, could be improved?
+        end
+        return loc_for_fname(current_file, current_line, def_line)
     else
         println("not yet implemented")
     end

test/misc.jl

@@ -45,6 +45,16 @@ execute_command(state, Val{:so}(), "c")
 
 @inline fnothing(x) = 1
 frame = @make_frame fnothing(0)
-io = IOBuffer()
-Debugger.print_next_expr(io, frame)
-@test chomp(String(take!(io))) == "About to run: return 1"
+@test chomp(sprint(Debugger.print_next_expr, frame)) == "About to run: return 1"
+
+function f()
+    x = 1 + 1
+    @info "hello"
+end
+# https://github.com/JuliaDebug/Debugger.jl/issues/71
+frame = Debugger.@make_frame f()
+state = dummy_state(frame)
+execute_command(state, Val{:n}(), "n")
+loc = Debugger.locinfo(state.frame)
+@test isfile(loc.filepath)
+@test occursin("logging.jl", loc.filepath)