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=f3ba89782a4ab02057f318c25aadb2d071cb87ca;hb=b595a818b1d89dbea55ace1af86d0df91c97ba0c;hpb=d9ba19d2caa08c4163e1462b96ceecc12fd158bc

diff --git a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
index f3ba897..ca85806 100644
--- a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
+++ b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm
@@ -1,48 +1,77 @@
 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',
+  lazy => 1,
+  default => sub { 0 }
+);
+
 around 'read' => sub {
   my $orig = shift;
   my ($self, @args) = @_;
   my $line = $self->$orig(@args);
 
   if (defined $line) {
-    while (needs_continuation($line)) {
-      my $orig_prompt = $self->prompt;
-      $self->prompt($self->continuation_prompt);
+    return $self->continue_reading_if_necessary($line, @args);
+  } else {
+    return $line;
+  }
+};
+
+sub continue_reading_if_necessary {
+  my ( $self, $line, @args ) = @_;
+
+  while ($self->line_needs_continuation($line)) {
+    my $orig_prompt = $self->prompt;
+    $self->prompt($self->continuation_prompt);
+
+    $self->line_depth($self->line_depth + 1);
+    my $append = $self->read(@args);
+    $self->line_depth($self->line_depth - 1);
 
-      my $append = $self->read(@args);
-      $line .= $append if defined($append);
+    $line .= "\n$append" if defined($append);
 
-      $self->prompt($orig_prompt);
+    $self->prompt($orig_prompt);
 
-      # ^D means "shut up and eval already"
-      return $line if !defined($append);
-    }
+    # ^D means "shut up and eval already"
+    return $line if !defined($append);
   }
+
   return $line;
-};
+}
 
-sub needs_continuation
+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;
   };