Fixed minor logic inverson in MultiLine/PPI.pm

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

diff --git a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
index b7957f0..f0f9f9a 100644 (file)
--- a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
+++ b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
@@ -1,6 +1,6 @@
 package Devel::REPL::Plugin::MultiLine::PPI;
 
-use Moose::Role;
+use Devel::REPL::Plugin;
 use PPI;
 use namespace::clean -except => [ 'meta' ];
 
@@ -37,7 +37,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 +52,28 @@ 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);
+  unless ( defined($document) ) {
+     die "PPI failed to parse document '$line'\n";
+  }
+
+  # 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
+  unless ( $document->child(-1)->isa('PPI::Statement::Null') ) {
+     return 1;
+  }
 
   # 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;
   };