mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
99e7fa5b37
... and move things from core_ext.rb to base.rb.
This will confine CRuby-dependent things to ErrorHighlight.spot.
22d1dd7824
45 lines
1.2 KiB
Ruby
45 lines
1.2 KiB
Ruby
require_relative "formatter"
|
|
|
|
module ErrorHighlight
|
|
module CoreExt
|
|
private def generate_snippet
|
|
spot = ErrorHighlight.spot(self)
|
|
return "" unless spot
|
|
return ErrorHighlight.formatter.message_for(spot)
|
|
end
|
|
|
|
if Exception.method_defined?(:detailed_message)
|
|
def detailed_message(highlight: false, error_highlight: true, **)
|
|
return super unless error_highlight
|
|
snippet = generate_snippet
|
|
if highlight
|
|
snippet = snippet.gsub(/.+/) { "\e[1m" + $& + "\e[m" }
|
|
end
|
|
super + snippet
|
|
end
|
|
else
|
|
# This is a marker to let `DidYouMean::Correctable#original_message` skip
|
|
# the following method definition of `to_s`.
|
|
# See https://github.com/ruby/did_you_mean/pull/152
|
|
SKIP_TO_S_FOR_SUPER_LOOKUP = true
|
|
private_constant :SKIP_TO_S_FOR_SUPER_LOOKUP
|
|
|
|
def to_s
|
|
msg = super
|
|
snippet = generate_snippet
|
|
if snippet != "" && !msg.include?(snippet)
|
|
msg + snippet
|
|
else
|
|
msg
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
NameError.prepend(CoreExt)
|
|
|
|
# The extension for TypeError/ArgumentError is temporarily disabled due to many test failures
|
|
|
|
#TypeError.prepend(CoreExt)
|
|
#ArgumentError.prepend(CoreExt)
|
|
end
|