irb 1.17.0 → 1.18.0

data/lib/irb.rb

@@ -6,7 +6,6 @@
 #
 
 require "prism"
-require "ripper"
 require "reline"
 
 require_relative "irb/init"
@@ -22,6 +21,7 @@ require_relative "irb/color"
 
 require_relative "irb/version"
 require_relative "irb/easter-egg"
+require_relative "irb/startup_message"
 require_relative "irb/debug"
 require_relative "irb/pager"
 
@@ -51,7 +51,13 @@ module IRB
         irb = Irb.new(nil, @CONF[:SCRIPT])
       else
         irb = Irb.new
+
+        # Only display the banner in the irb executable
+        if @CONF[:SHOW_BANNER] && ap_path&.end_with?("exe/irb")
+          StartupMessage.display
+        end
       end
+
       irb.run(@CONF)
     end
 
@@ -266,11 +272,10 @@ module IRB
         code << line
         return code if command?(code)
 
-        tokens, opens, terminated = @scanner.check_code_state(code, local_variables: @context.local_variables)
+        continue, opens, terminated = @scanner.check_code_state(code, local_variables: @context.local_variables)
         return code if terminated
 
         line_offset += 1
-        continue = @scanner.should_continue?(tokens)
         prompt = generate_prompt(opens, continue, line_offset)
       end
     end
@@ -331,7 +336,7 @@ module IRB
           else
             next true if command?(code)
 
-            _tokens, _opens, terminated = @scanner.check_code_state(code, local_variables: @context.local_variables)
+            _continue, _opens, terminated = @scanner.check_code_state(code, local_variables: @context.local_variables)
             terminated
           end
         end
@@ -339,13 +344,17 @@ module IRB
       if @context.io.respond_to?(:dynamic_prompt)
         @context.io.dynamic_prompt do |lines|
           code = lines.map{ |l| l + "\n" }.join
-          tokens = RubyLex.ripper_lex_without_warning(code, local_variables: @context.local_variables)
           parse_lex_result = Prism.parse_lex(code, scopes: [@context.local_variables])
           line_results = IRB::NestingParser.parse_by_line(parse_lex_result)
+
+          tokens = parse_lex_result.value[1].map(&:first)
+          tokens_by_line = tokens.group_by {|t| t.location.start_line - 1 }
+
           tokens_until_line = []
           line_results.map.with_index do |(_prev_opens, next_opens, _min_depth), line_num_offset|
-            tokens_until_line << tokens.shift while !tokens.empty? && tokens.first.pos[0] <= line_num_offset + 1
-            continue = @scanner.should_continue?(tokens_until_line)
+            line = lines[line_num_offset]
+            tokens_until_line.concat(tokens_by_line[line_num_offset] || [])
+            continue = @scanner.should_continue?(tokens_until_line, line, line_num_offset + 1)
             generate_prompt(next_opens, continue, line_num_offset)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - aycabta
@@ -159,6 +159,7 @@ files:
 - lib/irb/ruby-lex.rb
 - lib/irb/ruby_logo.aa
 - lib/irb/source_finder.rb
+- lib/irb/startup_message.rb
 - lib/irb/statement.rb
 - lib/irb/version.rb
 - lib/irb/workspace.rb