irb 1.3.8.pre.10 → 1.3.8.pre.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64245fa0213491e1a1340223cad9978a831a4cb95c30583947d1580f781fa916
-  data.tar.gz: 971cb2a3ef3631d3489202f13e070c43966d4e981dae846ca2756248afb2285f
+  metadata.gz: 11626f5579d5c88f1358bac49d6cfb81663193cf79b19b49e5958bf930fb61de
+  data.tar.gz: 75253829683f5dee7208b964abd7ae7924867bf910fcdbba9cd9fdf4a3848751
 SHA512:
-  metadata.gz: 1547d50d86acaeeb7edc4dc0d68fd9cf2f025f82f1f7e47728d8212776506cd485dcd96c39c5b429e8b7c2f83afc1698042b976797fa2e26d4ba2b4faba7e186
-  data.tar.gz: d18b3174329d2c7f253dfcfbff40656ceaf2fd42fa603468e0bb48eba6e4057c6e5fdc06874f1d7701f5be47d072aa0aa2b024bdb7e8a80e6644041e2af5b03e
+  metadata.gz: b7faa90700c773424719934303c87ade13c38426c5a604425e9bf5921cb1e7234bd002f7179ecbe64597806b286acbff314e085e93ccb0b02ee69399bda59e77
+  data.tar.gz: 05b5f9834f71f15733c7541c66ad7a8ef32a38acdb2101d923db70810c47b4d82382ae187754eaf97931dbe0546b7767985c27a178e2883b5812638825fed376

data/irb.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5")
 
-  spec.add_dependency "reline", ">= 0.2.8.pre.10"
+  spec.add_dependency "reline", ">= 0.2.8.pre.11"
 end

data/lib/irb/context.rb

@@ -478,6 +478,8 @@ module IRB
     # Exits the current session, see IRB.irb_exit
     def exit(ret = 0)
       IRB.irb_exit(@irb, ret)
+    rescue UncaughtThrowError
+      super
     end
 
     NOPRINTING_IVARS = ["@last_value"] # :nodoc:

data/lib/irb/input-method.rb

@@ -265,7 +265,8 @@ module IRB
 
   class ReidlineInputMethod < InputMethod
     include Reline
-    # Creates a new input method object using Readline
+
+    # Creates a new input method object using Reline
     def initialize
       IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
       super
@@ -319,11 +320,6 @@ module IRB
         [Reline::Key.new(nil, 0xE4, true)], # Normal Alt+d.
         [195, 164] # The "ä" that appears when Alt+d is pressed on xterm.
       ]
-      begin
-        require 'rdoc'
-      rescue LoadError
-        return nil
-      end
 
       if just_cursor_moving and completion_journey_data.nil?
         return nil
@@ -370,14 +366,39 @@ module IRB
       end
       return nil if doc.nil?
       width = 40
+
+      right_x = cursor_pos_to_render.x + autocomplete_dialog.width
+      if right_x + width > screen_width
+        right_width = screen_width - (right_x + 1)
+        left_x = autocomplete_dialog.column - width
+        left_x = 0 if left_x < 0
+        left_width = width > autocomplete_dialog.column ? autocomplete_dialog.column : width
+        if right_width.positive? and left_width.positive?
+          if right_width >= left_width
+            width = right_width
+            x = right_x
+          else
+            width = left_width
+            x = left_x
+          end
+        elsif right_width.positive? and left_width <= 0
+          width = right_width
+          x = right_x
+        elsif right_width <= 0 and left_width.positive?
+          width = left_width
+          x = left_x
+        else # Both are negative width.
+          return nil
+        end
+      else
+        x = right_x
+      end
       formatter = RDoc::Markup::ToAnsi.new
       formatter.width = width
       dialog.trap_key = alt_d
       message = 'Press Alt+d to read the full document'
       contents = [message] + doc.accept(formatter).split("\n")
 
-      x = cursor_pos_to_render.x + autocomplete_dialog.width
-      x = autocomplete_dialog.column - width if x + width >= screen_width
       y = cursor_pos_to_render.y
       DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49')
     }

data/lib/irb/ruby-lex.rb

@@ -477,7 +477,7 @@ class RubyLex
 
   def take_corresponding_syntax_to_kw_do(tokens, index)
     syntax_of_do = nil
-    # Finding a syntax correnponding to "do".
+    # Finding a syntax corresponding to "do".
     index.downto(0) do |i|
       tk = tokens[i]
       # In "continue", the token isn't the corresponding syntax to "do".
@@ -508,7 +508,7 @@ class RubyLex
 
   def is_the_in_correspond_to_a_for(tokens, index)
     syntax_of_in = nil
-    # Finding a syntax correnponding to "do".
+    # Finding a syntax corresponding to "do".
     index.downto(0) do |i|
       tk = tokens[i]
       # In "continue", the token isn't the corresponding syntax to "do".

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.3.8.pre.10"
+  VERSION = "1.3.8.pre.11"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2021-10-03"
+  @LAST_UPDATE_DATE = "2021-10-09"
 end

data/lib/irb.rb

@@ -613,7 +613,7 @@ module IRB
         ret = conv.primitive_convert(str, dst)
         case ret
         when :invalid_byte_sequence
-          conv.insert_output(conf.primitive_errinfo[3].dump[1..-2])
+          conv.insert_output(conv.primitive_errinfo[3].dump[1..-2])
           redo
         when :undefined_conversion
           c = conv.primitive_errinfo[3].dup.force_encoding(conv.primitive_errinfo[1])
@@ -867,7 +867,7 @@ module IRB
 
       # If the expression is invalid, Ripper.sexp should return nil which will
       # result in false being returned. Any valid expression should return an
-      # s-expression where the second selement of the top level array is an
+      # s-expression where the second element of the top level array is an
       # array of parsed expressions. The first element of each expression is the
       # expression's type.
       verbose, $VERBOSE = $VERBOSE, nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.3.8.pre.10
+  version: 1.3.8.pre.11
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.pre.10
+        version: 0.2.8.pre.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.pre.10
+        version: 0.2.8.pre.11
 description: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).
 email:
 - keiju@ruby-lang.org