[前][次][番号順一覧][スレッド一覧]

ruby-changes:68091

From: Nobuyoshi <ko1@a...>
Date: Thu, 23 Sep 2021 18:01:52 +0900 (JST)
Subject: [ruby-changes:68091] ede95f541b (master): [ruby/irb] Ignore any encoding errors while symbol completion

https://git.ruby-lang.org/ruby.git/commit/?id=ede95f541b

From ede95f541b15d8f95db0215716e005b989a1e7d5 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 23 Sep 2021 16:28:28 +0900
Subject: [ruby/irb] Ignore any encoding errors while symbol completion

https://github.com/ruby/irb/commit/daa65cded1
---
 lib/irb/completion.rb       | 2 +-
 test/irb/test_completion.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index e35fe2a..58328c2 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -192,7 +192,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/completion.rb#L192
         sym = $1
         candidates = Symbol.all_symbols.collect do |s|
           ":" + s.id2name.encode(Encoding.default_external)
-        rescue Encoding::UndefinedConversionError
+        rescue EncodingError
           # ignore
         rescue Encoding::InvalidByteSequenceError => e
           raise "Invalid byte sequence #{s.id2name.bytes.inspect} #{e.inspect}"
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
index d94c471..a1aa4b8 100644
--- a/test/irb/test_completion.rb
+++ b/test/irb/test_completion.rb
@@ -27,6 +27,10 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_completion.rb#L27
     end
 
     def test_complete_symbol
+      %w"UTF-16LE UTF-7".each do |enc|
+        "K".force_encoding(enc).to_sym
+      rescue
+      end
       _ = :aiueo
       assert_include(IRB::InputCompletor.retrieve_completion_data(":a", bind: binding), ":aiueo")
       assert_empty(IRB::InputCompletor.retrieve_completion_data(":irb_unknown_symbol_abcdefg", bind: binding))
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]