From: Sartak Date: Tue, 12 Aug 2008 21:11:14 +0000 (+0000) Subject: r69376@onn: sartak | 2008-08-12 17:10:55 -0400 X-Git-Tag: v1.003015~79 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2fd5e0773dda71e35884cc04dbc67c13c06d902e;p=p5sagit%2FDevel-REPL.git r69376@onn: sartak | 2008-08-12 17:10:55 -0400 Improve the MultiLine::PPI plugin by checking whether adding ;; will end in PPI::Statement::Null. If not, then there must be some incomplete structure git-svn-id: http://dev.catalyst.perl.org/repos/bast/trunk/Devel-REPL@4751 bd8105ee-0ff8-0310-8827-fb3f25b6796d --- diff --git a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm index 1db70ef..1f23cfc 100644 --- a/lib/Devel/REPL/Plugin/MultiLine/PPI.pm +++ b/lib/Devel/REPL/Plugin/MultiLine/PPI.pm @@ -52,15 +52,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 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; };