Changeset 4fbc7f5

Timestamp:

Jul 29, 2009, 9:41:44 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

747d6a5

Parents:

e711ca7

git-author:

Nelson Elhage <nelhage@mit.edu> (07/29/09 21:30:43)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/29/09 21:41:44)

Message:

complete_flags: Pass the completer the argument number being completed

This is the index of the argument (not flag or flag option) being
completed, for convenience.

Files:

• perl/lib/BarnOwl/Completion/Util.pm (modified) (3 diffs)
• t/completion.t (modified) (3 diffs)

perl/lib/BarnOwl/Completion/Util.pm

@@ -19 +19 @@
     my $flag = undef;
 
-    my $word = 0;
+    my $argct = 0;
     my $optsdone = 0;
 
@@ -35 +35 @@
             $word = "-" . substr($word, -1);
             $flag = $word if(exists $args->{$word});
+        } else {
+            $argct++;
         }
         $idx++;
@@ -47 +49 @@
     } else {
         return ($optsdone ? () : (@$no_args, keys %$args),
-                $default ? ($default->($ctx)) : ());
+                $default ? ($default->($ctx, $argct)) : ());
     }
 }

t/completion.t

@@ -146 +146 @@
     my $after = shift;
     my $words = shift;
+    my $complete = shift || \&complete_zwrite;
     
     my $ctx = BarnOwl::Completion::Context->new($before, $after);
@@ -151 +152 @@
     local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-    my @got = complete_zwrite($ctx);
+    my @got = $complete->($ctx);
     is_deeply([sort @got], [sort @$words]);
 }
@@ -170 +171 @@
               [qw(nelhage asedeno geofft)]);
 
+sub complete_word {
+    my $ctx = shift;
+    return complete_flags($ctx,
+                          [qw(-a -b -c)],
+                          {
+                              "-d" => sub {qw(some words for completing)},
+                          },
+                          sub {$_[1]});
+}
+
+test_complete('cmd -a -d foo -c hello ','',
+              [qw(-a -b -c -d 1)], \&complete_word);
+
+test_complete('cmd -a -d foo -c ','',
+              [qw(-a -b -c -d 0)], \&complete_word);
+
 1;