X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FLexEnv.pm;h=ea6d26b3d18983645d86af6f2067572845fe5b84;hp=f78fb018169f6650f4ae6c8514ee7acbe0a814f4;hb=b314b3ec66e440dbe04fc108403a062ab22084e6;hpb=85cd27808a3e9294c1b5345fb5bbca046821933d

diff --git a/lib/Devel/REPL/Plugin/LexEnv.pm b/lib/Devel/REPL/Plugin/LexEnv.pm
index f78fb01..ea6d26b 100644
--- 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,12 +14,27 @@ 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) = @_;
   my $line = $self->$orig(@rest);
   my $lp = $self->lexical_environment;
-  return join('', map { "my $_;\n" } keys %{$lp->get_context('_')}).$line;
+  # 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('',
+    '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 {
@@ -27,4 +44,14 @@ around 'execute' => sub {
   return $self->$orig($wrapped, @rest);
 };
 
+around 'find_variable' => sub {
+  my $orig = shift;
+  my ($self, $name) = @_;
+
+  return \( $self->lexical_environment->get_context('_')->{$name} )
+    if exists $self->lexical_environment->get_context('_')->{$name};
+
+  return $orig->(@_);
+};
+
 1;