irb 1.9.0 → 1.10.0

data/lib/irb.rb

@@ -20,6 +20,7 @@ require_relative "irb/color"
 require_relative "irb/version"
 require_relative "irb/easter-egg"
 require_relative "irb/debug"
+require_relative "irb/pager"
 
 # IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
 # expressions read from the standard input.
@@ -697,7 +698,7 @@ module IRB
     end
 
     def handle_exception(exc)
-      if exc.backtrace && exc.backtrace[0] =~ /\/irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
+      if exc.backtrace[0] =~ /\/irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
          !(SyntaxError === exc) && !(EncodingError === exc)
         # The backtrace of invalid encoding hash (ex. {"\xAE": 1}) raises EncodingError without lineno.
         irb_bug = true
@@ -705,45 +706,49 @@ module IRB
         irb_bug = false
       end
 
-      if exc.backtrace
-        order = nil
-        if RUBY_VERSION < '3.0.0'
-          if STDOUT.tty?
-            message = exc.full_message(order: :bottom)
-            order = :bottom
-          else
-            message = exc.full_message(order: :top)
-            order = :top
-          end
-        else # '3.0.0' <= RUBY_VERSION
+      if RUBY_VERSION < '3.0.0'
+        if STDOUT.tty?
+          message = exc.full_message(order: :bottom)
+          order = :bottom
+        else
           message = exc.full_message(order: :top)
           order = :top
         end
