Improved ri --interactive

Author: drbrain

History.txt

@@ -3,16 +3,17 @@
 * X Major Enhancements
   * RDoc now automatically loads rdoc/discover.rb files from installed gems.
   * RDoc now uses Michael Granger's Darkfish generator by default.
-  * Various RDoc speedups by Hongli Lai.  Patches #22555, #22556, #22557,
-    #22562, #22565.
-  * Moved unmaintained CHM generator to it's own package.
-  * Moved unmaintained extra HTML templates to their own package.
-  * Removed experimental texinfo generator.
+  * Various rdoc generation speedups by Hongli Lai.  Patches #22555, #22556,
+    #22557, #22562, #22565.
 
 * Y Minor Enhancements
   * Added a space after the commas in ri class method lists.  RubyForge
     enhancement #22182.
+  * Improved ri --interactive
   * Generators can now override generated file locations.
+  * Moved unmaintained CHM generator to it's own package.
+  * Moved unmaintained extra HTML templates to their own package.
+  * Removed experimental texinfo generator.
   * Converted to minitest.
 
 * Z Bug Fixes

lib/rdoc/ri/display.rb

@@ -1,15 +1,5 @@
 require 'rdoc/ri'
 
-# readline support might not be present, so be careful
-# when requiring it.
-begin
-  require('readline')
-  require('abbrev')
-  CAN_USE_READLINE = true # HACK use an RDoc namespace constant
-rescue LoadError
-  CAN_USE_READLINE = false
-end
-
 ##
 # This is a kind of 'flag' module. If you want to write your own 'ri' display
 # module (perhaps because you're writing an IDE), you write a class which
@@ -42,6 +32,8 @@ class RDoc::RI::DefaultDisplay
 
   include RDoc::RI::Display
 
+  attr_reader :formatter
+
   def initialize(formatter, width, use_stdout, output = $stdout)
     @use_stdout = use_stdout
     @formatter = formatter.new output, width, "     "
@@ -126,51 +118,6 @@ def display_class_info(klass)
   # the methods.
 
   def get_class_method_choice(method_map)
-    if CAN_USE_READLINE then
-      # prepare abbreviations for tab completion
-      abbreviations = method_map.keys.abbrev
-      Readline.completion_proc = proc do |string|
-        abbreviations.values.uniq.grep(/^#{string}/)
-      end
-    end
-
-    @formatter.raw_print_line "\nEnter the method name you want.\n"
-    @formatter.raw_print_line "Class methods can be preceeded by '::' and instance methods by '#'.\n"
-
-    if CAN_USE_READLINE
-      @formatter.raw_print_line "You can use tab to autocomplete.\n"
-      @formatter.raw_print_line "Enter a blank line to exit.\n"
-
-      choice_string = Readline.readline(">> ").strip
-    else
-      @formatter.raw_print_line "Enter a blank line to exit.\n"
-      @formatter.raw_print_line ">> "
-      choice_string = $stdin.gets.strip
-    end
-
-    if choice_string == ''
-      return nil
-    else
-      class_or_instance = method_map[choice_string]
-
-      if class_or_instance
-        # If the user's choice is not preceeded by a '::' or a '#', figure
-        # out whether they want a class or an instance method and decorate
-        # the choice appropriately.
-        if(choice_string =~ /^[a-zA-Z]/)
-          if(class_or_instance == :class)
-            choice_string = "::#{choice_string}"
-          else
-            choice_string = "##{choice_string}"
-          end
-        end
-
-        return choice_string
-      else
-        @formatter.raw_print_line "No method matched '#{choice_string}'.\n"
-        return nil
-      end
-    end
   end
 
   ##
@@ -326,7 +273,7 @@ def display_params(method)
   # List the classes in +classes+.
 
   def list_known_classes(classes)
-    if classes.empty?
+    if classes.empty? then
       warn_no_database
     else
       page do