Changeset 5368d75 for perl

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:

0fee298

Parents:

6e48560

git-author:

Nelson Elhage <nelhage@mit.edu> (07/25/09 23:03:45)

git-committer:

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

Message:

Implement tab completion by replacing the entire word.

Replace the entire word, instead of just appending the new text. Among
other things, this lets us deal with expansions that need to be quoted
much better.

File:

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

perl/lib/BarnOwl/Completion.pm

@@ -15 +15 @@
 
 use BarnOwl::Completion::Context;
-use BarnOwl::Editwin qw(text_before_point text_after_point);
+use BarnOwl::Editwin qw(save_excursion text_before_point text_after_point
+                        point_move replace_region);
 
 use List::Util qw(max first);
@@ -32 +33 @@
     my $word = $ctx->words->[$ctx->word];
 
-    if($prefix && $prefix ne $word) {
-        if(scalar @words == 1) {
-            $prefix .= ' ';
-        }
-        
-        BarnOwl::Editwin::insert_text(substr($prefix, length($word)));
+    if($prefix) {
+        insert_completion($ctx, $prefix, scalar @words == 1);
     }
 
     if(scalar @words > 1) {
         show_completions(@words);
+    } else {
+        BarnOwl::message('');
+    }
+}
+
+sub insert_completion {
+    my $ctx = shift;
+    my $completion = shift;
+    my $unique = shift;
+
+    save_excursion {
+        point_move($ctx->word_start - $ctx->point);
+        BarnOwl::Editwin::set_mark();
+        point_move($ctx->word_end - $ctx->word_start);
+        replace_region(BarnOwl::quote($completion));
+    };
+    if($unique && $ctx->word == (scalar @{$ctx->words} - 1)) {
+        save_excursion {
+            BarnOwl::Editwin::set_mark();
+            replace_region(' ');
+        };
+        point_move(1);
     }
 }