Bind yank-pop correctly

ruby · Dec 18, 2020 · 3c74bea · 3c74bea
1 parent e6dbcb3
commit 3c74bea
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/lib/reline/key_actor/emacs.rb b/lib/reline/key_actor/emacs.rb
@@ -307,7 +307,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     # 152 M-^X
     :ed_unassigned,
     # 153 M-^Y
-    :ed_unassigned,
+    :em_yank_pop,
     # 154 M-^Z
     :ed_unassigned,
     # 155 M-^[

diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
@@ -1991,6 +1991,7 @@ def finish
       @byte_pointer += yanked.bytesize
     end
   end
+  alias_method :yank, :em_yank
 
   private def em_yank_pop(key)
     yanked, prev_yank = @kill_ring.yank_pop
@@ -2007,6 +2008,7 @@ def finish
       @byte_pointer += yanked.bytesize
     end
   end
+  alias_method :yank_pop, :em_yank_pop
 
   private def ed_clear_screen(key)
     @cleared = true

diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
@@ -2167,6 +2167,24 @@ def test_ed_insert_for_include_valiation_selector
     end
   end
 
+  def test_em_yank_pop
+    input_keys("def hoge\C-w\C-b\C-f\C-w", false)
+    assert_byte_pointer_size('')
+    assert_cursor(0)
+    assert_cursor_max(0)
+    assert_line('')
+    input_keys("\C-y", false)
+    assert_byte_pointer_size('def ')
+    assert_cursor(4)
+    assert_cursor_max(4)
+    assert_line('def ')
+    input_keys("\M-\C-y", false)
+    assert_byte_pointer_size('hoge')
+    assert_cursor(4)
+    assert_cursor_max(4)
+    assert_line('hoge')
+  end
+
 =begin # TODO: move KeyStroke instance from Reline to LineEditor
   def test_key_delete
     input_keys('ab')