kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/irb] Do not colorize partially-correct inspect

Browse source 
This is to prevent a yellow-mixed output for ActiveSupport::TimeWithZone.

Follows up https://github.com/ruby/irb/pull/159 and https://github.com/ruby/ruby/pull/3967.

a5804c3560
This commit is contained in:
Takashi Kokubun 2020-12-28 23:20:26 -08:00
parent 9b7ceb6765
commit f30a3a0629
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/irb/color.rb
View file

@ -71,6 +71,9 @@ module IRB # :nodoc:
end
private_constant :TOKEN_SEQ_EXPRS
ERROR_TOKENS = TOKEN_SEQ_EXPRS.keys.select { |k| k.to_s.end_with?('error') }
private_constant :ERROR_TOKENS
class << self
def colorable?
$stdout.tty? && supported? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
@ -119,6 +122,11 @@ module IRB # :nodoc:
length = 0
scan(code, allow_last_error: !complete) do |token, str, expr|
# IRB::ColorPrinter skips colorizing fragments with any invalid token
if ignore_error && ERROR_TOKENS.include?(token)
return Reline::Unicode.escape_for_print(code)
end
in_symbol = symbol_state.scan_token(token)
str.each_line do |line|
line = Reline::Unicode.escape_for_print(line)
@ -188,7 +196,7 @@ module IRB # :nodoc:
end
def dispatch_seq(token, expr, str, in_symbol:, ignore_error:)
if token == :on_parse_error or token == :compile_error
if ERROR_TOKENS.include?(token)
ignore_error ? nil : TOKEN_SEQ_EXPRS[token][0]
elsif in_symbol
[YELLOW]