X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FCompletionDriver%2FKeywords.pm;h=1178e8f3a4806fbee1f81fa2a9fd35f5c5de25be;hp=08e9f2b3cd4796f9e66983719e77bba9b28e0dda;hb=3a40071593734bf02e987a076b6408095ecfad41;hpb=1989c3d297823e55034a9cd22d79089fefcb93c3

diff --git a/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm b/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm
index 08e9f2b..1178e8f 100644
--- a/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm
+++ b/lib/Devel/REPL/Plugin/CompletionDriver/Keywords.pm
@@ -3,19 +3,26 @@ use Devel::REPL::Plugin;
 use B::Keywords qw/@Functions @Barewords/;
 use namespace::clean -except => [ 'meta' ];
 
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('Completion');
+}
+
 around complete => sub {
   my $orig = shift;
   my ($self, $text, $document) = @_;
 
-  # recursively find the last element
-  my $last = $document;
-  while ($last->can('last_element') && defined($last->last_element)) {
-      $last = $last->last_element;
-  }
+  my $last = $self->last_ppi_element($document);
 
   return $orig->(@_)
     unless $last->isa('PPI::Token::Word');
 
+  # don't complete keywords on foo->method
+  return $orig->(@_)
+    if $last->sprevious_sibling
+    && $last->sprevious_sibling->isa('PPI::Token::Operator')
+    && $last->sprevious_sibling->content eq '->';
+
   my $re = qr/^\Q$last/;
 
   return $orig->(@_),
@@ -24,3 +31,15 @@ around complete => sub {
 
 1;
 
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::CompletionDriver::Keywords - Complete Perl keywords and operators
+
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
+=cut
+