fixes to breakpointing in next_line!

Author: KristofferC

src/interpret.jl

@@ -710,7 +710,7 @@ function next_line!(stack, frame, dbstack = nothing)
         # If this is a goto node, step it and reevaluate
         if isgotonode(expr)
             pc = _step_expr!(stack, frame, pc)
-            pc == nothing && return nothing
+            (pc == nothing || isa(pc, Breakpoint)) && return pc
         elseif dbstack !== nothing && iswrappercall(expr)
             # With splatting it can happen that we do something like ssa = tuple(#self#), _apply(ssa), which
             # confuses the logic here, just step into the first call that's not a builtin
@@ -727,15 +727,15 @@ function next_line!(stack, frame, dbstack = nothing)
                     break
                 else
                     pc = _step_expr!(stack, frame, pc)
-                    pc == nothing && return nothing
+                    (pc == nothing || isa(pc, Breakpoint)) && return pc
                 end
             end
         else
             pc = _step_expr!(stack, frame, pc)
-            pc == nothing && return nothing
+            (pc == nothing || isa(pc, Breakpoint)) && return pc
         end
         frame.pc[] = pc
-        shouldbreak(frame, pc) && break
+        shouldbreak(frame, pc) && return Breakpoint(frame.code, pc)
     end
     maybe_next_call!(stack, frame, pc)
 end

test/breakpoints.jl

@@ -48,4 +48,18 @@ end
     @test s_extractor(frame) == loop_radius2(7)
     Breakpoints.disable(bp)
     @test JuliaInterpreter.finish_stack!(stack) == loop_radius2(10)
+
+    # Next line with breakpoints
+    function outer(x)
+        inner(x)
+    end
+    function inner(x)
+        return 2
+    end
+    breakpoint(inner)
+    stack = JuliaStackFrame[]
+    frame = JuliaInterpreter.enter_call(outer, 2)
+    bp = JuliaInterpreter.next_line!(stack, frame)
+    @test isa(bp, Breakpoints.Breakpoint)
+    @test JuliaInterpreter.finish_stack!(stack) == 2
 end