X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FColors.pm;h=e3d0725f70cf8feb5bb18db8ba234b39c3769939;hp=aa87abfab62d430847b2565b56c15143dab59b09;hb=86f22c23273d4dfa82e5ec216962aeaea896dc65;hpb=653a2194b52cb95e0a6549a2b794384ba7b583b5

diff --git a/lib/Devel/REPL/Plugin/Colors.pm b/lib/Devel/REPL/Plugin/Colors.pm
index aa87abf..e3d0725 100644
--- a/lib/Devel/REPL/Plugin/Colors.pm
+++ b/lib/Devel/REPL/Plugin/Colors.pm
@@ -1,6 +1,6 @@
 package Devel::REPL::Plugin::Colors;
 
-use Moose::Role;
+use Devel::REPL::Plugin;
 use Term::ANSIColor;
 use namespace::clean -except => [ 'meta' ];
 
@@ -14,7 +14,7 @@ has error_color => (
   default => 'bold red',
 );
 
-around error_return => sub {
+around format_error => sub {
   my $orig = shift;
   my $self = shift;
   return color($self->error_color)
@@ -23,19 +23,22 @@ around error_return => sub {
 };
 
 # we can't just munge @_ because that screws up DDS
-around print => sub {
+around format_result => sub {
   my $orig = shift;
   my $self = shift;
-  print {$self->out_fh} color($self->normal_color);
-  $orig->($self, @_);
-  print {$self->out_fh} color('reset');
+  no warnings 'uninitialized';
+  return join "", (
+    color($self->normal_color),
+    $orig->($self, @_),
+    color('reset'),
+  );
 };
 
 # make arbitrary warns colored -- somewhat difficult because warn doesn't
 # get $self, so we localize $SIG{__WARN__} during eval so it can get
 # error_color
 
-around execute => sub {
+sub _wrap_warn {
   my $orig = shift;
   my $self = shift;
 
@@ -51,6 +54,9 @@ around execute => sub {
   $orig->($self, @_);
 };
 
+around compile => \&_wrap_warn;
+around execute => \&_wrap_warn;
+
 1;
 
 __END__