Merge pull request #43 from oxinabox/ox/breadcrumbs

Fix breadcrumbs

src/break_action.jl

@@ -16,8 +16,7 @@ end
 
 function breadcrumbs(meth, statement_ind)
    printstyled("\nBreakpoint Hit: "; color=:blue)
-   printstyled(string(meth); color=:light_blue)
-   #TODO: Translate the statement_ind into a line number
+   printstyled(string(meth, "\n"); color=:light_blue)
    line_num = statement_ind2src_linenum(meth, statement_ind)
    breadcrumbs(string(meth.file), line_num)
    println()
@@ -31,7 +30,7 @@ function breadcrumbs(io, file::AbstractString, line_num; nbefore=2, nafter=2)
    @assert(nbefore >= 0)
    @assert(nafter >= 0)
 
-   all_lines = readlines(file)
+   all_lines = loc_for_file(file)
    first_line_num = max(1, line_num - nbefore)
    last_line_num = min(length(all_lines), line_num + nafter)
 

src/inner_repl.jl

@@ -42,8 +42,8 @@ function eval_and_display(code_ast, eval_module)
     catch err
         printstyled("ERROR: ", color=:red)
         showerror(stdout, err)
-        println()
     end
+    println()
 end
 
 

src/locate.jl

@@ -140,3 +140,27 @@ function before_body_linenum(ir)
     first_lineinfo = ir.linetable[first(ir.codelocs)]
     return first_lineinfo.line - 1
 end
+
+######################################################
+
+"""
+    loc_for_file(file)
+Returns a vector of lines of code for the file.
+This special cases the name `"REPL[\\d]"`, as being REPL history
+and so returns that REPL history cell instead.
+If for some reason the file can not be found,
+this returns a vector with a single line and a message explaining as such.
+"""
+function loc_for_file(file::AbstractString)
+    if isfile(file)
+        return readlines(file)
+    elseif startswith(file, "REPL[") && isdefined(Base, :active_repl)
+        # extract the number from "REPL[123]"
+        hist_idx = parse(Int,string(file)[6:end-1])
+        hist = Base.active_repl.interface.modes[1].hist
+        source_code = hist.history[hist.start_idx+hist_idx]
+        return split(source_code, "\n")
+    else
+        return ["-- source for $file not found --"]
+    end
+end

test/test_locate.jl

@@ -5,7 +5,8 @@ using Test
 using MagneticReadHead:
     source_paths,
     containing_methods,
-    src_line2ir_statement_ind
+    src_line2ir_statement_ind,
+    loc_for_file
 
 @testset "src_line2ir_statement_ind" begin
     ir1line = first(methods(()->1)) |> Base.uncompressed_ast
@@ -46,3 +47,13 @@ end
         end
     end
 end
+
+@testset "loc_for_file" begin
+    failoutput = loc_for_file("NOT REAL")
+    @test failoutput isa Vector{String}
+    @test length(failoutput)==1
+
+    output = loc_for_file(@__FILE__)
+    @test output isa Vector{String}
+    @test length(output) > 1
+end