X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FPeek.pm;h=f52eb316617ca89b555ba40d4778985de7dae321;hp=e6f48935bbf24feca9782c7950ee1510cadc8943;hb=6f4f9516b3422a8ce51b89b596fb808b197f833e;hpb=1c4d0148a1b0121cdfee1f3bd97631289a524d09

diff --git a/lib/Devel/REPL/Plugin/Peek.pm b/lib/Devel/REPL/Plugin/Peek.pm
index e6f4893..f52eb31 100644
--- a/lib/Devel/REPL/Plugin/Peek.pm
+++ b/lib/Devel/REPL/Plugin/Peek.pm
@@ -1,26 +1,29 @@
-#!/usr/bin/perl
-
+use strict;
+use warnings;
 package Devel::REPL::Plugin::Peek;
-use Devel::REPL::Plugin;
 
+use Devel::REPL::Plugin;
 use Devel::Peek qw(Dump);
+use namespace::autoclean;
 
-use namespace::clean -except => [ 'meta' ];
-
-with qw(Devel::REPL::Plugin::Turtles);
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('Turtles');
+}
 
 sub expr_command_peek {
   my ( $self, $eval, $code ) = @_;
 
-  if ( my $cont = $self->can("continue_reading_if_necessary") ) {
-    $code = $self->$cont($code);
-  }
-
-  # can't override output properly
-  # FIXME do some dup wizardry
-  Dump( $self->eval($code) );
+  my @res = $self->eval($code);
 
-  return ""; # this is a hack to print nothing after Dump has already printed. PLZ TO FIX KTHX!
+  if ( $self->is_error(@res) ) {
+    return $self->format(@res);
+  } else {
+    # can't override output properly
+    # FIXME do some dup wizardry
+    Dump(@res);
+    return ""; # this is a hack to print nothing after Dump has already printed. PLZ TO FIX KTHX!
+  }
 }
 
 __PACKAGE__