Changeset e97c5d05

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:

b06a888

Parents:

9e5b5fd

git-author:

Nelson Elhage <nelhage@mit.edu> (09/14/09 09:57:55)

git-committer:

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

Message:

Implement a shift_words method on completion contexts.

This allows completion methods to easily pass on the remainder of a
command-line to another completer if appropriate.

Files:

• perl/lib/BarnOwl/Completion/Context.pm (modified) (2 diffs)
• t/completion.t (modified) (4 diffs)

perl/lib/BarnOwl/Completion/Context.pm

@@ -40 +40 @@
 
 use base qw(Class::Accessor::Fast);
+use Carp qw(croak);
 
 __PACKAGE__->mk_ro_accessors(qw(line point words word word_point
@@ -64 +65 @@
        };
     return bless($self, $class);
+}
+
+=head2 shift_words N
+
+Returns a new C<Context> object, with the leading C<N> words
+stripped. All fields are updated as appopriate. If C<N> > C<<
+$self->word >>, C<croak>s with an error message.
+
+=cut
+
+sub shift_words {
+    my $self = shift;
+    my $n    = shift;
+
+    if($n > $self->word) {
+        croak "Context::shift: Unable to shift $n words";
+    }
+
+    my $before = substr($self->line, 0, $self->point);
+    my $after  = substr($self->line, $self->point);
+
+    return BarnOwl::Completion::Context->new(BarnOwl::skiptokens($before, $n),
+                                             $after);
 }
 

t/completion.t

@@ -20 +20 @@
     my $after_point = shift;
     
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    is($ctx->line, $before_point . $after_point);
+    is($ctx->point, length $before_point);
+
+    test_ctx($ctx, @_);
+}
+
+sub test_ctx {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $ctx = shift;
+
     my $words = shift;
     my $word = shift;
@@ -27 +40 @@
     my $word_end   = shift;
 
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-
-    is($ctx->line, $before_point . $after_point);
-    is($ctx->point, length $before_point);
     is_deeply($ctx->words, $words);
     if (defined($word)) {
@@ -41 +49 @@
 }
 
+sub test_shift {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $before_point = shift;
+    my $after_point = shift;
+    my $shift = shift;
+    
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    $ctx = $ctx->shift_words($shift);
+
+    test_ctx($ctx, @_);
+}
+
 
 isa_ok(BarnOwl::Completion::Context->new('Hello, W', 'orld'), 'BarnOwl::Completion::Context');
@@ -108 +130 @@
               1, -1, 7, 12);
 
-
+## Test Context::shift
+SKIP: {
+    skip "Can't yet test code that depends on perlglue.xs", 4;
+    test_shift('lorem ipsum dolor ', 'sit amet', 0,
+               [qw(lorem ipsum dolor sit amet)],
+               3, 0, 18, 21);
+
+    test_shift('lorem ipsum dolor ', 'sit amet', 1,
+               [qw(lorem ipsum dolor sit amet)],
+               2, 0, 12, 15);
+
+    test_shift('lorem ipsum dolor ', 'sit amet', 2,
+               [qw(lorem ipsum dolor sit amet)],
+               1, 0, 6, 9);
+
+    test_shift('lorem ipsum dolor ', 'sit amet', 3,
+               [qw(lorem ipsum dolor sit amet)],
+               0, 0, 0, 3);
+
+}
 ## Test common_prefix