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=91424ae795be4e5d9ad31dfa1713e9e6ee8a57f9;hp=b4bbb8831b12eb00ed808436b20d25e6918886f9;hb=c8fafb5a47755bd6ae2f3e86fba2e894e787d525;hpb=30b459d4fbeb6f2406a3013c7cbcc46a6d0ccf0d

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index b4bbb88..91424ae 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -24,53 +24,76 @@ 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(@_);
-  };
-}
+  if ($self->term->isa("Term::ReadLine::Gnu")) {
+     $self->term->Attribs->{attempted_completion_function} = sub {
+        $weakself->_completion(@_);
+     };
+  }
 
-sub AFTER_PLUGIN {
-  my ($self) = @_;
+  if ($self->term->isa("Term::ReadLine::Perl")) {
+     $self->term->Attribs->{completion_function} = sub {
+        $weakself->_completion(@_);
+     };
+  }
 
-  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;
-}
+};
 
 sub _completion {
-  my ($self, $text, $line, $start, $end) = @_;
-
-  # 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
-  # matter, not just the current word
-  substr($line, $end) = '';
-
-  my $document = PPI::Document->new(\$line);
-  return unless defined($document);
-
-  $document->prune('PPI::Token::Whitespace');
-
-  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];
-  });
+   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
+   # matter, not just the current word
+   substr($line, $end) = '';
+
+   my $document = PPI::Document->new(\$line);
+   return unless defined($document);
+
+   $document->prune('PPI::Token::Whitespace');
+
+   my @matches = $self->complete($text, $document);
+
+   # iterate through the completions
+   if ($is_trp) {
+      if (scalar(@matches)) {
+         return @matches;
+      } else {
+         return readline::rl_filename_list($text);
+      }
+   } else {
+      if (scalar(@matches)) {
+         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];
+            });
+      } else {
+         # fall back to filename completion for Term::ReadLine::Gnu
+         return;
+      }
+   }
 }
 
 sub complete {