Only show one level of namespace when completing class names

Author: drbrain

History.txt

@@ -4,11 +4,13 @@
   * RDoc::RDoc#generate was added to allow multiple generators to be used with
     a set of parsed file info.
   * RDoc::Options#finish can be called multiple times now.
+  * `ri -i` only shows one level of namespace when completing class names.
 * Bug fixes
   * Remove windows-specific test for test_check_files, it is too hard to do.
     Ruby commit r30811 by Usaku Nakamura.
   * Remove unnecessary (and wrong) platform-dependent hacks.  Ruby commit
     r30829 by Usaku Nakamura.
+  * Completing via Array#[<tab> in `ri -i` no longer crashes.
 
 === 3.5.3 / 2010-02-06
 

lib/rdoc/ri/driver.rb

@@ -524,7 +524,8 @@ def complete name
     klass_name = method ? name : klass
 
     if name !~ /#|\./ then
-      completions.push(*klasses.grep(/^#{klass_name}/))
+      completions = klasses.grep(/^#{klass_name}[^:]*$/)
+      completions.concat klasses.grep(/^#{name}[^:]*$/) if name =~ /::$/
     elsif selector then
       completions << klass if classes.key? klass
     elsif classes.key? klass_name then
@@ -910,7 +911,7 @@ def list_methods_matching name
         methods = store.instance_methods[ancestor]
 
         if methods then
-          matches = methods.grep(/^#{method}/)
+          matches = methods.grep(/^#{Regexp.escape method.to_s}/)
 
           matches = matches.map do |match|
             "#{klass}##{match}"
@@ -924,7 +925,7 @@ def list_methods_matching name
         methods = store.class_methods[ancestor]
 
         next unless methods
-        matches = methods.grep(/^#{method}/)
+        matches = methods.grep(/^#{Regexp.escape method.to_s}/)
 
         matches = matches.map do |match|
           "#{klass}::#{match}"

test/test_rdoc_ri_driver.rb

@@ -249,7 +249,7 @@ def test_complete
 
     @driver.stores = [store]
 
-    assert_equal %w[Foo Foo::Bar], @driver.complete('F')
+    assert_equal %w[Foo         ], @driver.complete('F')
     assert_equal %w[    Foo::Bar], @driver.complete('Foo::B')
 
     assert_equal %w[Foo#Bar],           @driver.complete('Foo#'),  'Foo#'
@@ -269,7 +269,7 @@ def test_complete_ancestor
   def test_complete_classes
     util_store
 
-    assert_equal %w[Foo   Foo::Bar Foo::Baz], @driver.complete('F')
+    assert_equal %w[Foo                    ], @driver.complete('F')
     assert_equal %w[Foo:: Foo::Bar Foo::Baz], @driver.complete('Foo::')
     assert_equal %w[      Foo::Bar Foo::Baz], @driver.complete('Foo::B')
   end
@@ -278,7 +278,8 @@ def test_complete_multistore
     util_multi_store
 
     assert_equal %w[Bar], @driver.complete('B')
-    assert_equal %w[Foo Foo::Bar Foo::Baz], @driver.complete('F')
+    assert_equal %w[Foo], @driver.complete('F')
+    assert_equal %w[Foo::Bar Foo::Baz], @driver.complete('Foo::B')
   end
 
   def test_display
@@ -603,6 +604,24 @@ def test_list_methods_matching
                  @driver.list_methods_matching('Foo::Bar.')
   end
 
+  def test_list_methods_matching_regexp
+    util_store
+
+    index = RDoc::AnyMethod.new nil, '[]'
+    @cFoo.add_method index
+    @store.save_method @cFoo, index
+
+    c_index = RDoc::AnyMethod.new nil, '[]'
+    c_index.singleton = true
+    @cFoo.add_method c_index
+    @store.save_method @cFoo, c_index
+
+    @store.save_cache
+
+    assert_equal %w[Foo#[]], @driver.list_methods_matching('Foo#[]')
+    assert_equal %w[Foo::[]], @driver.list_methods_matching('Foo::[]')
+  end
+
   def test_load_method
     util_store