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%2FLexEnv.pm;h=a31abf4eaf4f010a9c23c2b060ba0788bd2ea087;hp=2011896584f9b3634613cdaeb8437d80ca57d1e4;hb=6f4f9516b3422a8ce51b89b596fb808b197f833e;hpb=314f229330cdc3be301a39eadb68ff8f2bf13043

diff --git a/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm b/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
index 2011896..a31abf4 100644
--- a/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
@@ -1,38 +1,47 @@
+use strict;
+use warnings;
 package Devel::REPL::Plugin::CompletionDriver::LexEnv;
-use Devel::REPL::Plugin;
-use namespace::clean -except => [ 'meta' ];
 
-sub AFTER_PLUGIN {
-  my ($_REPL) = @_;
+use Devel::REPL::Plugin;
+use Devel::REPL::Plugin::Completion;    # die early if cannot load
+use namespace::autoclean;
 
-  if (!$_REPL->can('lexical_environment')) {
-    warn "Devel::REPL::Plugin::CompletionDriver::LexEnv requires Devel::REPL::Plugin::LexEnv.";
-  }
+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::Symbol');
 
-  my $sigil = substr($last, 0, 1, '');
-  my $re = qr/^\Q$last/;
+  my ($sigil, $name) = split(//, $last, 2);
+  my $re = qr/^\Q$name/;
 
   return $orig->(@_),
          # ReadLine is weirdly inconsistent
          map  { $sigil eq '%' ? '%' . $_ : $_ }
          grep { /$re/ }
          map  { substr($_, 1) } # drop lexical's sigil
-         keys %{$self->lexical_environment->get_context('_')};
+         '$_REPL', keys %{$self->lexical_environment->get_context('_')};
 };
 
 1;
 
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::CompletionDriver::LexEnv - Complete variable names in the REPL's lexical environment
+
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
+=cut
+