X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FCompletion.pm;h=e99ef09c8d54c30c5e12970cbe9fea319e597b31;hp=a9ffb0c1d12e24c01bec6c073dce5773b9d1d8d1;hb=f283346085ff7da029cd511bde407fd1519d7ce6;hpb=cfd1094b45c394258ccda08216f1435bf40e1d50

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index a9ffb0c..e99ef09 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -24,26 +24,31 @@ has no_term_class_warning => (
   default => 0,
 );
 
-sub BEFORE_PLUGIN {
+before 'read' => sub {
   my ($self) = @_;
 
+  if ((!$self->term->isa("Term::ReadLine::Gnu") and !$self->term->isa("Term::ReadLine::Perl"))
+        and !$self->no_term_class_warning) {
+     warn "Term::ReadLine::Gnu or Term::ReadLine::Perl is required for the Completion plugin to work";
+     $self->no_term_class_warning(1);
+  }
+
   my $weakself = $self;
   weaken($weakself);
 
   $self->term->Attribs->{attempted_completion_function} = sub {
     $weakself->_completion(@_);
   };
-}
 
-sub AFTER_PLUGIN {
-  my ($self) = @_;
-
-  warn "Term::ReadLine::Gnu is required for the Completion plugin to work"
-    unless $self->term->isa("Term::ReadLine::Gnu") and !$self->no_term_class_warning;
-}
+  $self->term->Attribs->{completion_function} = sub {
+    $weakself->_completion(@_);
+  };
+};
 
 sub _completion {
+  my $is_trp = scalar(@_) == 4 ? 1 : 0;
   my ($self, $text, $line, $start, $end) = @_;
+  $end = $start+length($text) if $is_trp;
 
   # we're discarding everything after the cursor for completion purposes
   # we can't just use $text because we want all the code before the cursor to
@@ -58,19 +63,23 @@ sub _completion {
   my @matches = $self->complete($text, $document);
 
   # iterate through the completions
-  return $self->term->completion_matches($text, sub {
-    my ($text, $state) = @_;
-
-    if (!$state) {
-      $self->current_matches(\@matches);
-      $self->match_index(0);
-    }
-    else {
-      $self->match_index($self->match_index + 1);
-    }
-
-    return $self->current_matches->[$self->match_index];
-  });
+  if ($is_trp) {
+     return @matches;
+  } else {
+     return $self->term->completion_matches($text, sub {
+           my ($text, $state) = @_;
+
+           if (!$state) {
+              $self->current_matches(\@matches);
+              $self->match_index(0);
+           }
+           else {
+              $self->match_index($self->match_index + 1);
+           }
+
+           return $self->current_matches->[$self->match_index];
+        });
+  }
 }
 
 sub complete {
@@ -96,5 +105,9 @@ __END__
 
 Devel::REPL::Plugin::Completion - Extensible tab completion
 
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
 =cut