From 70e34b18572c0edd97f5f31aaf3aac90e06f5eaa Mon Sep 17 00:00:00 2001
From: tompng <tomoyapenguin@gmail.com>
Date: Sun, 9 Jul 2023 04:13:08 +0900
Subject: [PATCH] Always set standard CSI keybindings

---
 lib/reline/ansi.rb | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
index 1e018d4e82..6587a507e6 100644
--- a/lib/reline/ansi.rb
+++ b/lib/reline/ansi.rb
@@ -14,10 +14,15 @@ class Reline::ANSI
     'kcud1' => :ed_next_history,
     'kcuf1' => :ed_next_char,
     'kcub1' => :ed_prev_char,
-    'cuu' => :ed_prev_history,
-    'cud' => :ed_next_history,
-    'cuf' => :ed_next_char,
-    'cub' => :ed_prev_char,
+  }
+
+  CSI_STANDARD_KEY_BINDINGS = {
+    "\e[A" => :ed_prev_history,
+    "\e[B" => :ed_next_history,
+    "\e[C" => :ed_next_char,
+    "\e[D" => :ed_prev_char,
+    "\e[F" => :ed_move_to_end,
+    "\e[H" => :ed_move_to_beg,
   }
 
   if Reline::Terminfo.enabled?
@@ -33,6 +38,7 @@ def self.win?
   end
 
   def self.set_default_key_bindings(config, allow_terminfo: true)
+    set_default_key_bindings_csi_standard(config)
     if allow_terminfo && Reline::Terminfo.enabled?
       set_default_key_bindings_terminfo(config)
     else
@@ -64,18 +70,20 @@ def self.set_default_key_bindings(config, allow_terminfo: true)
     end
   end
 
+  def self.set_default_key_bindings_csi_standard(config)
+    CSI_STANDARD_KEY_BINDINGS.each_pair do |seq, func|
+      key = seq.bytes
+      config.add_default_key_binding_by_keymap(:emacs, key, func)
+      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
+      config.add_default_key_binding_by_keymap(:vi_command, key, func)
+    end
+  end
+
   def self.set_default_key_bindings_terminfo(config)
     key_bindings = CAPNAME_KEY_BINDINGS.map do |capname, key_binding|
       begin
         key_code = Reline::Terminfo.tigetstr(capname)
-        case capname
-        # Escape sequences that omit the move distance and are set to defaults
-        # value 1 may be sometimes sent by pressing the arrow-key.
-        when 'cuu', 'cud', 'cuf', 'cub'
-          [ key_code.sub(/%p1%d/, '').bytes, key_binding ]
-        else
-          [ key_code.bytes, key_binding ]
-        end
+        [ key_code.bytes, key_binding ]
       rescue Reline::Terminfo::TerminfoError
         # capname is undefined
       end