diff options
Diffstat (limited to 'lib/irb/ruby-lex.rb')
| -rw-r--r-- | lib/irb/ruby-lex.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 5c07ef4341..72135c8255 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -66,6 +66,7 @@ class RubyLex unprocessed_tokens = [] line_num_offset = 0 tokens.each do |t| + next if t[1] == :on_parse_error || t[1] == :compile_error partial_tokens << t unprocessed_tokens << t if t[2].include?("\n") @@ -110,7 +111,12 @@ class RubyLex verbose, $VERBOSE = $VERBOSE, nil tokens = nil self.class.compile_with_errors_suppressed(code) do |inner_code, line_no| - tokens = Ripper.lex(inner_code, '-', line_no) + lexer = Ripper::Lexer.new(inner_code, '-', line_no) + if lexer.respond_to?(:scan) # Ruby 2.7+ + tokens = lexer.scan + else + tokens = lexer.parse + end end $VERBOSE = verbose tokens @@ -122,6 +128,7 @@ class RubyLex prev_spaces = md.nil? ? 0 : md[1].count(' ') line_count = 0 @tokens.each_with_index do |t, i| + next if t[1] == :on_parse_error || t[1] == :compile_error if t[2].include?("\n") line_count += t[2].count("\n") if line_count >= line_index @@ -350,6 +357,7 @@ class RubyLex indent = 0 in_oneliner_def = nil tokens.each_with_index { |t, index| + next if t[1] == :on_parse_error || t[1] == :compile_error # detecting one-liner method definition if in_oneliner_def.nil? if t[3].allbits?(Ripper::EXPR_ENDFN) @@ -435,6 +443,7 @@ class RubyLex open_brace_on_line = 0 in_oneliner_def = nil @tokens.each_with_index do |t, index| + next if t[1] == :on_parse_error || t[1] == :compile_error # detecting one-liner method definition if in_oneliner_def.nil? if t[3].allbits?(Ripper::EXPR_ENDFN) @@ -504,6 +513,7 @@ class RubyLex open_brace_on_line = 0 in_oneliner_def = nil @tokens.each_with_index do |t, index| + next if t[1] == :on_parse_error || t[1] == :compile_error # detecting one-liner method definition if in_oneliner_def.nil? if t[3].allbits?(Ripper::EXPR_ENDFN) |