irb 1.3.6 → 1.4.1

data/lib/irb/input-method.rb

@@ -14,6 +14,7 @@ require_relative 'magic-file'
 require_relative 'completion'
 require 'io/console'
 require 'reline'
+require 'rdoc'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
@@ -264,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
@@ -294,6 +296,10 @@ module IRB
           end
         end
       Reline.dig_perfect_match_proc = IRB::InputCompletor::PerfectMatchedProc
+      Reline.autocompletion = IRB.conf[:USE_AUTOCOMPLETE]
+      if IRB.conf[:USE_AUTOCOMPLETE]
+        Reline.add_dialog_proc(:show_doc, SHOW_DOC_DIALOG, Reline::DEFAULT_DIALOG_CONTEXT)
+      end
     end
 
     def check_termination(&block)
@@ -308,6 +314,99 @@ module IRB
       @auto_indent_proc = block
     end
 
+    SHOW_DOC_DIALOG = ->() {
+      dialog.trap_key = nil
+      alt_d = [
+        [Reline::Key.new(nil, 0xE4, true)], # Normal Alt+d.
+        [27, 100], # Normal Alt+d when convert-meta isn't used.
+        [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.
+      ]
+
+      if just_cursor_moving and completion_journey_data.nil?
+        return nil
+      end
+      cursor_pos_to_render, result, pointer, autocomplete_dialog = context.pop(4)
+      return nil if result.nil? or pointer.nil? or pointer < 0
+      name = result[pointer]
+      name = IRB::InputCompletor.retrieve_completion_data(name, doc_namespace: true)
+
+      options = {}
+      options[:extra_doc_dirs] = IRB.conf[:EXTRA_DOC_DIRS] unless IRB.conf[:EXTRA_DOC_DIRS].empty?
+      driver = RDoc::RI::Driver.new(options)
+
+      if key.match?(dialog.name)
+        begin
+          driver.display_names([name])
+        rescue RDoc::RI::Driver::NotFoundError
+        end
+      end
+
+      begin
+        name = driver.expand_name(name)
+      rescue RDoc::RI::Driver::NotFoundError
+        return nil
+      rescue
+        return nil # unknown error
+      end
+      doc = nil
+      used_for_class = false
+      if not name =~ /#|\./
+        found, klasses, includes, extends = driver.classes_and_includes_and_extends_for(name)
+        if not found.empty?
+          doc = driver.class_document(name, found, klasses, includes, extends)
+          used_for_class = true
+        end
+      end
+      unless used_for_class
+        doc = RDoc::Markup::Document.new
+        begin
+          driver.add_method(doc, name)
+        rescue RDoc::RI::Driver::NotFoundError
+          doc = nil
+        rescue
+          return nil # unknown error
+        end
+      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")
+
+      y = cursor_pos_to_render.y
+      DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49')
+    }
+
     # Reads the next line from this input method.
     #
     # See IO#gets for more information.

data/lib/irb/lc/help-message

@@ -20,8 +20,15 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -W[level=2]       Same as `ruby -W`
   --context-mode n  Set n[0-4] to method to create Binding Object,
                     when new workspace was created
-  --echo            Show result(default)
+  --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
+  --noecho-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
@@ -30,6 +37,8 @@ Usage:  irb.rb [options] [programfile] [arguments]
   --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'

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

@@ -29,6 +29,8 @@ Usage:  irb.rb [options] [programfile] [arguments]
   --nosingleline    シングルラインエディタを利用しない.
   --colorize	    色付けを利用する.
   --nocolorize	    色付けを利用しない.
+  --autocomplete    オートコンプリートを利用する.
+  --noautocomplete  オートコンプリートを利用しない.
   --prompt prompt-mode/--prompt-mode prompt-mode
 		    プロンプトモードを切替えます. 現在定義されているプ
 		    ロンプトモードは, default, simple, xmp, inf-rubyが