Local completions (#217)

* implement completions for local bindings

* fix tests

* update ref

Author: aviatesk

src/Debugger.jl

@@ -11,10 +11,10 @@ using REPL.LineEdit
 using REPL.REPLCompletions
 
 using CodeTracking
-using JuliaInterpreter: JuliaInterpreter, Frame, @lookup, FrameCode, BreakpointRef, debug_command, leaf, root, BreakpointState, 
+using JuliaInterpreter: JuliaInterpreter, Frame, @lookup, FrameCode, BreakpointRef, debug_command, leaf, root, BreakpointState,
                         finish_and_return!, Compiled
 
-using JuliaInterpreter: pc_expr, moduleof, linenumber, extract_args,
+using JuliaInterpreter: pc_expr, moduleof, linenumber, extract_args, locals,
                         root, caller, whereis, get_return, nstatements, getargs
 
 const SEARCH_PATH = []

src/repl.jl

@@ -220,14 +220,28 @@ end
 function LineEdit.complete_line(c::DebugCompletionProvider, s)
     partial = REPL.beforecursor(s.input_buffer)
     full = LineEdit.input_string(s)
-    ret, range, should_complete = completions(c, full, lastindex(partial))
-    return unique!(map(REPLCompletions.completion_text, ret)), partial[range], should_complete
+
+    ret, range, should_complete = completions(c, full, partial)
+    return ret, partial[range], should_complete
 end
 
 function completions(c::DebugCompletionProvider, full, partial)
-    mod = moduleof(c.state.frame)
-    ret, range, should_complete = REPLCompletions.completions(full, partial, mod)
+    frame = c.state.frame
+
+    # repl backend completions
+    comps, range, should_complete = REPLCompletions.completions(full, lastindex(partial), moduleof(frame))
+    ret = map(REPLCompletions.completion_text, comps) |> unique!
+
+    # local completions
+    vars = filter!(locals(frame)) do v
+        # ref: https://github.com/JuliaDebug/JuliaInterpreter.jl/blob/master/src/utils.jl#L365-L370
+        if v.name == Symbol("#self") && (v.value isa Type || sizeof(v.value) == 0)
+            return false
+        else
+            return startswith(string(v.name), partial)
+        end
+    end |> vars -> map(v -> string(v.name), vars)
+    pushfirst!(ret, vars...)
 
-    # TODO Add local variable completions
-    return ret, range, should_complete
+    ret, range, should_complete
 end

test/ui.jl

@@ -169,21 +169,20 @@ end
 end
 
 # Completions
-function test_complete(c, s)
-    c, r, s = Debugger.completions(c, s, lastindex(s))
-    return unique!(map(REPL.REPLCompletions.completion_text, c)), r, s
-end
+test_complete(c, s) = Debugger.completions(c, s, s)
 
 module F
     local_var = 1
-    f(x) = x
+    f(f_args) = f_args
 end
 
 @testset "REPL completions" begin
     frame = JuliaInterpreter.enter_call_expr(:($(F.f)(1)))
     state = dummy_state(frame)
     prov = Debugger.DebugCompletionProvider(state)
 
-    c, r = test_complete(prov, "local")
+    c, _ = test_complete(prov, "local")
     @test "local_var" in c
+    c, _ = test_complete(prov, "f_")
+    @test "f_args" in c
 end