Fixing completion to show choices when there are more than one.

JEG2 · Nov 5, 2008 · 9994c66 · 9994c66
1 parent e365839
commit 9994c66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/highline/CHANGELOG b/highline/CHANGELOG
@@ -4,6 +4,8 @@ Below is a complete listing of changes for each revision of HighLine.
 
 == 1.5.0
 
+* Fixed a bug that would prevent Readline from showing all completions.
+  (reported by Yaohan Chen)
 * Added the ability to pass a block to HighLine#agree().
   (patch by Yaohan Chen)
 

diff --git a/highline/examples/using_readline.rb b/highline/examples/using_readline.rb
@@ -9,7 +9,7 @@
 require "highline/import"
 
 loop do
-  cmd = ask("Enter command:  ", %w{save load reset quit}) do |q|
+  cmd = ask("Enter command:  ", %w{save sample load reset quit}) do |q|
     q.readline = true
   end
   say("Executing \"#{cmd}\"...")

diff --git a/highline/lib/highline.rb b/highline/lib/highline.rb
@@ -580,8 +580,9 @@ def get_line(  )
       @output  = old_output
 
       # prep auto-completion
-      completions              = @question.selection.abbrev
-      Readline.completion_proc = lambda { |string| completions[string] }
+      Readline.completion_proc = lambda do |string|
+        @question.selection.grep(/\A#{Regexp.escape(string)}/)
+      end
 
       # work-around ugly readline() warnings
       old_verbose = $VERBOSE