Fix default and additional key bindings vanish bug

lib/reline.rb

@@ -340,7 +340,6 @@ def readline(prompt = '', add_hist = false)
 
       unless config.test_mode or config.loaded?
         config.read
-        config.reset_default_key_bindings
         io_gate.set_default_key_bindings(config)
       end
 

lib/reline/config.rb

@@ -76,11 +76,7 @@ def reset
     if editing_mode_is?(:vi_command)
       @editing_mode_label = :vi_insert
     end
-    @additional_key_bindings.keys.each do |key|
-      @additional_key_bindings[key].clear
-    end
     @oneshot_key_bindings.clear
-    reset_default_key_bindings
   end
 
   def editing_mode
@@ -134,6 +130,7 @@ def inputrc_path
   end
 
   def read(file = nil)
+    @loaded = true
     file ||= default_inputrc_path
     begin
       if file.respond_to?(:readlines)
@@ -146,7 +143,6 @@ def read(file = nil)
     end
 
     read_lines(lines, file)
-    @loaded = true
     self
   rescue InvalidInputrc => e
     warn e.message
@@ -177,12 +173,6 @@ def add_default_key_binding(keystroke, target)
     @key_actors[@keymap_label].default_key_bindings[keystroke] = target
   end
 
-  def reset_default_key_bindings
-    @key_actors.values.each do |ka|
-      ka.reset_default_key_bindings
-    end
-  end
-
   def read_lines(lines, file = nil)
     if not lines.empty? and lines.first.encoding != Reline.encoding_system_needs
       begin

lib/reline/key_actor/base.rb

@@ -12,8 +12,4 @@ def initialize
   def default_key_bindings
     @default_key_bindings
   end
-
-  def reset_default_key_bindings
-    @default_key_bindings.clear
-  end
 end

test/reline/test_config.rb

@@ -417,6 +417,18 @@ def test_additional_key_bindings_for_auxiliary_emacs_keymaps
     assert_equal expected, @config.key_bindings
   end
 
+  def test_key_bindings_with_reset
+    # @config.reset is called after each readline.
+    # inputrc file is read once, so key binding shouldn't be cleared by @config.reset
+    @config.add_default_key_binding('default'.bytes, 'DEFAULT'.bytes)
+    @config.read_lines(<<~'LINES'.lines)
+      "additional": "ADDITIONAL"
+    LINES
+    @config.reset
+    expected = { 'default'.bytes => 'DEFAULT'.bytes, 'additional'.bytes => 'ADDITIONAL'.bytes }
+    assert_equal expected, @config.key_bindings
+  end
+
   def test_history_size
     @config.read_lines(<<~LINES.lines)
       set history-size 5000

test/reline/test_within_pipe.rb

@@ -23,7 +23,6 @@ def teardown
     @reader.close
     @output_writer.close
     @config.reset
-    @config.reset_default_key_bindings
     Reline.test_reset
   end