Changeset e711ca7 for perl/lib

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:

4fbc7f5

Parents:

2b37be2

git-author:

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

git-committer:

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

Message:

complete_flags: Don't complete options after --.

File:

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

perl/lib/BarnOwl/Completion/Util.pm

@@ -19 +19 @@
     my $flag = undef;
 
+    my $word = 0;
+    my $optsdone = 0;
+
     while($idx < $ctx->word) {
         my $word = $ctx->words->[$idx];
-        BarnOwl::debug("[completing] idx=$idx word=$word ctx->word=@{[$ctx->word]}");
         if($flag) {
             undef $flag;
         } elsif($word =~ m{^--}) {
-            last if $word eq '--';
+            if($word eq '--') {
+                $optsdone = 1;
+                last;
+            }
             $flag = $word if(exists $args->{$word});
         } elsif ($word =~ m{^-}) {
@@ -35 +40 @@
 
     if($flag) {
-        BarnOwl::debug("END: flag=$flag");
         my $c = $args->{$flag};
         if($c) {
@@ -42 +46 @@
         return;
     } else {
-        return (@$no_args,
-                keys %$args,
+        return ($optsdone ? () : (@$no_args, keys %$args),
                 $default ? ($default->($ctx)) : ());
     }