From e593cc65b7d78b82210c40ce48a5de88d0030feb Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@gmail.com>
Date: Sun, 7 Jun 2020 23:29:01 +0900
Subject: [PATCH] Simplify RubyLex.compile_with_errors_suppressed

nobu-san reviewed,

https://github.com/ruby/irb/pull/106#pullrequestreview-423400033
> How about lexer = Ripper::Lexer.new(";\n#{code}", nil, 0)?
> Encoding pragma is effective only at the beginning.
> And the semicolon and newline will be skipped because the position is before
> the initial pos.

I employ the way.

Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
---
 lib/irb/color.rb    |  4 ++--
 lib/irb/ruby-lex.rb | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/irb/color.rb b/lib/irb/color.rb
index d325c8ded..9ee134867 100644
--- a/lib/irb/color.rb
+++ b/lib/irb/color.rb
@@ -155,8 +155,8 @@ def scan(code, allow_last_error:)
         pos = [1, 0]
 
         verbose, $VERBOSE = $VERBOSE, nil
-        RubyLex.compile_with_errors_suppressed(code) do |inner_code|
-          lexer = Ripper::Lexer.new(inner_code)
+        RubyLex.compile_with_errors_suppressed(code) do |inner_code, line_no|
+          lexer = Ripper::Lexer.new(inner_code, '(ripper)', line_no)
           if lexer.respond_to?(:scan) # Ruby 2.7+
             lexer.scan.each do |elem|
               str = elem.tok
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 02bc54880..c7a47fd99 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -31,14 +31,13 @@ def initialize
   end
 
   def self.compile_with_errors_suppressed(code)
+    line_no = 1
     begin
-      result = yield code
+      result = yield code, line_no
     rescue ArgumentError => e
-      magic_comment_regexp = /\A(?<shebang>#.*\n)?#\s*(?:encoding|coding)\s*:.*(?<nl>\n)?/
-      if e.message.match?(/unknown encoding name/) && code.match?(magic_comment_regexp)
-        code = code.gsub(magic_comment_regexp, "\\k<shebang>#\\k<nl>")
-        retry
-      end
+      code = ";\n#{code}"
+      line_no = 0
+      result = yield code, line_no
     end
     result
   end
@@ -90,8 +89,8 @@ def set_prompt(p = nil, &block)
   def ripper_lex_without_warning(code)
     verbose, $VERBOSE = $VERBOSE, nil
     tokens = nil
-    self.class.compile_with_errors_suppressed(code) do |inner_code|
-      tokens = Ripper.lex(inner_code)
+    self.class.compile_with_errors_suppressed(code) do |inner_code, line_no|
+      tokens = Ripper.lex(inner_code, '-', line_no)
     end
     $VERBOSE = verbose
     tokens
@@ -226,8 +225,8 @@ def check_code_block(code)
       when 'jruby'
         JRuby.compile_ir(code)
       else
-        self.class.compile_with_errors_suppressed(code) do |inner_code|
-          RubyVM::InstructionSequence.compile(inner_code)
+        self.class.compile_with_errors_suppressed(code) do |inner_code, line_no|
+          RubyVM::InstructionSequence.compile(inner_code, nil, nil, line_no)
         end
       end
     rescue EncodingError