]> git.donarmstrong.com Git - perltidy.git/commitdiff
fix -xci to work with -lp
authorSteve Hancock <perltidy@users.sourceforge.net>
Thu, 8 Oct 2020 18:40:06 +0000 (11:40 -0700)
committerSteve Hancock <perltidy@users.sourceforge.net>
Thu, 8 Oct 2020 18:40:06 +0000 (11:40 -0700)
lib/Perl/Tidy/Formatter.pm

index 2080b03d4d85d852b7fb83c94c396ac9c851f172..cdaef1c1a813663aa82c4aa9ce52f7439caaafb5 100644 (file)
@@ -16617,8 +16617,13 @@ sub get_seqno {
                 my $Kbeg  = $K_to_go[$ibeg];
                 my $seqno = $rseqno_which_extended_ci->{$Kbeg};
                 if ( $seqno && $undo_extended_ci{$seqno} ) {
-                    $ci_levels_to_go[$ibeg]      = 0;
-                    $leading_spaces_to_go[$ibeg] = $reduced_spaces_to_go[$ibeg];
+
+                    # but do not undo ci set by the -lp flag
+                    if ( !ref( $reduced_spaces_to_go[$ibeg] ) ) {
+                        $ci_levels_to_go[$ibeg]      = 0;
+                        $leading_spaces_to_go[$ibeg] =
+                          $reduced_spaces_to_go[$ibeg];
+                    }
                 }
             }