irb 1.15.1 → 1.18.0

data/lib/irb/ruby_logo.aa

@@ -116,3 +116,7 @@ TYPE: UNICODE
 ⢻⣾⡇  ⠘⣷  ⣼⠃      ⠘⣷⣠⣴⠟⠋          ⠙⢷⣄⢸⣿
  ⠻⣧⡀  ⠘⣧⣰⡏    ⢀⣠⣤⠶⠛⠉⠛⠛⠛⠛⠛⠛⠻⢶⣶⣶⣶⣶⣶⣤⣤⣽⣿⣿
   ⠈⠛⠷⢦⣤⣽⣿⣥⣤⣶⣶⡿⠿⠿⠶⠶⠶⠶⠾⠛⠛⠛⠛⠛⠛⠛⠋⠉⠉⠉⠉⠉⠉⠁
+TYPE: UNICODE_SMALL
+⢀⡴⠊⢉⡟⢿
+⣎⣀⣴⡋⡟⣻
+⣟⣼⣱⣽⣟⣾

data/lib/irb/source_finder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "ruby-lex"
+require 'prism'
 
 module IRB
   class SourceFinder
@@ -29,10 +29,13 @@ module IRB
 
       def colorized_content
         if !binary_file? && file_exist?
-          end_line = find_end
           # To correctly colorize, we need to colorize full content and extract the relevant lines.
-          colored = IRB::Color.colorize_code(file_content)
-          colored.lines[@line - 1...end_line].join
+          colored_lines = IRB::Color.colorize_code(file_content).lines
+
+          # Handle wrong line number case: line_no passed to eval is wrong, file is edited after load, etc
+          return if colored_lines.size < @line
+
+          colored_lines[@line - 1...find_end].join
         elsif @ast_source
           IRB::Color.colorize_code(@ast_source)
         end
@@ -41,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
@@ -114,7 +108,7 @@ module IRB
       when "owner"
         target_method = owner_receiver.instance_method(method)
       when "receiver"
-        target_method = owner_receiver.method(method)
+        target_method = Kernel.instance_method(:method).bind_call(owner_receiver, method)
       end
       super_level.times do |s|
         target_method = target_method.super_method if target_method

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.15.1"
+  VERSION = "1.18.0"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2025-01-22"
+  @LAST_UPDATE_DATE = "2026-04-21"
 end

data/lib/irb/workspace.rb

@@ -55,6 +55,15 @@ EOF
           # Note that this will typically be IRB::TOPLEVEL_BINDING
           # This is to avoid RubyGems' local variables (see issue #17623)
           @binding = TOPLEVEL_BINDING.dup
+
+        when 5  # binding in Ruby::Box
+          unless defined?(Ruby::Box)
+            puts 'Context-mode 5 (binding in Ruby::Box) requires Ruby 4.0 or later.'
+            raise NameError, 'Ruby::Box not defined'
+          end
+
+          puts 'Context-mode 5 (binding in Ruby::Box) is experimental. It may be removed or changed without notice.'
+          @binding = Ruby::Box.new.eval('Kernel.binding')
         end
       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
@@ -87,6 +103,7 @@ module IRB
     # Creates a new irb session
     def initialize(workspace = nil, input_method = nil, from_binding: false)
       @from_binding = from_binding
+      @prompt_part_cache = nil
       @context = Context.new(self, workspace, input_method)
       @context.workspace.load_helper_methods_to_main
       @signal_status = :IN_IRB
@@ -147,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
@@ -173,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
 
@@ -238,13 +260,7 @@ module IRB
       end
     end
 
-    def readmultiline
-      prompt = generate_prompt([], false, 0)
-
-      # multiline
-      return read_input(prompt) if @context.io.respond_to?(:check_termination)
-
-      # nomultiline
+    def read_input_nomultiline(prompt)
       code = +''
       line_offset = 0
       loop do
@@ -256,15 +272,28 @@ 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
 
+    def readmultiline
+      with_prompt_part_cached do
+        prompt = generate_prompt([], false, 0)
+
+        if @context.io.respond_to?(:check_termination)
+          # multiline
+          read_input(prompt)
+        else
+          # nomultiline
+          read_input_nomultiline(prompt)
+        end
+      end
+    end
+
     def each_top_level_statement
       loop do
         code = readmultiline
@@ -307,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
@@ -335,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
@@ -567,8 +598,15 @@ module IRB
 
     private
 
+    def with_prompt_part_cached
+      @prompt_part_cache = {}
+      yield
+    ensure
+      @prompt_part_cache = nil
+    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
@@ -598,25 +636,29 @@ module IRB
     end
 
     def truncate_prompt_main(str) # :nodoc:
-      str = str.tr(CONTROL_CHARACTERS_PATTERN, ' ')
-      if str.size <= PROMPT_MAIN_TRUNCATE_LENGTH
-        str
-      else
-        str[0, PROMPT_MAIN_TRUNCATE_LENGTH - PROMPT_MAIN_TRUNCATE_OMISSION.size] + PROMPT_MAIN_TRUNCATE_OMISSION
+      if str.size > PROMPT_MAIN_TRUNCATE_LENGTH
+        str = str[0, PROMPT_MAIN_TRUNCATE_LENGTH - PROMPT_MAIN_TRUNCATE_OMISSION.size] + PROMPT_MAIN_TRUNCATE_OMISSION
       end
+      str.tr(CONTROL_CHARACTERS_PATTERN, ' ')
     end
 
     def format_prompt(format, ltype, indent, line_no) # :nodoc:
+      # @prompt_part_cache could be nil in unit tests
+      part_cache = @prompt_part_cache || {}
       format.gsub(/%([0-9]+)?([a-zA-Z%])/) do
         case $2
         when "N"
           @context.irb_name
         when "m"
-          main_str = @context.safe_method_call_on_main(:to_s) rescue "!#{$!.class}"
-          truncate_prompt_main(main_str)
+          part_cache[:m] ||= (
+            main_str = "#{@context.safe_method_call_on_main(:to_s)}" rescue "!#{$!.class}"
+            truncate_prompt_main(main_str)
+          )
         when "M"
-          main_str = @context.safe_method_call_on_main(:inspect) rescue "!#{$!.class}"
-          truncate_prompt_main(main_str)
+          part_cache[:M] ||= (
+            main_str = "#{@context.safe_method_call_on_main(:inspect)}" rescue "!#{$!.class}"
+            truncate_prompt_main(main_str)
+          )
         when "l"
           ltype
         when "i"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.18.0
 platform: ruby
 authors:
 - aycabta
 - Keiju ISHITSUKA
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+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
@@ -61,16 +75,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rdoc_options"
+- CONTRIBUTING.md
+- EXTEND_IRB.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
+- doc/COMMAND_LINE_OPTIONS.md
+- doc/COMPARED_WITH_PRY.md
+- doc/Configurations.md
+- doc/EXTEND_IRB.md
+- doc/Index.md
 - doc/irb/irb-tools.rd.ja
 - doc/irb/irb.rd.ja
 - exe/irb
-- irb.gemspec
 - lib/irb.rb
 - lib/irb/cmd/nop.rb
 - lib/irb/color.rb
@@ -141,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
@@ -170,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).
 test_files: []

data/Rakefile

@@ -1,52 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "rdoc/task"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test" << "test/lib"
-  t.libs << "lib"
-  t.ruby_opts << "-rhelper"
-  t.test_files = FileList["test/irb/**/test_*.rb"]
-end
-
-# To make sure they have been correctly setup for Ruby CI.
-desc "Run each irb test file in isolation."
-task :test_in_isolation do
-  failed = false
-
-  FileList["test/irb/**/test_*.rb"].each do |test_file|
-    ENV["TEST"] = test_file
-    begin
-      Rake::Task["test"].execute
-    rescue
-      failed = true
-      msg = "Test '#{test_file}' failed when being executed in isolation. Please make sure 'rake test TEST=#{test_file}' passes."
-      separation_line = '=' * msg.length
-
-      puts <<~MSG
-        #{separation_line}
-        #{msg}
-        #{separation_line}
-      MSG
-    end
-  end
-
-  fail "Some tests failed when being executed in isolation" if failed
-end
-
-Rake::TestTask.new(:test_yamatanooroti) do |t|
-  t.libs << 'test' << "test/lib"
-  t.libs << 'lib'
-  #t.loader = :direct
-  t.ruby_opts << "-rhelper"
-  t.pattern = 'test/irb/yamatanooroti/test_*.rb'
-end
-
-task :default => :test
-
-RDoc::Task.new do |rdoc|
-  rdoc.title = "IRB Documentation"
-  rdoc.main = "Index.md"
-  rdoc.rdoc_dir = "_site"
-  rdoc.options.push("lib")
-end

data/bin/console

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require_relative "../lib/irb"
-
-IRB.start(__FILE__)

data/bin/setup

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install

data/irb.gemspec

@@ -1,46 +0,0 @@
-begin
-  require_relative "lib/irb/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "irb"
-  spec.version       = IRB::VERSION
-  spec.authors       = ["aycabta", "Keiju ISHITSUKA"]
-  spec.email         = ["aycabta@gmail.com", "keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
-  spec.description   = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
-  spec.homepage      = "https://github.com/ruby/irb"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["documentation_uri"] = "https://ruby.github.io/irb/"
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/releases"
-
-  spec.files         = [
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "bin/console",
-    "bin/setup",
-    "doc/irb/irb-tools.rd.ja",
-    "doc/irb/irb.rd.ja",
-    "exe/irb",
-    "irb.gemspec",
-    "man/irb.1",
-  ] + Dir.glob("lib/**/*")
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
-
-  spec.add_dependency "reline", ">= 0.4.2"
-  spec.add_dependency "rdoc", ">= 4.0.0"
-  spec.add_dependency "pp", ">= 0.6.0"
-end