-        message = convert_invalid_byte_sequence(message, exc.message.encoding)
-        message = encode_with_invalid_byte_sequence(message, IRB.conf[:LC_MESSAGES].encoding) unless message.encoding.to_s.casecmp?(IRB.conf[:LC_MESSAGES].encoding.to_s)
-        message = message.gsub(/((?:^\t.+$\n)+)/)  { |m|
-          case order
-          when :top
-            lines = m.split("\n")
-          when :bottom
-            lines = m.split("\n").reverse
-          end
-          unless irb_bug
-            lines = lines.map { |l| @context.workspace.filter_backtrace(l) }.compact
-            if lines.size > @context.back_trace_limit
-              omit = lines.size - @context.back_trace_limit
-              lines = lines[0..(@context.back_trace_limit - 1)]
-              lines << "\t... %d levels..." % omit
-            end
+      else # '3.0.0' <= RUBY_VERSION
+        message = exc.full_message(order: :top)
+        order = :top
+      end
+      message = convert_invalid_byte_sequence(message, exc.message.encoding)
+      message = encode_with_invalid_byte_sequence(message, IRB.conf[:LC_MESSAGES].encoding) unless message.encoding.to_s.casecmp?(IRB.conf[:LC_MESSAGES].encoding.to_s)
+      message = message.gsub(/((?:^\t.+$\n)+)/) { |m|
+        case order
+        when :top
+          lines = m.split("\n")
+        when :bottom
+          lines = m.split("\n").reverse
+        end
+        unless irb_bug
+          lines = lines.map { |l| @context.workspace.filter_backtrace(l) }.compact
+          if lines.size > @context.back_trace_limit
+            omit = lines.size - @context.back_trace_limit
+            lines = lines[0..(@context.back_trace_limit - 1)]
+            lines << "\t... %d levels..." % omit
           end
-          lines = lines.reverse if order == :bottom
-          lines.map{ |l| l + "\n" }.join
-        }
-        # The "<top (required)>" in "(irb)" may be the top level of IRB so imitate the main object.
-        message = message.gsub(/\(irb\):(?<num>\d+):in `<(?<frame>top \(required\))>'/)  { "(irb):#{$~[:num]}:in `<main>'" }
-        puts message
+        end
+        lines = lines.reverse if order == :bottom
+        lines.map{ |l| l + "\n" }.join
+      }
+      # The "<top (required)>" in "(irb)" may be the top level of IRB so imitate the main object.
+      message = message.gsub(/\(irb\):(?<num>\d+):in `<(?<frame>top \(required\))>'/) { "(irb):#{$~[:num]}:in `<main>'" }
+      puts message
+      puts 'Maybe IRB bug!' if irb_bug
+    rescue Exception => handler_exc
+      begin
+        puts exc.inspect
+        puts "backtraces are hidden because #{handler_exc} was raised when processing them"
+      rescue Exception
+        puts 'Uninspectable exception occurred'
       end
-      print "Maybe IRB bug!\n" if irb_bug
     end
 
     # Evaluates the given block using the given +path+ as the Context#irb_path
@@ -855,11 +860,12 @@ module IRB
           end
         end
       end
+
       if multiline_p && @context.newline_before_multiline_output?
-        printf @context.return_format, "\n#{str}"
-      else
-        printf @context.return_format, str
+        str = "\n" + str
       end
+
+      Pager.page_content(format(@context.return_format, str), retain_content: true)
     end
 
     # Outputs the local variables to this current session, including
@@ -926,9 +932,11 @@ module IRB
         when "N"
           @context.irb_name
         when "m"
-          truncate_prompt_main(@context.main.to_s)
+          main_str = @context.main.to_s rescue "!#{$!.class}"
+          truncate_prompt_main(main_str)
         when "M"
-          truncate_prompt_main(@context.main.inspect)
+          main_str = @context.main.inspect rescue "!#{$!.class}"
+          truncate_prompt_main(main_str)
         when "l"
           ltype
         when "i"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - aycabta
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -70,6 +70,7 @@ files:
 - lib/irb/cmd/edit.rb
 - lib/irb/cmd/finish.rb
 - lib/irb/cmd/help.rb
+- lib/irb/cmd/history.rb
 - lib/irb/cmd/info.rb
 - lib/irb/cmd/irb_info.rb
 - lib/irb/cmd/load.rb
@@ -118,11 +119,6 @@ files:
 - lib/irb/ruby_logo.aa
 - lib/irb/source_finder.rb
 - lib/irb/statement.rb
-- lib/irb/type_completion/completor.rb
-- lib/irb/type_completion/methods.rb
-- lib/irb/type_completion/scope.rb
-- lib/irb/type_completion/type_analyzer.rb
-- lib/irb/type_completion/types.rb
 - lib/irb/version.rb
 - lib/irb/workspace.rb
 - lib/irb/ws-for-case-2.rb
@@ -152,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).

data/lib/irb/type_completion/completor.rb

@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-
-require 'prism'
-require 'irb/completion'
-require_relative 'type_analyzer'
-
-module IRB
-  module TypeCompletion
-    class Completor < BaseCompletor # :nodoc:
-      HIDDEN_METHODS = %w[Namespace TypeName] # defined by rbs, should be hidden
-
-      class << self
-        attr_accessor :last_completion_error
-      end
-
-      def inspect
-        name = 'TypeCompletion::Completor'
-        prism_info = "Prism: #{Prism::VERSION}"
-        if Types.rbs_builder
-          "#{name}(#{prism_info}, RBS: #{RBS::VERSION})"
-        elsif Types.rbs_load_error
-          "#{name}(#{prism_info}, RBS: #{Types.rbs_load_error.inspect})"
-        else
-          "#{name}(#{prism_info}, RBS: loading)"
-        end
-      end
-
-      def completion_candidates(preposing, target, _postposing, bind:)
-        @preposing = preposing
-        verbose, $VERBOSE = $VERBOSE, nil
-        code = "#{preposing}#{target}"
-        @result = analyze code, bind
-        name, candidates = candidates_from_result(@result)
-
-        all_symbols_pattern = /\A[ -\/:-@\[-`\{-~]*\z/
-        candidates.map(&:to_s).select { !_1.match?(all_symbols_pattern) && _1.start_with?(name) }.uniq.sort.map do
-          target + _1[name.size..]
-        end
-      rescue SyntaxError, StandardError => e
-        Completor.last_completion_error = e
-        handle_error(e)
-        []
-      ensure
-        $VERBOSE = verbose
-      end
-
-      def doc_namespace(preposing, matched, postposing, bind:)
-        name = matched[/[a-zA-Z_0-9]*[!?=]?\z/]
-        method_doc = -> type do
-          type = type.types.find { _1.all_methods.include? name.to_sym }
-          case type
-          when Types::SingletonType
-            "#{Types.class_name_of(type.module_or_class)}.#{name}"
-          when Types::InstanceType
-            "#{Types.class_name_of(type.klass)}##{name}"
-          end
-        end
-        call_or_const_doc = -> type do
-          if name =~ /\A[A-Z]/
-            type = type.types.grep(Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
-            type.module_or_class == Object ? name : "#{Types.class_name_of(type.module_or_class)}::#{name}" if type
-          else
-            method_doc.call(type)
-          end
-        end
-
-        value_doc = -> type do
-          return unless type
-          type.types.each do |t|
-            case t
-            when Types::SingletonType
-              return Types.class_name_of(t.module_or_class)
-            when Types::InstanceType
-              return Types.class_name_of(t.klass)
-            end
-          end
-          nil
-        end
-
-        case @result
-        in [:call_or_const, type, _name, _self_call]
-          call_or_const_doc.call type
-        in [:const, type, _name, scope]
-          if type
-            call_or_const_doc.call type
-          else
-            value_doc.call scope[name]
-          end
-        in [:gvar, _name, scope]
-          value_doc.call scope["$#{name}"]
-        in [:ivar, _name, scope]
-          value_doc.call scope["@#{name}"]
-        in [:cvar, _name, scope]
-          value_doc.call scope["@@#{name}"]
-        in [:call, type, _name, _self_call]
-          method_doc.call type
-        in [:lvar_or_method, _name, scope]
-          if scope.local_variables.include?(name)
-            value_doc.call scope[name]
-          else
-            method_doc.call scope.self_type
-          end
-        else
-        end
-      end
-
-      def candidates_from_result(result)
-        candidates = case result
-        in [:require, name]
-          retrieve_files_to_require_from_load_path
-        in [:require_relative, name]
-          retrieve_files_to_require_relative_from_current_dir
-        in [:call_or_const, type, name, self_call]
-          ((self_call ? type.all_methods : type.methods).map(&:to_s) - HIDDEN_METHODS) | type.constants
-        in [:const, type, name, scope]
-          if type
-            scope_constants = type.types.flat_map do |t|
-              scope.table_module_constants(t.module_or_class) if t.is_a?(Types::SingletonType)
-            end
-            (scope_constants.compact | type.constants.map(&:to_s)).sort
-          else
-            scope.constants.sort | ReservedWords
-          end
-        in [:ivar, name, scope]
-          ivars = scope.instance_variables.sort
-          name == '@' ? ivars + scope.class_variables.sort : ivars
-        in [:cvar, name, scope]
-          scope.class_variables
-        in [:gvar, name, scope]
-          scope.global_variables
-        in [:symbol, name]
-          Symbol.all_symbols.map { _1.inspect[1..] }
-        in [:call, type, name, self_call]
-          (self_call ? type.all_methods : type.methods).map(&:to_s) - HIDDEN_METHODS
-        in [:lvar_or_method, name, scope]
-          scope.self_type.all_methods.map(&:to_s) | scope.local_variables | ReservedWords
-        else
-          []
-        end
-        [name || '', candidates]
-      end
-
-      def analyze(code, binding = Object::TOPLEVEL_BINDING)
-        # Workaround for https://github.com/ruby/prism/issues/1592
-        return if code.match?(/%[qQ]\z/)
-
-        ast = Prism.parse(code, scopes: [binding.local_variables]).value
-        name = code[/(@@|@|\$)?\w*[!?=]?\z/]
-        *parents, target_node = find_target ast, code.bytesize - name.bytesize
-        return unless target_node
-
-        calculate_scope = -> { TypeAnalyzer.calculate_target_type_scope(binding, parents, target_node).last }
-        calculate_type_scope = ->(node) { TypeAnalyzer.calculate_target_type_scope binding, [*parents, target_node], node }
-
-        case target_node
-        when Prism::StringNode, Prism::InterpolatedStringNode
-          call_node, args_node = parents.last(2)
-          return unless call_node.is_a?(Prism::CallNode) && call_node.receiver.nil?
-          return unless args_node.is_a?(Prism::ArgumentsNode) && args_node.arguments.size == 1
-
-          case call_node.name
-          when :require
-            [:require, name.rstrip]
-          when :require_relative
-            [:require_relative, name.rstrip]
-          end
-        when Prism::SymbolNode
-          if parents.last.is_a? Prism::BlockArgumentNode # method(&:target)
-            receiver_type, _scope = calculate_type_scope.call target_node
-            [:call, receiver_type, name, false]
-          else
-            [:symbol, name] unless name.empty?
-          end
-        when Prism::CallNode
-          return [:lvar_or_method, name, calculate_scope.call] if target_node.receiver.nil?
-
-          self_call = target_node.receiver.is_a? Prism::SelfNode
-          op = target_node.call_operator
-          receiver_type, _scope = calculate_type_scope.call target_node.receiver
-          receiver_type = receiver_type.nonnillable if op == '&.'
-          [op == '::' ? :call_or_const : :call, receiver_type, name, self_call]
-        when Prism::LocalVariableReadNode, Prism::LocalVariableTargetNode
-          [:lvar_or_method, name, calculate_scope.call]
-        when Prism::ConstantReadNode, Prism::ConstantTargetNode
-          if parents.last.is_a? Prism::ConstantPathNode
-            path_node = parents.last
-            if path_node.parent # A::B
-              receiver, scope = calculate_type_scope.call(path_node.parent)
-              [:const, receiver, name, scope]
-            else # ::A
-              scope = calculate_scope.call
-              [:const, Types::SingletonType.new(Object), name, scope]
-            end
-          else
-            [:const, nil, name, calculate_scope.call]
-          end
-        when Prism::GlobalVariableReadNode, Prism::GlobalVariableTargetNode
-          [:gvar, name, calculate_scope.call]
-        when Prism::InstanceVariableReadNode, Prism::InstanceVariableTargetNode
-          [:ivar, name, calculate_scope.call]
-        when Prism::ClassVariableReadNode, Prism::ClassVariableTargetNode
-          [:cvar, name, calculate_scope.call]
-        end
-      end
-
-      def find_target(node, position)
-        location = (
-          case node
-          when Prism::CallNode
-            node.message_loc
-          when Prism::SymbolNode
-            node.value_loc
-          when Prism::StringNode
-            node.content_loc
-          when Prism::InterpolatedStringNode
-            node.closing_loc if node.parts.empty?
-          end
-        )
-        return [node] if location&.start_offset == position
-
-        node.compact_child_nodes.each do |n|
-          match = find_target(n, position)
-          next unless match
-          match.unshift node
-          return match
-        end
-
-        [node] if node.location.start_offset == position
-      end
-
-      def handle_error(e)
-      end
-    end
-  end
-end

data/lib/irb/type_completion/methods.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module IRB
-  module TypeCompletion
-    module Methods
-      OBJECT_SINGLETON_CLASS_METHOD = Object.instance_method(:singleton_class)
-      OBJECT_INSTANCE_VARIABLES_METHOD = Object.instance_method(:instance_variables)
-      OBJECT_INSTANCE_VARIABLE_GET_METHOD = Object.instance_method(:instance_variable_get)
-      OBJECT_CLASS_METHOD = Object.instance_method(:class)
-      MODULE_NAME_METHOD = Module.instance_method(:name)
-    end
-  end
-end