diff options
| author | ima1zumi <[email protected]> | 2023-07-11 23:47:22 +0900 |
|---|---|---|
| committer | git <[email protected]> | 2023-07-11 14:47:26 +0000 |
| commit | 4be92463b6d2d0ce82b15db2c7260150e28c27db (patch) | |
| tree | 872a69598eb6ae624fe1fe312b429f2d04c3bc1a /lib/irb/input-method.rb | |
| parent | e770006486a84008e68d8ab0c01c4625f028a0de (diff) | |
[ruby/irb] Require Reline 0.3.6 or higher
(https://github.com/ruby/irb/pull/632)
* Require Reline 0.3.6 or higher
"Multi-line multibyte regular expression raises exception" (https://github.com/ruby/irb/issues/627) is fixed in Reline 0.3.6.
* Remove unnecessary conditional
Diffstat (limited to 'lib/irb/input-method.rb')
| -rw-r--r-- | lib/irb/input-method.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb index b5f32f1917..300aa1140d 100644 --- a/lib/irb/input-method.rb +++ b/lib/irb/input-method.rb @@ -268,9 +268,7 @@ module IRB @stdin = ::IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-") @stdout = ::IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-") - if Reline.respond_to?("basic_word_break_characters=") - Reline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS - end + Reline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS Reline.completion_append_character = nil Reline.completer_quote_characters = '' Reline.completion_proc = IRB::InputCompletor::CompletionProc @@ -399,7 +397,7 @@ module IRB mod_key = RUBY_PLATFORM.match?(/darwin/) ? "Option" : "Alt" message = "Press #{mod_key}+d to read the full document" contents = [message] + doc.accept(formatter).split("\n") - contents = contents.take(Reline.preferred_dialog_height) if Reline.respond_to?(:preferred_dialog_height) + contents = contents.take(Reline.preferred_dialog_height) y = cursor_pos_to_render.y Reline::DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49') @@ -456,11 +454,7 @@ module IRB def inspect config = Reline::Config.new str = "RelineInputMethod with Reline #{Reline::VERSION}" - if config.respond_to?(:inputrc_path) - inputrc_path = File.expand_path(config.inputrc_path) - else - inputrc_path = File.expand_path(ENV['INPUTRC'] || '~/.inputrc') - end + inputrc_path = File.expand_path(config.inputrc_path) str += " and #{inputrc_path}" if File.exist?(inputrc_path) str end |