diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-21 06:00:51 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-21 06:00:51 +0000 |
commit | 1c52a98fb9e24bf254b43b0d3495664e18575336 (patch) | |
tree | 899d09c1e446f4ce97497c4d5c51e63c48460d57 | |
parent | 2292ea6a8ff6347493f7dd8b2d9b57f13a49afdb (diff) |
merge revision(s) 61469: [Backport #14427]
irb.rb: fix highlight
* lib/irb.rb (IRB::Irb#eval_input): fix highlight for multiple
lines exception messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/irb.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/irb.rb b/lib/irb.rb index ff793dcd64..d650e9c497 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -527,7 +527,9 @@ module IRB printf "... %d levels...\n", levels if levels > 0 end puts messages.reverse - print "#{attr[1]}#{exc.class} (#{attr[4]}#{exc}#{attr[0, 1]})#{attr[]}\n" + messages = exc.to_s.split(/\n/) + print "#{attr[1]}#{exc.class} (#{attr[4]}#{messages.shift}#{attr[0, 1]})#{attr[]}\n" + puts messages.map {|s| "#{attr[1]}#{s}#{attr[]}\n"} print "Maybe IRB bug!\n" if irb_bug end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.0" #define RUBY_RELEASE_DATE "2018-02-21" -#define RUBY_PATCHLEVEL 27 +#define RUBY_PATCHLEVEL 28 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 |