Changeset 13614e7

Timestamp:

Jul 27, 2009, 11:23:57 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:

d7bcff8

Parents:

8eac1a5

git-author:

Nelson Elhage <nelhage@mit.edu> (07/25/09 00:37:50)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/27/09 23:23:57)

Message:

Context.pm: Return the boundaries of the current word.

We need this in order to be able to replace it when completing.

Files:

• perl/lib/BarnOwl/Completion/Context.pm (modified) (6 diffs)
• t/completion.t (modified) (3 diffs)

perl/lib/BarnOwl/Completion/Context.pm

@@ -41 +41 @@
 use base qw(Class::Accessor::Fast);
 
-__PACKAGE__->mk_ro_accessors(qw(line point words word word_point));
+__PACKAGE__->mk_ro_accessors(qw(line point words word word_point
+                                word_start word_end));
 
 sub new {
@@ -50 +51 @@
     my $line  = $before_point . $after_point;
     my $point = length ($before_point);
-    my ($words, $word, $word_point) = tokenize($line, $point);
+    my ($words, $word, $word_point,
+        $word_start, $word_end) = tokenize($line, $point);
 
     my $self = {
@@ -57 +59 @@
         words => $words,
         word  => $word,
-        word_point => $word_point
+        word_point => $word_point,
+        word_start => $word_start,
+        word_end   => $word_end
        };
     return bless($self, $class);
@@ -89 +93 @@
     my @words = ();
     my $cword = 0;
+    my $cword_start;
+    my $cword_end;
     my $word_point;
 
     my $word = '';
+    my $wstart = 0;
     my $skipped = 0;
 
@@ -114 +121 @@
             push @words, $word;
             $cword++ unless $wend >= $point;
-            if ($wend >= $point && !defined($word_point)) {
+            if(($wend >= $point) && !defined($word_point)) {
                 $word_point = length($word) - ($wend - $point) + $skipped;
+                $cword_start = $wstart;
+                $cword_end   = $wend;
             }
             $word = '';
+            $wstart = pos($line);
             $skipped = 0;
         }
@@ -124 +134 @@
     if(length($word)) { die("Internal error, leftover=$word"); }
 
-    $word_point = 0 unless defined($word_point);
+    unless(defined($word_point)) {
+        $word_point = 0;
+        $cword_start = $cword_end = 0;
+    }
 
-    return (\@words, $cword, $word_point);
+    return (\@words, $cword, $word_point, $cword_start, $cword_end);
 }
 

t/completion.t

@@ -24 +24 @@
     my $word_point = shift;
 
+    my $word_start = shift;
+    my $word_end   = shift;
+
     my $ctx = BarnOwl::Completion::Context->new($before_point,
                                                 $after_point);
@@ -33 +36 @@
         is($ctx->word, $word, "Correct current word.");
         is($ctx->word_point, $word_point, "Correct point within word.");
+        is($ctx->word_start, $word_start, "Correct start of word");
+        is($ctx->word_end,   $word_end, "Correct end of word");
     }
 }
@@ -41 +46 @@
 no warnings 'qw';
 test_tokenize('Hello, W', 'orld',
-              [qw(Hello, World)], 1, 1);
+              [qw(Hello, World)], 1, 1, 7, 12);
 
 test_tokenize('Hello, World', '',
-              [qw(Hello, World)], 1, 5);
+              [qw(Hello, World)], 1, 5, 7, 12);
 
 test_tokenize('', '',
-              [qw()], 0, 0);
+              [qw()], 0, 0, 0, 0);
 
 test_tokenize('Hello', 'World',
-              [qw(HelloWorld)], 0, 5);
+              [qw(HelloWorld)], 0, 5, 0, 10);
 
 test_tokenize('lorem ipsum dolor ', 'sit amet',
-              [qw(lorem ipsum dolor sit amet)], 3, 0);
+              [qw(lorem ipsum dolor sit amet)],
+              3, 0, 18, 21);
 
 test_tokenize(q{error "ls -l failed"}, q{},
-              ['error', 'ls -l failed'], 1, 12);
+              ['error', 'ls -l failed'],
+              1, 12, 6, 20);
 
 test_tokenize(q{"a long"' word'}, q{},
               ['a long word']);
 
-test_tokenize(q{"'"}, q{}, [q{'}]);
+test_tokenize(q{"'"}, q{}, [q{'}], 0, 1, 0, 3);
 
 test_tokenize(q{"Hello, }, q{World"},
-              [q{Hello, World}], 0, 7);
+              [q{Hello, World}],
+              0, 7, 0, 14);
 
 test_tokenize(q{But 'Hello, }, q{World'},
-              ['But', q{Hello, World}], 1, 7);
+              ['But', q{Hello, World}],
+              1, 7, 4, 18);
 
 test_tokenize(q{But "Hello, }, q{World"''''''""},
-              ['But', q{Hello, World}], 1, 7);
+              ['But', q{Hello, World}],
+              1, 7, 4, 26);
 
 test_tokenize(q{}, q{''Hello},
-              ['Hello'], 0, 0);
+              ['Hello'],
+              0, 0, 0, 7);
 
 test_tokenize(q{"Hello, }, q{World},
-              [q{Hello, World}], 0, 7);
+              [q{Hello, World}],
+              0, 7, 0, 13);
 
 test_tokenize(q{Hello    }, q{World},
-              [qw{Hello World}], 1, 0);
+              [qw{Hello World}],
+              1, 0, 9, 14);
 
 test_tokenize(q{Hello '' ""}, q{ World},
-              ["Hello", '', '', 'World'], 2, 0);
+              ["Hello", '', '', 'World'],
+              2, 0, 9, 11);
 
 # It's not entirely clear what we should do here. Make a test for the
 # current behavior, so we'll notice if it changes.
 test_tokenize(q{Hello }, q{ World},
-              [qw(Hello World)], 1, -1);
+              [qw(Hello World)],
+              1, -1, 7, 12);
 
 1;