Merge pull request #280 from jethrodaniel/chr-encoding-issue

ensure reline's encoding is used when reading inputrc character values
ruby · Apr 20, 2021 · e4ac748 · e4ac748
2 parents 76c8637 + cf372fc
commit e4ac748
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/reline/config.rb b/lib/reline/config.rb
@@ -291,11 +291,8 @@ def bind_variable(name, value)
   end
 
   def retrieve_string(str)
-    if str =~ /\A"(.*)"\z/
-      parse_keyseq($1).map(&:chr).join
-    else
-      parse_keyseq(str).map(&:chr).join
-    end
+    str = $1 if str =~ /\A"(.*)"\z/
+    parse_keyseq(str).map { |c| c.chr(Reline::IOGate.encoding) }.join
   end
 
   def bind_key(key, func_name)

diff --git a/test/reline/test_config.rb b/test/reline/test_config.rb
@@ -286,6 +286,16 @@ def test_inputrc
     ENV['INPUTRC'] = inputrc_backup
   end
 
+  def test_inputrc_with_utf
+    @config.read_lines(<<~'LINES'.lines)
+      set editing-mode vi
+      set vi-cmd-mode-string 🍸
+      set vi-ins-mode-string 🍶
+    LINES
+    assert_equal @config.vi_cmd_mode_string, "🍸"
+    assert_equal @config.vi_ins_mode_string, "🍶"
+  end
+
   def test_xdg_config_home
     home_backup = ENV['HOME']
     xdg_config_home_backup = ENV['XDG_CONFIG_HOME']