Merge pull request JuliaLang#7558 from mbauman/7551

Fix JuliaLang#7551
gloine · Jul 14, 2014 · 8ecbbab · 8ecbbab
2 parents 0160490 + 8f897cf
commit 8ecbbab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/base/REPL.jl b/base/REPL.jl
@@ -419,9 +419,13 @@ end
 function LineEdit.accept_result(s, p::LineEdit.HistoryPrompt{REPLHistoryProvider})
     parent = LineEdit.state(s, p).parent
     hist = p.hp
-    m = hist.mode_mapping[hist.modes[hist.cur_idx]]
-    LineEdit.replace_line(LineEdit.state(s, m), LineEdit.state(s, p).response_buffer)
-    LineEdit.transition(s, m)
+    if 1 <= hist.cur_idx <= length(hist.modes)
+        m = hist.mode_mapping[hist.modes[hist.cur_idx]]
+        LineEdit.replace_line(LineEdit.state(s, m), LineEdit.state(s, p).response_buffer)
+        LineEdit.transition(s, m)
+    else
+        LineEdit.transition(s, parent)
+    end
 end
 
 function history_prev(s::LineEdit.MIState, hist::REPLHistoryProvider,

diff --git a/test/repl.jl b/test/repl.jl
@@ -161,6 +161,16 @@ begin
     LineEdit.accept_result(s, histp)
     @test LineEdit.mode(s) == shell_mode
     @test buffercontents(LineEdit.buffer(s)) == "ll"
+
+    # Issue #7551
+    # Enter search mode and try accepting an empty result
+    REPL.history_reset_state(hp)
+    LineEdit.edit_clear(s)
+    cur_mode = LineEdit.mode(s)
+    LineEdit.enter_search(s, histp, true)
+    LineEdit.accept_result(s, histp)
+    @test LineEdit.mode(s) == cur_mode
+    @test buffercontents(LineEdit.buffer(s)) == ""
 end
 
 ccall(:jl_exit_on_sigint, Void, (Cint,), 1)