RFC: step through kwprep in next_line (#195)

* step through kwprep in next_line

* put back next return

Author: KristofferC

src/commands.jl

@@ -216,6 +216,7 @@ function next_line!(@nospecialize(recurse), frame::Frame, istoplevel::Bool=false
         end
         shouldbreak(frame, pc) && return BreakpointRef(frame.framecode, pc)
     end
+    maybe_step_through_kwprep!(recurse, frame, istoplevel)
     maybe_next_call!(recurse, frame, istoplevel)
 end
 next_line!(frame::Frame, istoplevel::Bool=false) = next_line!(finish_and_return!, frame, istoplevel)
@@ -401,7 +402,7 @@ function debug_command(@nospecialize(recurse), frame::Frame, cmd::Symbol, rootis
     end
     try
         cmd == :nc && return nicereturn!(recurse, frame, next_call!(recurse, frame, istoplevel), rootistoplevel)
-        cmd == :n && return nicereturn!(recurse, frame, next_line!(recurse, frame, istoplevel), rootistoplevel)
+        cmd == :n && return maybe_reset_frame!(recurse, frame, next_line!(recurse, frame, istoplevel), rootistoplevel)
         cmd == :se && return maybe_reset_frame!(recurse, frame, step_expr!(recurse, frame, istoplevel), rootistoplevel)
 
         enter_generated = false

test/debug.jl

@@ -386,4 +386,16 @@ struct B{T} end
         frame = stepkw!(frame)
         @test frame.pc == JuliaInterpreter.nstatements(frame.framecode) - 1
     end
+
+    function f(x, y)
+        sin(2.0)
+        g(x; y = 3)
+    end
+    g(x; y) = x + y
+    @testset "interaction of :n with kw functions" begin
+        frame = JuliaInterpreter.enter_call(f, 2, 3) # at sin
+        frame, pc = debug_command(frame, :n)
+        # Check that we are at the kw call to g
+        @test Core.kwfunc(g) == JuliaInterpreter.@lookup frame JuliaInterpreter.pc_expr(frame).args[1]
+    end
 # end