Split symbol name instead of munging it in-place

[p5sagit/Devel-REPL.git] / lib / Devel / REPL / Plugin / CompletionDriver / LexEnv.pm

diff --git a/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm b/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
index f346bda..827efb9 100644 (file)
--- a/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
@@ -1,13 +1,10 @@
 package Devel::REPL::Plugin::CompletionDriver::LexEnv;
 use Devel::REPL::Plugin;
-use namespace::clean -except => [ 'meta' ];
+use namespace::autoclean;
 
-sub AFTER_PLUGIN {
-  my ($_REPL) = @_;
-
-  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 {
@@ -19,16 +16,28 @@ around complete => sub {
   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
+