inline evlauation during debugging

Author: aviatesk

src/debugger/debugger.jl

@@ -14,6 +14,7 @@ using ..Atom, MacroTools, Lazy, Hiccup
 
 include("breakpoints.jl")
 include("stepper.jl")
+include("eval.jl")
 include("repl.jl")
 include("workspace.jl")
 include("datatip.jl")

src/debugger/eval.jl

@@ -0,0 +1,28 @@
+using Atom: undefined
+
+function interpret(code::AbstractString, state::DebuggerState = STATE)
+  state.frame === nothing && return
+  eval_code(active_frame(state), code)
+end
+
+# if returned value is `Atom.undefined`, this means `code` shouldn't be evaluated within this frame
+function interpret_string(code, path, line, state::DebuggerState = STATE)
+  # frame validation
+  state.frame === nothing && return undefined
+
+  frame = state.frame
+  scope = frame.framecode.scope
+
+  # only work for methods
+  scope isa Module && return undefined
+
+  # path identity check
+  path ≠ fullpath(getfile(frame)) && return undefined
+
+  # line number check
+  defstr, startline = definition(String, scope)
+  endline = startline + sum(c === '\n' for c in defstr)
+  startline <= line <= endline || return undefined
+
+  return interpret(code, state)
+end

src/debugger/repl.jl

@@ -87,9 +87,3 @@ function LineEdit.complete_line(c::JunoDebuggerRPELCompletionProvider, s, state:
 
   return ret, partial[range], should_complete
 end
-
-# Evaluation
-function interpret(code::AbstractString, state::DebuggerState = STATE)
-  state.frame === nothing && return
-  eval_code(active_frame(state), code)
-end

src/eval.jl

@@ -31,7 +31,11 @@ function evalshow(text, line, path, mod)
     result = hideprompt() do
       with_logger(JunoProgressLogger()) do
         withpath(path) do
-          res = @errs include_string(mod, text, path, line)
+          res = @errs if isdebugging() && (_res = JunoDebugger.interpret_string(text, path, line)) !== undefined
+            _res
+          else
+            include_string(mod, text, path, line)
+          end
 
           if res isa EvalError
               Base.showerror(IOContext(stderr, :limit => true), res)
@@ -71,7 +75,11 @@ function eval(text, line, path, mod, errorinrepl = false)
     result = hideprompt() do
       with_logger(JunoProgressLogger()) do
         withpath(path) do
-          res = @errs include_string(mod, text, path, line)
+          res = @errs if isdebugging() && (_res = JunoDebugger.interpret_string(text, path, line)) !== undefined
+            _res
+          else
+            include_string(mod, text, path, line)
+          end
           if errorinrepl && res isa EvalError
             try
               Base.showerror(IOContext(stderr, :limit => true), res)