From: Arthur Axel 'fREW' Schmidt <frioux@gmail.com>
Date: Sun, 2 May 2010 03:29:11 +0000 (-0500)
Subject: RT57113: Easier to support completion
X-Git-Tag: v1.003015~44
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f283346085ff7da029cd511bde407fd1519d7ce6;p=p5sagit%2FDevel-REPL.git

RT57113: Easier to support completion
---

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index ebafa2e..e99ef09 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -27,9 +27,10 @@ has no_term_class_warning => (
 before 'read' => sub {
   my ($self) = @_;
 
-  if (!$self->term->isa("Term::ReadLine::Gnu") and !$self->no_term_class_warning) {
-    warn "Term::ReadLine::Gnu is required for the Completion plugin to work";
-    $self->no_term_class_warning(1);
+  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;
@@ -38,10 +39,16 @@ before 'read' => sub {
   $self->term->Attribs->{attempted_completion_function} = sub {
     $weakself->_completion(@_);
   };
+
+  $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
@@ -56,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 {