fix line info printing in bt (#124)

Author: KristofferC

src/commands.jl

@@ -54,7 +54,7 @@ function execute_command(state::DebuggerState, ::Val{:bt}, cmd)
     frame = state.frame
     while frame !== nothing
         num += 1
-        print_frame(Base.pipe_writer(state.terminal), num, frame)
+        print_frame(Base.pipe_writer(state.terminal), num, frame; current_line=true)
         frame = caller(frame)
     end
     println()

src/locationinfo.jl

@@ -65,18 +65,20 @@ end
 # Used for the tests
 const _print_full_path = Ref(true)
 
-function locdesc(frame::Frame)
+function locdesc(frame::Frame; current_line=false)
     sprint() do io
         if frame.framecode.scope isa Method
-            locdesc(io, frame.framecode)
+            locdesc(io, frame; current_line=current_line)
         else
             println(io, "not yet implemented")
         end
     end
 end
 
-function locdesc(io, framecode::FrameCode)
+function locdesc(io, frame::Frame; current_line=false)
+    framecode = frame.framecode
     meth = framecode.scope
+    @assert meth isa Method
     argnames = framecode.src.slotnames[2:meth.nargs]
     spectypes = Any[Any for i=1:length(argnames)]
     print(io, meth.name,'(')
@@ -87,7 +89,8 @@ function locdesc(io, framecode::FrameCode)
         print(io, argname)
         !(argT === Any) && print(io, "::", argT)
     end
-    path = _print_full_path[] ? meth.file : string(basename(String(meth.file)), ":", meth.line)
+    line = current_line ? JuliaInterpreter.linenumber(frame) : meth.line
+    path = string(_print_full_path[] ? meth.file : basename(String(meth.file)), ":", line)
     path = CodeTracking.replace_buildbot_stdlibpath(String(path))
     print(io, ") at ", path)
 end

src/printing.jl

@@ -19,8 +19,6 @@ function print_var(io::IO, var::JuliaInterpreter.Variable)
     println(io, highlight_code(string(var.name, "::", T, " = ", val); context=io))
 end
 
-print_locdesc(io::IO, frame::Frame) = println(io, locdesc(frame))
-
 function print_locals(io::IO, frame::Frame)
     vars = JuliaInterpreter.locals(frame)
     for var in vars
@@ -30,9 +28,9 @@ function print_locals(io::IO, frame::Frame)
     end
 end
 
-function print_frame(io::IO, num::Integer, frame::Frame)
+function print_frame(io::IO, num::Integer, frame::Frame; current_line=false)
     print(io, "[$num] ")
-    print_locdesc(io, frame)
+    println(io, locdesc(frame; current_line=current_line))
     print_locals(io, frame)
 end
 

test/ui/history_gcd.multiout

@@ -1471,7 +1471,7 @@
 |  | x::Int64 = 20
 |  | y::Int64 = 0
 |  | T::DataType = Int64
-|[2] my_gcd(a, b) at ui.jl:5
+|[2] my_gcd(a, b) at ui.jl:6
 |  | a::Int64 = 10
 |  | b::Int64 = 20
 |  | T::DataType = Int64
@@ -1631,7 +1631,7 @@
 |  | x::Int64 = 20
 |  | y::Int64 = 0
 |  | T::DataType = Int64
-|[2] my_gcd(a, b) at ui.jl:5
+|[2] my_gcd(a, b) at ui.jl:6
 |  | a::Int64 = 10
 |  | b::Int64 = 20
 |  | T::DataType = Int64
@@ -1801,7 +1801,7 @@
 |  | x::Int64 = 20
 |  | y::Int64 = 0
 |  | T::DataType = Int64
-|[2] my_gcd(a, b) at ui.jl:5
+|[2] my_gcd(a, b) at ui.jl:6
 |  | a::Int64 = 10
 |  | b::Int64 = 20
 |  | T::DataType = Int64
@@ -1971,7 +1971,7 @@
 |  | x::Int64 = 20
 |  | y::Int64 = 0
 |  | T::DataType = Int64
-|[2] my_gcd(a, b) at ui.jl:5
+|[2] my_gcd(a, b) at ui.jl:6
 |  | a::Int64 = 10
 |  | b::Int64 = 20
 |  | T::DataType = Int64
@@ -2169,7 +2169,7 @@
 |  | x::Int64 = 20
 |  | y::Int64 = 0
 |  | T::DataType = Int64
-|[2] my_gcd(a, b) at ui.jl:5
+|[2] my_gcd(a, b) at ui.jl:6
 |  | a::Int64 = 10
 |  | b::Int64 = 20
 |  | T::DataType = Int64