ruby-changes:74065
From: st0012 <ko1@a...>
Date: Tue, 18 Oct 2022 06:15:04 +0900 (JST)
Subject: [ruby-changes:74065] 1c83469fc6 (master): [ruby/irb] Remove unnecessary coloring support check
https://git.ruby-lang.org/ruby.git/commit/?id=1c83469fc6 From 1c83469fc6e6bde8781e09ce2844231feed9b170 Mon Sep 17 00:00:00 2001 From: st0012 <stan001212@g...> Date: Fri, 7 Oct 2022 23:19:03 +0100 Subject: [ruby/irb] Remove unnecessary coloring support check https://github.com/ruby/irb/commit/ddd7dbe2c5 --- test/irb/test_color.rb | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb index 8de03a5e8e..34af4e2bea 100644 --- a/test/irb/test_color.rb +++ b/test/irb/test_color.rb @@ -140,23 +140,19 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_color.rb#L140 end tests.each do |code, result| - if colorize_code_supported? - assert_equal_with_term(result, code, complete: true) - assert_equal_with_term(result, code, complete: false) + assert_equal_with_term(result, code, complete: true) + assert_equal_with_term(result, code, complete: false) - assert_equal_with_term(code, code, complete: true, tty: false) - assert_equal_with_term(code, code, complete: false, tty: false) + assert_equal_with_term(code, code, complete: true, tty: false) + assert_equal_with_term(code, code, complete: false, tty: false) - assert_equal_with_term(code, code, complete: true, colorable: false) + assert_equal_with_term(code, code, complete: true, colorable: false) - assert_equal_with_term(code, code, complete: false, colorable: false) + assert_equal_with_term(code, code, complete: false, colorable: false) - assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) + assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) - assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) - else - assert_equal_with_term(code, code) - end + assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) end end @@ -186,26 +182,22 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_color.rb#L182 "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}bar#{CLEAR}", "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}", }.each do |code, result| - if colorize_code_supported? - assert_equal_with_term(result, code, complete: false) + assert_equal_with_term(result, code, complete: false) - assert_equal_with_term(code, code, complete: false, tty: false) + assert_equal_with_term(code, code, complete: false, tty: false) - assert_equal_with_term(code, code, complete: false, colorable: false) + assert_equal_with_term(code, code, complete: false, colorable: false) - assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) + assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) - unless complete_option_supported? - assert_equal_with_term(result, code, complete: true) + unless complete_option_supported? + assert_equal_with_term(result, code, complete: true) - assert_equal_with_term(code, code, complete: true, tty: false) + assert_equal_with_term(code, code, complete: true, tty: false) - assert_equal_with_term(code, code, complete: true, colorable: false) + assert_equal_with_term(code, code, complete: true, colorable: false) - assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) - end - else - assert_equal_with_term(code, code) + assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) end end end @@ -232,11 +224,6 @@ module TestIRB https://github.com/ruby/ruby/blob/trunk/test/irb/test_color.rb#L224 private - # `#colorize_code` is supported only for Ruby 2.5+. It just returns the original code in 2.4-. - def colorize_code_supported? - Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0') - end - # `complete: true` is the same as `complete: false` in Ruby 2.6- def complete_option_supported? Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0') -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/