irb 1.4.1 → 1.4.2

data/lib/irb/extend-command.rb

@@ -47,7 +47,7 @@ module IRB # :nodoc:
 
     @EXTEND_COMMANDS = [
       [
-        :irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
+        :irb_current_working_workspace, :CurrentWorkingWorkspace, "cmd/chws",
         [:irb_print_working_workspace, OVERRIDE_ALL],
         [:irb_cwws, OVERRIDE_ALL],
         [:irb_pwws, OVERRIDE_ALL],
@@ -59,7 +59,7 @@ module IRB # :nodoc:
         [:irb_pwb, OVERRIDE_ALL],
       ],
       [
-        :irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
+        :irb_change_workspace, :ChangeWorkspace, "cmd/chws",
         [:irb_chws, OVERRIDE_ALL],
         [:irb_cws, OVERRIDE_ALL],
         [:chws, NO_OVERRIDE],
@@ -70,13 +70,13 @@ module IRB # :nodoc:
       ],
 
       [
-        :irb_workspaces, :Workspaces, "irb/cmd/pushws",
+        :irb_workspaces, :Workspaces, "cmd/pushws",
         [:workspaces, NO_OVERRIDE],
         [:irb_bindings, OVERRIDE_ALL],
         [:bindings, NO_OVERRIDE],
       ],
       [
-        :irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
+        :irb_push_workspace, :PushWorkspace, "cmd/pushws",
         [:irb_pushws, OVERRIDE_ALL],
         [:pushws, NO_OVERRIDE],
         [:irb_push_binding, OVERRIDE_ALL],
@@ -84,7 +84,7 @@ module IRB # :nodoc:
         [:pushb, NO_OVERRIDE],
       ],
       [
-        :irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
+        :irb_pop_workspace, :PopWorkspace, "cmd/pushws",
         [:irb_popws, OVERRIDE_ALL],
         [:popws, NO_OVERRIDE],
         [:irb_pop_binding, OVERRIDE_ALL],
@@ -93,55 +93,55 @@ module IRB # :nodoc:
       ],
 
       [
-        :irb_load, :Load, "irb/cmd/load"],
+        :irb_load, :Load, "cmd/load"],
       [
-        :irb_require, :Require, "irb/cmd/load"],
+        :irb_require, :Require, "cmd/load"],
       [
-        :irb_source, :Source, "irb/cmd/load",
+        :irb_source, :Source, "cmd/load",
         [:source, NO_OVERRIDE],
       ],
 
       [
-        :irb, :IrbCommand, "irb/cmd/subirb"],
+        :irb, :IrbCommand, "cmd/subirb"],
       [
-        :irb_jobs, :Jobs, "irb/cmd/subirb",
+        :irb_jobs, :Jobs, "cmd/subirb",
         [:jobs, NO_OVERRIDE],
       ],
       [
-        :irb_fg, :Foreground, "irb/cmd/subirb",
+        :irb_fg, :Foreground, "cmd/subirb",
         [:fg, NO_OVERRIDE],
       ],
       [
-        :irb_kill, :Kill, "irb/cmd/subirb",
+        :irb_kill, :Kill, "cmd/subirb",
         [:kill, OVERRIDE_PRIVATE_ONLY],
       ],
 
       [
-        :irb_help, :Help, "irb/cmd/help",
+        :irb_help, :Help, "cmd/help",
         [:help, NO_OVERRIDE],
       ],
 
       [
-        :irb_info, :Info, "irb/cmd/info"
+        :irb_info, :Info, "cmd/info"
       ],
 
       [
-        :irb_ls, :Ls, "irb/cmd/ls",
+        :irb_ls, :Ls, "cmd/ls",
         [:ls, NO_OVERRIDE],
       ],
 
       [
-        :irb_measure, :Measure, "irb/cmd/measure",
+        :irb_measure, :Measure, "cmd/measure",
         [:measure, NO_OVERRIDE],
       ],
 
       [
-        :irb_show_source, :ShowSource, "irb/cmd/show_source",
+        :irb_show_source, :ShowSource, "cmd/show_source",
         [:show_source, NO_OVERRIDE],
       ],
 
       [
-        :irb_whereami, :Whereami, "irb/cmd/whereami",
+        :irb_whereami, :Whereami, "cmd/whereami",
         [:whereami, NO_OVERRIDE],
       ],
 
@@ -187,7 +187,7 @@ module IRB # :nodoc:
         kwargs = ", **kwargs" if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
         line = __LINE__; eval %[
           def #{cmd_name}(*opts#{kwargs}, &b)
-            require "#{load_file}"
+            require_relative "#{load_file}"
             arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
             args = (1..(arity < 0 ? ~arity : arity)).map {|i| "arg" + i.to_s }
             args << "*opts#{kwargs}" if arity < 0
@@ -235,7 +235,7 @@ module IRB # :nodoc:
           alias_method to, from
         }
       else
