Changeset 69c27e6

Timestamp:

Sep 30, 2009, 1:02:36 AM (15 years ago)

Author:

David Benjamin <davidben@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:

42ad917

Parents:

a3a9eb7

git-author:

David Benjamin <davidben@mit.edu> (09/23/09 01:07:46)

git-committer:

David Benjamin <davidben@mit.edu> (09/30/09 01:02:36)

Message:

Don't suggest repeated flags in complete_flags

For most commands, it doesn't make sense to provide an option twice, so
we avoid offering it again as a completion. Note: if the user happened
to pass the flag again, we'll still attempt to complete it.

To disable, use the repeat_flags keyword option. Tests update, with
complete_zwrite testing non-repeating and complete_word testing the old
behavior.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

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

perl/lib/BarnOwl/Completion/Util.pm

@@ -24 +24 @@
     my $optsdone = 0;
 
+    my %flags_seen;
+
     while($idx < $ctx->word) {
         my $word = $ctx->words->[$idx];
@@ -37 +39 @@
         } elsif ($word =~ m{^-}) {
             $word = "-" . substr($word, -1);
+            $flags_seen{$word} = 1; # record flag
             $flag = $word if(exists $args->{$word});
         } else {
@@ -58 +61 @@
         return;
     } else {
-        return ($optsdone ? () : (@$no_args, keys %$args),
-                $default ? ($default->($ctx, $argct)) : ());
+        my @opts = $optsdone ? () : (@$no_args, keys %$args);
+        # filter out flags we've seen if needbe
+        @opts = grep {!$flags_seen{$_}} @opts unless $options{repeat_flags};
+        return (@opts, $default ? ($default->($ctx, $argct)) : ());
     }
 }

t/completion.t

@@ -204 +204 @@
 
 test_complete('zwrite -c nelhage ', '',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage ', '-',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage -- ', '',
@@ -219 +219 @@
                               "-d" => sub {qw(some words for completing)},
                           },
-                          sub {$_[1]});
+                          sub {$_[1]},
+                          repeat_flags => 1);
 }