Changeset 1f92f39 for perl/lib

Timestamp:

Aug 5, 2017, 5:54:22 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

268c7e8, e9f3e38, 6deb32b

Parents:

81e93c3

git-author:

David Benjamin <davidben@mit.edu> (02/25/13 18:27:35)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/05/17 17:54:22)

Message:

Revamp set/unset completion

- unset <tab> only completes takes_on_off variables
- Variables with validsettings <path> complete as file paths
- Variables with validsettings a comma-separated list of options
  complete appropriately.

File:

• perl/lib/BarnOwl/Complete/Client.pm (modified) (1 diff)

perl/lib/BarnOwl/Complete/Client.pm

@@ -146 +146 @@
 sub complete_set {
     my $ctx = shift;
+    my $is_unset = ($ctx->words->[0] eq "unset");
+
+    # Shift away the -q if seen.
+    my $seen_q = 0;
+    if ($ctx->word > 1 && $ctx->words->[1] eq "-q") {
+        $seen_q = 1;
+        $ctx = $ctx->shift_words(1);
+    }
+
+    # First argument is the variable.
     if ($ctx->word == 1) {
-        return ("-q", complete_variable());
-    }
-    if ($ctx->word == 2 && $ctx->words->[1] eq "-q") {
-        return complete_variable();
+        my @vars = complete_variable();
+        if ($is_unset) {
+            # Only complete the variables which are unsettable.
+            @vars = grep { BarnOwl::get_variable_info($_)->{takes_on_off} } @vars;
+        }
+        unshift(@vars, "-q") unless $seen_q;
+        return @vars;
+    }
+    # For set, second argument is the value.
+    if (!$is_unset && $ctx->word == 2) {
+        # Parse what we can out of validsettings.
+        my $info;
+        eval { $info = BarnOwl::get_variable_info($ctx->words->[1]) };
+        return if $@;
+        if ($info->{validsettings} eq "<path>") {
+            return complete_file($ctx->words->[2]);
+        } elsif ($info->{validsettings} !~ /^<.*>$/) {
+            # Assume it's a comma-separated list of values;
+            return split(",", $info->{validsettings});
+        }
     }
     return;
-}
-sub complete_set_args {
-    my $ctx = shift;
-    my $arg = shift;
-    return if $arg;
-    return complete_variable();
 }