irb 1.16.0 → 1.18.0

data/lib/irb/source_finder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "ruby-lex"
+require 'prism'
 
 module IRB
   class SourceFinder
@@ -44,21 +44,12 @@ module IRB
       private
 
       def find_end
-        lex = RubyLex.new
         code = file_content
         lines = code.lines[(@line - 1)..-1]
-        tokens = RubyLex.ripper_lex_without_warning(lines.join)
-        prev_tokens = []
-
-        # chunk with line number
-        tokens.chunk { |tok| tok.pos[0] }.each do |lnum, chunk|
-          code = lines[0..lnum].join
-          prev_tokens.concat chunk
-          continue = lex.should_continue?(prev_tokens)
-          syntax = lex.check_code_syntax(code, local_variables: [])
-          if !continue && syntax == :valid
-            return @line + lnum
-          end
+
+        lines.each_with_index do |line, index|
+          sub_code = lines.take(index + 1).join
+          return @line + index if Prism.parse_success?(sub_code)
         end
         @line
       end

data/lib/irb/startup_message.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require_relative "color"
+require_relative "version"
+
+module IRB
+  module StartupMessage
+    TIPS = [
+      'Type "help" for commands, "help <cmd>" for details',
+      '"show_doc method" to view documentation',
+      '"ls [object]" to see methods and properties',
+      '"ls [object] -g pattern" to filter methods and properties',
+      '"edit method" to open the method\'s source in editor',
+      '"cd object" to navigate into an object',
+      '"show_source method" to view source code',
+      '"copy expr" to copy the output to clipboard',
+      '"debug" to start integration with the "debug" gem',
+      '"history -g pattern" to search history',
+    ].freeze
+
+    class << self
+      def display
+        logo_lines = load_logo
+        info_lines = build_info_lines
+
+        output = if logo_lines
+          combine_logo_and_info(logo_lines, info_lines)
+        else
+          info_lines.join("\n")
+        end
+
+        # Add a blank line to not immediately touch warning messages
+        puts
+        puts output
+        puts
+      end
+
+      private
+
+      def load_logo
+        encoding = STDOUT.external_encoding || Encoding.default_external
+        return nil unless encoding == Encoding::UTF_8
+
+        logo = IRB.send(:easter_egg_logo, :unicode_small)
+        return nil unless logo
+
+        logo.chomp.lines.map(&:chomp)
+      end
+
+      def build_info_lines
+        version_line = "#{Color.colorize('IRB', [:BOLD])} v#{VERSION} - Ruby #{RUBY_VERSION}"
+        tip_line = colorize_tip(TIPS.sample)
+        dir_line = Color.colorize(short_pwd, [:CYAN])
+
+        [version_line, tip_line, dir_line]
+      end
+
+      def colorize_tip(tip)
+        tip.gsub(/"[^"]*"/) { |match| Color.colorize(match, [:YELLOW]) }
+      end
+
+      def combine_logo_and_info(logo_lines, info_lines)
+        max_lines = [logo_lines.size, info_lines.size].max
+        lines = max_lines.times.map do |i|
+          logo_part = logo_lines[i] || ""
+          info_part = info_lines[i] || ""
+          colored_logo = Color.colorize(logo_part, [:RED, :BOLD])
+          "#{colored_logo}  #{info_part}"
+        end
+        lines.join("\n")
+      end
+
+      def short_pwd
+        dir = Dir.pwd
+        home = ENV['HOME']
+        if home && (dir == home || dir.start_with?("#{home}/"))
+          dir = "~#{dir[home.size..]}"
+        end
+        dir
+      end
+    end
+  end
+end

data/lib/irb/version.rb

@@ -5,7 +5,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.16.0"
+  VERSION = "1.18.0"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2025-12-17"
+  @LAST_UPDATE_DATE = "2026-04-21"
 end

data/lib/irb.rb

@@ -5,7 +5,7 @@
 #       by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 
-require "ripper"
+require "prism"
 require "reline"
 
 require_relative "irb/init"
@@ -21,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"
 
@@ -50,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
 
@@ -77,6 +84,15 @@ module IRB
     PROMPT_MAIN_TRUNCATE_OMISSION = '...'
     CONTROL_CHARACTERS_PATTERN = "\x00-\x1F"
 
+    # Track the nesting depth of run loops. This is used for history management
+    # only the outermost run loop should load/save history.
+    @run_nesting_depth = 0
+
+    class << self
+      # TODO: When refactoring to v2.0, find a better way to manage and track nesting sessions.
+      attr_accessor :run_nesting_depth
+    end
+
     # Returns the current context of this irb session
     attr_reader :context
     # The lexer used by this irb session
@@ -148,7 +164,10 @@ module IRB
     end
 
     def run(conf = IRB.conf)
-      in_nested_session = !!conf[:MAIN_CONTEXT]
+      # Use run_nesting_depth to determine if we're in a nested session.
+      in_nested_session = Irb.run_nesting_depth > 0
+      Irb.run_nesting_depth += 1
+
       conf[:IRB_RC].call(context) if conf[:IRB_RC]
       prev_context = conf[:MAIN_CONTEXT]
       conf[:MAIN_CONTEXT] = context
@@ -174,6 +193,8 @@ module IRB
           eval_input
         end
       ensure
+        Irb.run_nesting_depth -= 1
+
         # Do not restore to nil. It will cause IRB crash when used with threads.
         IRB.conf[:MAIN_CONTEXT] = prev_context if prev_context
 
@@ -251,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
@@ -316,23 +336,25 @@ 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
       end
       if @context.io.respond_to?(:dynamic_prompt)
         @context.io.dynamic_prompt do |lines|
-          tokens = RubyLex.ripper_lex_without_warning(lines.map{ |l| l + "\n" }.join, local_variables: @context.local_variables)
-          line_results = IRB::NestingParser.parse_by_line(tokens)
+          code = lines.map{ |l| l + "\n" }.join
+          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 |(line_tokens, _prev_opens, next_opens, _min_depth), line_num_offset|
-            line_tokens.each do |token, _s|
-              # Avoid appending duplicated token. Tokens that include "n" like multiline
-              # tstring_content can exist in multiple lines.
-              tokens_until_line << token if token != tokens_until_line.last
-            end
-            continue = @scanner.should_continue?(tokens_until_line)
+          line_results.map.with_index do |(_prev_opens, next_opens, _min_depth), line_num_offset|
+            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
@@ -344,8 +366,8 @@ module IRB
           next nil if !is_newline && lines[line_index]&.byteslice(0, byte_pointer)&.match?(/\A\s*\z/)
 
           code = lines[0..line_index].map { |l| "#{l}\n" }.join
-          tokens = RubyLex.ripper_lex_without_warning(code, local_variables: @context.local_variables)
-          @scanner.process_indent_level(tokens, lines, line_index, is_newline)
+          parse_lex_result = Prism.parse_lex(code, scopes: [@context.local_variables])
+          @scanner.process_indent_level(parse_lex_result, lines, line_index, is_newline)
         end
       end
     end
@@ -584,7 +606,7 @@ module IRB
     end
 
     def generate_prompt(opens, continue, line_offset)
-      ltype = @scanner.ltype_from_open_tokens(opens)
+      ltype = @scanner.ltype_from_open_nestings(opens)
       indent = @scanner.calc_indent_level(opens)
       continue = opens.any? || continue
       line_no = @line_no + line_offset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - aycabta
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
@@ -145,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