-        print "irb: warn: can't alias #{to} from #{from}.\n"
+        Kernel.print "irb: warn: can't alias #{to} from #{from}.\n"
       end
     end
 
@@ -262,10 +262,10 @@ module IRB # :nodoc:
     CE = ContextExtender # :nodoc:
 
     @EXTEND_COMMANDS = [
-      [:eval_history=, "irb/ext/history.rb"],
-      [:use_tracer=, "irb/ext/tracer.rb"],
-      [:use_loader=, "irb/ext/use-loader.rb"],
-      [:save_history=, "irb/ext/save-history.rb"],
+      [:eval_history=, "ext/history.rb"],
+      [:use_tracer=, "ext/tracer.rb"],
+      [:use_loader=, "ext/use-loader.rb"],
+      [:save_history=, "ext/save-history.rb"],
     ]
 
     # Installs the default context extensions as irb commands:
@@ -288,7 +288,7 @@ module IRB # :nodoc:
       line = __LINE__; Context.module_eval %[
         def #{cmd_name}(*opts, &b)
           Context.module_eval {remove_method(:#{cmd_name})}
-          require "#{load_file}"
+          require_relative "#{load_file}"
           __send__ :#{cmd_name}, *opts, &b
         end
         for ali in aliases

data/lib/irb/init.rb

@@ -289,6 +289,10 @@ module IRB # :nodoc:
         @CONF[:PROMPT_MODE] = prompt_mode
       when "--noprompt"
         @CONF[:PROMPT_MODE] = :NULL
+      when "--script"
+        noscript = false
+      when "--noscript"
+        noscript = true
       when "--inf-ruby-mode"
         @CONF[:PROMPT_MODE] = :INF_RUBY
       when "--sample-book-mode", "--simple-prompt"
@@ -309,16 +313,20 @@ module IRB # :nodoc:
         IRB.print_usage
         exit 0
       when "--"
-        if opt = argv.shift
+        if !noscript && (opt = argv.shift)
           @CONF[:SCRIPT] = opt
           $0 = opt
         end
         break
-      when /^-/
+      when /^-./
         fail UnrecognizedSwitch, opt
       else
-        @CONF[:SCRIPT] = opt
-        $0 = opt
+        if noscript
+          argv.unshift(opt)
+        else
+          @CONF[:SCRIPT] = opt
+          $0 = opt
+        end
         break
       end
     end

data/lib/irb/input-method.rb

@@ -14,7 +14,6 @@ require_relative 'magic-file'
 require_relative 'completion'
 require 'io/console'
 require 'reline'
-require 'rdoc'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
@@ -39,7 +38,7 @@ module IRB
     public :gets
 
     def winsize
-      if instance_variable_defined?(:@stdout)
+      if instance_variable_defined?(:@stdout) && @stdout.tty?
         @stdout.winsize
       else
         [24, 80]
@@ -84,8 +83,7 @@ module IRB
     #
     # See IO#eof? for more information.
     def eof?
-      rs, = IO.select([@stdin], [], [], 0.00001)
-      if rs and rs[0]
+      if @stdin.wait_readable(0.00001)
         c = @stdin.getc
         result = c.nil? ? true : false
         @stdin.ungetc(c) unless c.nil?
@@ -139,7 +137,7 @@ module IRB
     # Creates a new input method object
     def initialize(file)
       super
-      @io = IRB::MagicFile.open(file)
+      @io = file.is_a?(IO) ? file : IRB::MagicFile.open(file)
       @external_encoding = @io.external_encoding
     end
     # The file name of this input method, usually given during initialization.
@@ -263,7 +261,7 @@ module IRB
     end
   end
 
-  class ReidlineInputMethod < InputMethod
+  class RelineInputMethod < InputMethod
     include Reline
 
     # Creates a new input method object using Reline
@@ -322,6 +320,11 @@ module IRB
         [195, 164], # The "ä" that appears when Alt+d is pressed on xterm.
         [226, 136, 130] # The "∂" that appears when Alt+d in pressed on iTerm2.
       ]
+      begin
+        require 'rdoc'
+      rescue LoadError
+        return nil
+      end
 
       if just_cursor_moving and completion_journey_data.nil?
         return nil
@@ -467,4 +470,13 @@ module IRB
       str
     end
   end
+
+  class ReidlineInputMethod < RelineInputMethod
+    def initialize
+      warn <<~MSG.strip
+        IRB::ReidlineInputMethod is deprecated, please use IRB::RelineInputMethod instead.
+      MSG
+      super
+    end
+  end
 end

data/lib/irb/inspector.rb

@@ -108,18 +108,10 @@ module IRB # :nodoc:
 
   Inspector.def_inspector([false, :to_s, :raw]){|v| v.to_s}
   Inspector.def_inspector([:p, :inspect]){|v|
-    result = v.inspect
-    if IRB.conf[:MAIN_CONTEXT]&.use_colorize? && Color.inspect_colorable?(v)
-      result = Color.colorize_code(result)
-    end
-    result
+    Color.colorize_code(v.inspect, colorable: Color.colorable? && Color.inspect_colorable?(v))
   }
-  Inspector.def_inspector([true, :pp, :pretty_inspect], proc{require "irb/color_printer"}){|v|
-    if IRB.conf[:MAIN_CONTEXT]&.use_colorize?
-      IRB::ColorPrinter.pp(v, '').chomp
-    else
-      v.pretty_inspect.chomp
-    end
+  Inspector.def_inspector([true, :pp, :pretty_inspect], proc{require_relative "color_printer"}){|v|
+    IRB::ColorPrinter.pp(v, '').chomp
   }
   Inspector.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
     begin

data/lib/irb/lc/error.rb

@@ -10,8 +10,9 @@
 #
 #
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   class UnrecognizedSwitch < StandardError
     def initialize(val)
       super("Unrecognized switch: #{val}")
@@ -47,11 +48,6 @@ module IRB
       super("No such job(#{val}).")
     end
   end
-  class CantShiftToMultiIrbMode < StandardError
-    def initialize
-      super("Can't shift to multi irb mode.")
-    end
-  end
   class CantChangeBinding < StandardError
     def initialize(val)
       super("Can't change binding to (#{val}).")
@@ -67,5 +63,6 @@ module IRB
       super("Define illegal RC_NAME_GENERATOR.")
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/lc/help-message

@@ -1,61 +1,51 @@
-# -*- coding: utf-8 -*-
-#
-#   irb/lc/help-message.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
 Usage:  irb.rb [options] [programfile] [arguments]
-  -f                Suppress read of ~/.irbrc
-  -d                Set $DEBUG to true (same as `ruby -d')
-  -r load-module    Same as `ruby -r'
-  -I path           Specify $LOAD_PATH directory
-  -U                Same as `ruby -U`
-  -E enc            Same as `ruby -E`
-  -w                Same as `ruby -w`
-  -W[level=2]       Same as `ruby -W`
+  -f                Don't initialize from configuration file.
+  -d                Set $DEBUG and $VERBOSE to true (same as 'ruby -d').
+  -r load-module    Require load-module (same as 'ruby -r').
+  -I path           Specify $LOAD_PATH directory (same as 'ruby -I').
+  -U                Set external and internal encodings to UTF-8.
+  -E ex[:in]        Set default external (ex) and internal (in) encodings
+                    (same as 'ruby -E').
+  -w                Suppress warnings (same as 'ruby -w').
+  -W[level=2]       Set warning level: 0=silence, 1=medium, 2=verbose
+                    (same as 'ruby -W').
   --context-mode n  Set n[0-4] to method to create Binding Object,
-                    when new workspace was created
-  --extra-doc-dir   Add an extra doc dir for the doc dialog
-  --echo            Show result (default)
-  --noecho          Don't show result
+                    when new workspace was created.
+  --extra-doc-dir   Add an extra doc dir for the doc dialog.
+  --echo            Show result (default).
+  --noecho          Don't show result.
   --echo-on-assignment
-                    Show result on assignment
+                    Show result on assignment.
   --noecho-on-assignment
-                    Don't show result on assignment
+                    Don't show result on assignment.
   --truncate-echo-on-assignment
-                    Show truncated result on assignment (default)
-  --inspect         Use `inspect' for output
-  --noinspect       Don't use inspect for output
-  --multiline       Use multiline editor module
-  --nomultiline     Don't use multiline editor module
-  --singleline      Use singleline editor module
-  --nosingleline    Don't use singleline editor module
-  --colorize        Use colorization
-  --nocolorize      Don't use colorization
-  --autocomplete    Use autocompletion
-  --noautocomplete  Don't use autocompletion
-  --prompt prompt-mode/--prompt-mode prompt-mode
-                    Switch prompt mode. Pre-defined prompt modes are
-                    `default', `simple', `xmp' and `inf-ruby'
+                    Show truncated result on assignment (default).
+  --inspect         Use 'inspect' for output.
+  --noinspect       Don't use 'inspect' for output.
+  --multiline       Use multiline editor module.
+  --nomultiline     Don't use multiline editor module (default).
+  --singleline      Use single line editor module.
+  --nosingleline    Don't use single line editor module (default).
+  --colorize        Use color-highlighting (default).
+  --nocolorize      Don't use color-highlighting.
+  --autocomplete    Use auto-completion (default).
+  --noautocomplete  Don't use auto-completion.
+  --prompt prompt-mode, --prompt-mode prompt-mode
+                    Set prompt mode. Pre-defined prompt modes are:
+                    'default', 'classic', 'simple', 'inf-ruby', 'xmp', 'null'.
   --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
                     Suppresses --multiline and --singleline.
-  --sample-book-mode/--simple-prompt
-                    Simple prompt mode
-  --noprompt        No prompt mode
+  --sample-book-mode, --simple-prompt
+                    Set prompt mode to 'simple'.
+  --noprompt        Don't output prompt.
+  --script          Script mode (default, treat first argument as script)
+  --noscript        No script mode (leave arguments in argv)
   --single-irb      Share self with sub-irb.
-  --tracer          Display trace for each execution of commands.
-  --back-trace-limit n
-                    Display backtrace top n and tail n. The default
-                    value is 16.
-  --verbose         Show details
-  --noverbose       Don't show details
-  -v, --version	    Print the version of irb
-  -h, --help        Print help
-  --                Separate options of irb from the list of command-line args
-
-# vim:fileencoding=utf-8
+  --tracer          Show stack trace for each command.
+  --back-trace-limit n[=16]
+                    Display backtrace top n and bottom n.
+  --verbose         Show details.
+  --noverbose       Don't show details.
+  -v, --version     Print the version of irb.
+  -h, --help        Print help.
+  --                Separate options of irb from the list of command-line args.

data/lib/irb/lc/ja/encoding_aliases.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: false
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   class Locale
     @@legacy_encoding_alias_map = {
       'ujis' => Encoding::EUC_JP,
       'euc' => Encoding::EUC_JP
     }.freeze
   end
+
+  # :startdoc:
 end
-# :startdoc:

data/lib/irb/lc/ja/error.rb

@@ -10,8 +10,9 @@
 #
 #
 
-# :stopdoc:
 module IRB
+  # :stopdoc:
+
   class UnrecognizedSwitch < StandardError
     def initialize(val)
       super("スイッチ(#{val})が分りません")
@@ -47,11 +48,6 @@ module IRB
       super("そのようなジョブ(#{val})はありません.")
     end
   end
-  class CantShiftToMultiIrbMode < StandardError
-    def initialize
-      super("multi-irb modeに移れません.")
-    end
-  end
   class CantChangeBinding < StandardError
     def initialize(val)
       super("バインディング(#{val})に変更できません.")
@@ -67,6 +63,7 @@ module IRB
       super("RC_NAME_GENERATORが正しく定義されていません.")
     end
   end
+
+  # :startdoc:
 end
-# :startdoc:
 # vim:fileencoding=utf-8

data/lib/irb/lc/ja/help-message

@@ -1,13 +1,3 @@
-# -*- coding: utf-8 -*-
-#   irb/lc/ja/help-message.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
 Usage:  irb.rb [options] [programfile] [arguments]
   -f		    ~/.irbrc を読み込まない.
   -d                $DEBUG をtrueにする(ruby -d と同じ)
@@ -53,5 +43,3 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -v, --version	    irbのバージョンを表示する.
   -h, --help	    irb のヘルプを表示する.
   --		    以降のコマンドライン引数をオプションとして扱わない.
-
-# vim:fileencoding=utf-8

data/lib/irb/ruby-lex.rb

@@ -139,7 +139,7 @@ class RubyLex
   def self.ripper_lex_without_warning(code, context: nil)
     verbose, $VERBOSE = $VERBOSE, nil
     if context
-      lvars = context&.workspace&.binding&.local_variables
+      lvars = context.workspace&.binding&.local_variables
       if lvars && !lvars.empty?
         code = "#{lvars.join('=')}=nil\n#{code}"
         line_no = 0
@@ -147,30 +147,24 @@ class RubyLex
         line_no = 1
       end
     end
-    tokens = nil
+
     compile_with_errors_suppressed(code, line_no: line_no) do |inner_code, line_no|
       lexer = Ripper::Lexer.new(inner_code, '-', line_no)
       if lexer.respond_to?(:scan) # Ruby 2.7+
-        tokens = []
-        pos_to_index = {}
-        lexer.scan.each do |t|
+        lexer.scan.each_with_object([]) do |t, tokens|
           next if t.pos.first == 0
-          if pos_to_index.has_key?(t.pos)
-            index = pos_to_index[t.pos]
-            found_tk = tokens[index]
-            if ERROR_TOKENS.include?(found_tk.event) && !ERROR_TOKENS.include?(t.event)
-              tokens[index] = t
-            end
+          prev_tk = tokens.last
+          position_overlapped = prev_tk && t.pos[0] == prev_tk.pos[0] && t.pos[1] < prev_tk.pos[1] + prev_tk.tok.bytesize
+          if position_overlapped
+            tokens[-1] = t if ERROR_TOKENS.include?(prev_tk.event) && !ERROR_TOKENS.include?(t.event)
           else
-            pos_to_index[t.pos] = tokens.size
             tokens << t
           end
         end
       else
-        tokens = lexer.parse.reject { |it| it.pos.first == 0 }
+        lexer.parse.reject { |it| it.pos.first == 0 }
       end
     end
-    tokens
   ensure
     $VERBOSE = verbose
   end
@@ -209,12 +203,7 @@ class RubyLex
           last_line = lines[line_index]&.byteslice(0, byte_pointer)
           code += last_line if last_line
           @tokens = self.class.ripper_lex_without_warning(code, context: context)
-          corresponding_token_depth = check_corresponding_token_depth(lines, line_index)
-          if corresponding_token_depth
-            corresponding_token_depth
-          else
-            nil
-          end
+          check_corresponding_token_depth(lines, line_index)
         end
       end
     end
@@ -308,7 +297,7 @@ class RubyLex
       return true
     elsif tokens.size >= 1 and tokens[-1].event == :on_heredoc_end # "EOH\n"
       return false
-    elsif tokens.size >= 2 and defined?(Ripper::EXPR_BEG) and tokens[-2].state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2].tok !~ /\A\.\.\.?\z/
+    elsif tokens.size >= 2 and tokens[-2].state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2].tok !~ /\A\.\.\.?\z/
       # end of literal except for regexp
       # endless range at end of line is not a continue
       return true
@@ -389,21 +378,20 @@ class RubyLex
       $VERBOSE = verbose
     end
 
-    if defined?(Ripper::EXPR_BEG)
-      last_lex_state = tokens.last.state
-      if last_lex_state.allbits?(Ripper::EXPR_BEG)
-        return false
-      elsif last_lex_state.allbits?(Ripper::EXPR_DOT)
-        return true
-      elsif last_lex_state.allbits?(Ripper::EXPR_CLASS)
-        return true
-      elsif last_lex_state.allbits?(Ripper::EXPR_FNAME)
-        return true
-      elsif last_lex_state.allbits?(Ripper::EXPR_VALUE)
-        return true
-      elsif last_lex_state.allbits?(Ripper::EXPR_ARG)
-        return false
-      end
+    last_lex_state = tokens.last.state
+
+    if last_lex_state.allbits?(Ripper::EXPR_BEG)
+      return false
+    elsif last_lex_state.allbits?(Ripper::EXPR_DOT)
+      return true
+    elsif last_lex_state.allbits?(Ripper::EXPR_CLASS)
+      return true
+    elsif last_lex_state.allbits?(Ripper::EXPR_FNAME)
+      return true
+    elsif last_lex_state.allbits?(Ripper::EXPR_VALUE)
+      return true
+    elsif last_lex_state.allbits?(Ripper::EXPR_ARG)
+      return false
     end
 
     false

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2021-12-25"
+  @LAST_UPDATE_DATE = "2022-10-03"
 end

data/lib/irb/workspace.rb

@@ -158,27 +158,20 @@ EOF
         end
       end
 
-      # NOT using #use_colorize? of IRB.conf[:MAIN_CONTEXT] because this method may be called before IRB::Irb#run
-      use_colorize = IRB.conf.fetch(:USE_COLORIZE, true)
-      if use_colorize
-        lines = Color.colorize_code(code).lines
-      else
-        lines = code.lines
-      end
+      lines = Color.colorize_code(code).lines
       pos -= 1
 
       start_pos = [pos - 5, 0].max
       end_pos   = [pos + 5, lines.size - 1].min
 
-      if use_colorize
-        fmt = " %2s #{Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])}: %s"
-      else
-        fmt = " %2s %#{end_pos.to_s.length}d: %s"
-      end
+      line_number_fmt = Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])
+      fmt = " %2s #{line_number_fmt}: %s"
+
       body = (start_pos..end_pos).map do |current_pos|
         sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
       end.join("")
-      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear if use_colorize}\n"
+
+      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear}\n"
     end
 
     def IRB.delete_caller