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=8fbe2bcb9dec2b1f672d6bf0a2a7b9d4c7efa988;hp=ae4a8ecc1b231cf11fc2fc5449209396ef1da9d2;hb=6d22063d380fc145987db58a1b6222a33a596c3e;hpb=1989c3d297823e55034a9cd22d79089fefcb93c3

diff --git a/lib/Devel/REPL/Plugin/Completion.pm b/lib/Devel/REPL/Plugin/Completion.pm
index ae4a8ec..8fbe2bc 100644
--- a/lib/Devel/REPL/Plugin/Completion.pm
+++ b/lib/Devel/REPL/Plugin/Completion.pm
@@ -5,17 +5,23 @@ use PPI;
 use namespace::clean -except => [ 'meta' ];
 
 has current_matches => (
-    is => 'rw',
-    isa => 'ArrayRef',
-    lazy => 1,
-    default => sub { [] },
+  is => 'rw',
+  isa => 'ArrayRef',
+  lazy => 1,
+  default => sub { [] },
 );
 
 has match_index => (
-    is => 'rw',
-    isa => 'Int',
-    lazy => 1,
-    default => sub { 0 },
+  is => 'rw',
+  isa => 'Int',
+  lazy => 1,
+  default => sub { 0 },
+);
+
+has no_term_class_warning => (
+  isa => "Bool",
+  is  => "rw",
+  default => 0,
 );
 
 sub BEFORE_PLUGIN {
@@ -29,15 +35,26 @@ sub BEFORE_PLUGIN {
   };
 }
 
+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;
+}
+
 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
@@ -60,5 +77,16 @@ sub complete {
   return ();
 }
 
+# recursively find the last element
+sub last_ppi_element {
+  my ($self, $document, $type) = @_;
+  my $last = $document;
+  while ($last->can('last_element') && defined($last->last_element)) {
+    $last = $last->last_element;
+    return $last if $type && $last->isa($type);
+  }
+  return $last;
+}
+
 1;