From: Chris Marshall <devel.chm.01@gmail.com>
Date: Sat, 12 Jun 2010 19:24:56 +0000 (-0400)
Subject: Add ReadLine file completion if no other matches
X-Git-Tag: v1.003015~27
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c8fafb5a47755bd6ae2f3e86fba2e894e787d525;p=p5sagit%2FDevel-REPL.git

Add ReadLine file completion if no other matches

This fixes RT bug #58351 where using the Completion
plugin resulted in losing the default fallback filename
completion of Term::ReadLine::Gnu and Term::ReadLine::Perl.
There still may be times one would like to include filename
completion matches along with other completions but that is
more about fine tuning completion control.
---

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index e99ef09..91424ae 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -36,50 +36,64 @@ before 'read' => sub {
   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(@_);
+     };
+  }
+
+  if ($self->term->isa("Term::ReadLine::Perl")) {
+     $self->term->Attribs->{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
-  # 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) {
-     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];
-        });
-  }
+   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 {