diff options
| -rw-r--r-- | ext/ripper/lib/ripper/lexer.rb | 12 | ||||
| -rw-r--r-- | lib/irb/color.rb | 2 | ||||
| -rw-r--r-- | test/irb/test_color.rb | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb index 696471a75d..3a2138f310 100644 --- a/ext/ripper/lib/ripper/lexer.rb +++ b/ext/ripper/lib/ripper/lexer.rb @@ -103,7 +103,17 @@ class Ripper # parse the code and returns elements including errors. def scan - (parse() + errors + @stack.flatten).uniq.sort_by {|e| [*e.pos, (e.message ? -1 : 0)]} + result = (parse() + errors + @stack.flatten).uniq.sort_by {|e| [*e.pos, (e.message ? -1 : 0)]} + result.each_with_index do |e, i| + if e.event == :on_parse_error and e.tok.empty? and (pre = result[i-1]) and + pre.pos[0] == e.pos[0] and (pre.pos[1] + pre.tok.size) == e.pos[1] + e.tok = pre.tok + e.pos[1] = pre.pos[1] + result[i-1] = e + result[i] = pre + end + end + result end def parse diff --git a/lib/irb/color.rb b/lib/irb/color.rb index fa8502c5d1..b942299789 100644 --- a/lib/irb/color.rb +++ b/lib/irb/color.rb @@ -137,7 +137,7 @@ module IRB # :nodoc: Ripper::Lexer.new(code).scan.each do |elem| str = elem.tok - next if allow_last_error and elem.message&.end_with?('meets end of file') + next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message next if ([elem.pos[0], elem.pos[1] + str.bytesize] <=> pos) <= 0 str.each_line do |line| diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb index 916443d997..644f3727d9 100644 --- a/test/irb/test_color.rb +++ b/test/irb/test_color.rb @@ -41,7 +41,7 @@ module TestIRB "'a\nb'" => "#{RED}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}'#{CLEAR}", "4.5.6" => "#{MAGENTA}#{BOLD}4.5#{CLEAR}#{RED}#{REVERSE}.6#{CLEAR}", "[1]]]\u0013" => "[1]]]^S", - "\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}m\n", + "\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}#{RED}#{REVERSE}m#{CLEAR}\n", "%w[a b]" => "#{RED}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}]#{CLEAR}", "%i[c d]" => "#{RED}%i[#{CLEAR}#{RED}c#{CLEAR} #{RED}d#{CLEAR}#{RED}]#{CLEAR}", "{'a': 1}" => "{#{RED}'#{CLEAR}#{RED}a#{CLEAR}#{RED}':#{CLEAR} #{BLUE}#{BOLD}1#{CLEAR}}", |