REPL: fix edit_yank_pop when require_previous_yank=false (JuliaLang#2…

…3635)
tpapp · Sep 9, 2017 · e16f4dc · e16f4dc
1 parent c173ae0
commit e16f4dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/base/repl/LineEdit.jl b/base/repl/LineEdit.jl
@@ -684,11 +684,12 @@ function edit_yank(s::MIState)
 end
 
 function edit_yank_pop(s::MIState, require_previous_yank=true)
- if require_previous_yank && !(s.last_action in [:edit_yank, :edit_yank_pop]) ||
-   isempty(s.kill_ring)
+ repeat = s.last_action ∈ (:edit_yank, :edit_yank_pop)
+ if require_previous_yank && !repeat || isempty(s.kill_ring)
  beep(terminal(s))
  :ignore
  else
+ require_previous_yank || repeat || setmark(s)
  push_undo(s)
  edit_splice!(s, s.kill_ring[mod1(s.kill_idx-=1, end)])
  refresh_line(s)

diff --git a/test/lineedit.jl b/test/lineedit.jl
@@ -617,6 +617,10 @@ end
  LineEdit.edit_kill_line(s)
  @test s.kill_ring[end] == "çhing"
  @test s.kill_idx == 3
+ # check that edit_yank_pop works when passing require_previous_yank=false (#23635)
+ s.last_action = :unknown
+ @test transform!(s->LineEdit.edit_yank_pop(s, false), s) == ("ça ≡ nothinga ≡ not", 19, 12)
+
  # repetition (concatenation of killed strings
  edit_insert(s, "A B C")
  LineEdit.edit_delete_prev_word(s)