Have LexEnv wrap find_variable to first look at lexical variables. The around doesn...

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

diff --git a/lib/Devel/REPL/Plugin/LexEnv.pm b/lib/Devel/REPL/Plugin/LexEnv.pm
index 71134f9..fd91a91 100644 (file)
--- a/lib/Devel/REPL/Plugin/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/LexEnv.pm
@@ -4,6 +4,8 @@ use Moose::Role;
 use namespace::clean -except => [ 'meta' ];
 use Lexical::Persistence;
 
+with 'Devel::REPL::Plugin::FindVariable';
+
 has 'lexical_environment' => (
   isa => 'Lexical::Persistence',
   is => 'rw',
@@ -12,6 +14,12 @@ has 'lexical_environment' => (
   default => sub { Lexical::Persistence->new }
 );
 
+has '_hints' => (
+  isa => "ArrayRef",
+  is => "rw",
+  predicate => '_has_hints',
+);
+
 around 'mangle_line' => sub {
   my $orig = shift;
   my ($self, @rest) = @_;
@@ -20,8 +28,13 @@ around 'mangle_line' => sub {
   # Collate my declarations for all LP context vars then add '';
   # so an empty statement doesn't return anything (with a no warnings
   # to prevent "Useless use ..." warning)
-  return join('', map { "my $_;\n" } keys %{$lp->get_context('_')})
-           .qq{{ no warnings 'void'; ''; }\n}.$line;
+  return join('',
+    'BEGIN { if ( $_REPL->_has_hints ) { ( $^H, %^H ) = @{ $_REPL->_hints } } }',
+    ( map { "my $_;\n" } keys %{$lp->get_context('_')} ),
+    qq{{ no warnings 'void'; ''; }\n},
+    $line,
+    '; BEGIN { $_REPL->_hints([ $^H, %^H ]) }',
+  );
 };
 
 around 'execute' => sub {
@@ -31,4 +44,12 @@ around 'execute' => sub {
   return $self->$orig($wrapped, @rest);
 };
 
+around 'find_variable' => sub {
+  my $orig = shift;
+  my ($self, $name) = @_;
+  my $variable = $self->lexical_environment->get_context('_')->{$name};
+  return \$variable if $variable;
+  return $orig->(@_);
+};
+
 1;