Changes in perl/lib/BarnOwl/Completion.pm [48d130b:880311d]

File:

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

perl/lib/BarnOwl/Completion.pm

@@ -31 +31 @@
     my @words = get_completions($ctx);
     return unless @words;
-    my $prefix = common_prefix(@words);
+    my $prefix = common_prefix(map {completion_value($_)} @words);
 
     if($prefix) {
-        insert_completion($ctx, $prefix, scalar @words == 1);
+        insert_completion($ctx, $prefix,
+                          scalar @words == 1 && completion_done($words[0]));
     }
 
@@ -44 +45 @@
 }
 
+=head1 COMPLETIONS
+
+A COMPLETION is either a simple string, or a reference to an array
+containing two or more values.
+
+In the former case, the string use used for both the text to display,
+as well as the result of the completion, and is assumed to be a full
+completion.
+
+An arrayref completion consists of
+
+    [$display_text, $replacement_value[, $completion_done] ].
+
+$display_text will be printed in the case of ambiguous completions,
+$replacement_value will be used to substitute the value in. If there
+is only a single completion for a given word, a space will be appended
+after the completion iff $completion_done is true (or missing).
+
+=cut
+
+sub completion_text {
+    my $c = shift;
+    return $c unless ref($c) eq 'ARRAY';
+    return $c->[0];
+}
+
+sub completion_value {
+    my $c = shift;
+    return $c unless ref($c) eq 'ARRAY';
+    return $c->[1];
+}
+
+sub completion_done {
+    my $c = shift;
+    return 1 if ref($c) ne 'ARRAY' or @$c < 3;
+    return $c->[2];
+}
+
 sub insert_completion {
     my $ctx = shift;
-    my $completion = BarnOwl::quote(shift);
-    my $unique = shift;
+    my $completion = BarnOwl::quote(completion_value(shift));
+    my $done = shift;
 
-    if($unique) {
+    if($done) {
         $completion .= " ";
     }
@@ -66 +105 @@
 sub show_completions {
     my @words = @_;
-    my $all = BarnOwl::quote(@words);
+    my $all = BarnOwl::quote(map {completion_text($_)} @words);
     my $width = BarnOwl::getnumcols();
     if (length($all) > $width-1) {
@@ -98 +137 @@
         my $word = $ctx->words->[$ctx->word];
         if(exists($completers{$cmd})) {
-            return grep {$_ =~ m{^\Q$word\E}} $completers{$cmd}->($ctx);
+            return grep {completion_value($_) =~ m{^\Q$word\E}} $completers{$cmd}->($ctx);
         }
         return;