Changeset 76e0e4a for perl/lib/BarnOwl/Complete/Client.pm

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:

6035008

Parents:

b06a888

git-author:

David Benjamin <davidben@mit.edu> (09/23/09 00:34:20)

git-committer:

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

Message:

Reimplement complete_filter using shift_words

Fixes bug with -c and -b appearing in completion suggestions.

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

File:

• perl/lib/BarnOwl/Complete/Client.pm (modified) (3 diffs)

perl/lib/BarnOwl/Complete/Client.pm

@@ -161 +161 @@
 }
 
-sub complete_filter_args {
-    my $ctx = shift;
-    my $arg = shift;
-    return complete_filter_name() unless $arg;
-    my $idx = 2; # skip the filter name
-    while ($idx < $ctx->word) {
-        last unless ($ctx->words->[$idx] =~ m{^-});
-        $idx += 2; # skip the flag and the argument
-    }
-    return complete_filter_expr($ctx, $idx);
-}
-
 sub complete_help {
     my $ctx = shift;
@@ -194 +182 @@
 sub complete_filter {
     my $ctx = shift;
+    # Syntax: filter FILTERNAME FLAGS EXPR
+
+    # FILTERNAME
+    return complete_filter_name() if $ctx->word == 1;
+
+    # FLAGS
+    $ctx = $ctx->shift_words(1); # complete_flags starts at the second word
     return complete_flags($ctx,
         [qw()],
@@ -200 +195 @@
            "-b" => \&complete_color,
         },
-         \&complete_filter_args
+        # EXPR
+        sub {
+            my $ctx = shift;
+            my $arg = shift;
+
+            # We pass stop_at_nonflag, so we can rewind to the start
+            my $idx = $ctx->word - $arg;
+            return complete_filter_expr($ctx, $idx);
+        },
+        stop_at_nonflag => 1
         );
 }