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 cd3ba0b..827efb9 100644 (file)
--- a/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/CompletionDriver/LexEnv.pm
@@ -1,11 +1,11 @@
 package Devel::REPL::Plugin::CompletionDriver::LexEnv;
 use Devel::REPL::Plugin;
-use namespace::clean -except => [ 'meta' ];
+use namespace::autoclean;
 
-with qw(
-  Devel::REPL::Plugin::Completion
-  Devel::REPL::Plugin::LexEnv
-);
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('Completion');
+}
 
 around complete => sub {
   my $orig = shift;
@@ -16,8 +16,8 @@ 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