minor coding cleanups

diff --git a/dev-bin/run_convergence_tests.pl b/dev-bin/run_convergence_tests.pl
index 6258f242a60ce2ecb1d5ee18790463fa7aea8e78..6a09447b0850bff7fb4e25cedb0fa64f8f012aeb 100755 (executable)
--- a/dev-bin/run_convergence_tests.pl
+++ b/dev-bin/run_convergence_tests.pl
@@ -399,7 +399,7 @@ EOM
     else {
         print <<EOM;
 
-OK: all cases run converged
+OK: all cases converged
 EOM
     }
     if (@skipped_cases) {

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index cbe41ed2969eee94ac950c8067af351d64bcaba3..8dd9508fc260cab2621592ece2ffc628a7a5a23b 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -19094,11 +19094,11 @@ sub send_lines_to_vertical_aligner {
         my $Kend_code =
           $batch_CODE_type && $batch_CODE_type ne 'VER' ? undef : $Kend;
 
-        # We use two slightly different definitions of level jump at the end
-        # of line:
-        #  $ljump is the level jump needed by 'sub set_adjusted_indentation'
-        #  $level_jump is the level jump needed by the vertical aligner.
-        my $ljump = 0;    # level jump at end of line
+        # We need two slightly different definitions of level jump:
+        #  $level_jump is the 'slevel' jump across line starts for valign
+        #  $ljump is a level jump needed by 'sub set_adjusted_indentation'
+        my $level_jump = 0;
+        my $ljump      = 0;
 
         # Get some vars on line [n+1], if any:
         if ( $n < $n_last_line ) {
@@ -19108,6 +19108,8 @@ sub send_lines_to_vertical_aligner {
             $token_beg_next = $rLL->[$Kbeg_next]->[_TOKEN_];
             $type_end_next  = $rLL->[$Kend_next]->[_TYPE_];
             $ljump = $rLL->[$Kbeg_next]->[_LEVEL_] - $rLL->[$Kend]->[_LEVEL_];
+            $level_jump =
+              $rLL->[$Kbeg_next]->[_SLEVEL_] - $rLL->[$Kbeg]->[_SLEVEL_];
         }
         else {
 
@@ -19117,15 +19119,11 @@ sub send_lines_to_vertical_aligner {
             if ( defined($Kbeg_next) ) {
                 $ljump =
                   $rLL->[$Kbeg_next]->[_LEVEL_] - $rLL->[$Kend]->[_LEVEL_];
+                $level_jump =
+                  $rLL->[$Kbeg_next]->[_SLEVEL_] - $rLL->[$Kbeg]->[_SLEVEL_];
             }
         }
 
-        # level jump at end of line for the vertical aligner:
-        my $level_jump =
-          $Kend >= $Klimit
-          ? 0
-          : $rLL->[ $Kend + 1 ]->[_SLEVEL_] - $rLL->[$Kbeg]->[_SLEVEL_];
-
         $self->delete_needless_alignments( $ibeg, $iend,
             $ralignment_type_to_go );