X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FMultiLine%2FPPI.pm;h=ca858068b6ee7ee8a6e71c9f04daf0418a5d065d;hp=b7957f06dd9b8bc5e078467f8b4b32a467b3ac40;hb=b595a818b1d89dbea55ace1af86d0df91c97ba0c;hpb=0cbfa9217cbe7714e72b92abc05ed8b21bc46f00

diff --git a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
index b7957f0..ca85806 100644
--- a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
+++ b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
@@ -1,16 +1,18 @@
 package Devel::REPL::Plugin::MultiLine::PPI;
 
-use Moose::Role;
+use Devel::REPL::Plugin;
 use PPI;
-use namespace::clean -except => [ 'meta' ];
+use namespace::autoclean;
 
 has 'continuation_prompt' => (
-  is => 'rw', required => 1, lazy => 1,
+  is => 'rw',
+  lazy => 1,
   default => sub { '> ' }
 );
 
 has 'line_depth' => (
-  is => 'rw', required => 1, lazy => 1,
+  is => 'rw',
+  lazy => 1,
   default => sub { 0 }
 );
 
@@ -37,7 +39,7 @@ sub continue_reading_if_necessary {
     my $append = $self->read(@args);
     $self->line_depth($self->line_depth - 1);
 
-    $line .= $append if defined($append);
+    $line .= "\n$append" if defined($append);
 
     $self->prompt($orig_prompt);
 
@@ -52,15 +54,24 @@ sub line_needs_continuation
 {
   my $repl = shift;
   my $line = shift;
+
+  # add this so we can test whether the document ends in PPI::Statement::Null
+  $line .= "\n;;";
+
   my $document = PPI::Document->new(\$line);
   return 0 if !defined($document);
 
+  # adding ";" to a complete document adds a PPI::Statement::Null. we added a ;;
+  # so if it doesn't end in null then there's probably something that's
+  # incomplete
+  return 0 if $document->child(-1)->isa('PPI::Statement::Null');
+
   # this could use more logic, such as returning 1 on s/foo/ba<Enter>
   my $unfinished_structure = sub
   {
     my ($document, $element) = @_;
     return 0 unless $element->isa('PPI::Structure');
-    return 1 unless $element->start && $element->finish;
+    return 1 unless $element->finish;
     return 0;
   };