From 021b938754eaf00c86358037d6630a71d6c5a6ac Mon Sep 17 00:00:00 2001
From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Fri, 2 Jul 2021 06:29:24 -0700
Subject: [PATCH] Fix problem with -comma-arrow-breakpoint=n flag
---
lib/Perl/Tidy/Formatter.pm | 44 ++++++++++++++++++++++++--------------
local-docs/BugLog.pod | 25 +++++++++++++++++++---
2 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 94add7d8..d60a4ac0 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -7425,13 +7425,17 @@ sub setup_new_weld_measurements {
if ( substr( $type_prev, 0, 1 ) eq '=' ) {
$Kref = $Kprev;
- # Backup to the start of the previous line if it ends in =>
- # Fixes case b1112.
+ # Fix for b1144 and b1112: backup to the first nonblank
+ # character before the =>, or to the start of its line.
if ( $type_prev eq '=>' ) {
my $iline_prev = $rLL->[$Kprev]->[_LINE_INDEX_];
my $rK_range = $rlines->[$iline_prev]->{_rK_range};
my ( $Kfirst, $Klast ) = @{$rK_range};
- $Kref = $Kfirst;
+ for ( my $KK = $Kref - 1 ; $KK >= $Kfirst ; $KK-- ) {
+ next if ( $rLL->[$KK]->[_TYPE_] eq 'b' );
+ $Kref = $KK;
+ last;
+ }
}
}
}
@@ -16269,6 +16273,16 @@ sub set_continuation_breaks {
# 3 - ignore =>
# 4 - always open up if vt=0
# 5 - stable: even for one line blocks if vt=0
+
+ # PATCH: Modify the -cab flag if we are not processing a list:
+ # We only want the -cab flag to apply to list containers, so
+ # for non-lists we use the default and stable -cab=5 value.
+ # Fixes case b939a.
+ my $cab_flag = $rOpts_comma_arrow_breakpoints;
+ if ( $type_sequence && !$ris_list_by_seqno->{$type_sequence} ) {
+ $cab_flag = 5;
+ }
+
if ( !$is_long_term
&& $saw_opening_structure
&& $is_opening_token{ $tokens_to_go[$i_opening] }
@@ -16276,11 +16290,10 @@ sub set_continuation_breaks {
&& !$opening_vertical_tightness{ $tokens_to_go[$i_opening] }
)
{
- $is_long_term = $rOpts_comma_arrow_breakpoints == 4
- || ( $rOpts_comma_arrow_breakpoints == 0
- && $last_nonblank_token eq ',' )
- || ( $rOpts_comma_arrow_breakpoints == 5
- && $old_breakpoint_to_go[$i_opening] );
+ $is_long_term =
+ $cab_flag == 4
+ || $cab_flag == 0 && $last_nonblank_token eq ','
+ || $cab_flag == 5 && $old_breakpoint_to_go[$i_opening];
} ## end if ( !$is_long_term &&...)
# mark term as long if the length between opening and closing
@@ -16318,11 +16331,11 @@ sub set_continuation_breaks {
# We've set breaks after all comma-arrows. Now we have to
# undo them if this can be a one-line block
# (the only breakpoints set will be due to comma-arrows)
+
if (
# user doesn't require breaking after all comma-arrows
- ( $rOpts_comma_arrow_breakpoints != 0 )
- && ( $rOpts_comma_arrow_breakpoints != 4 )
+ ( $cab_flag != 0 ) && ( $cab_flag != 4 )
# and if the opening structure is in this batch
&& $saw_opening_structure
@@ -16333,11 +16346,10 @@ sub set_continuation_breaks {
$last_old_breakpoint_count
# or user wants to form long blocks with arrows
- || $rOpts_comma_arrow_breakpoints == 2
+ || $cab_flag == 2
# if -cab=3 is overridden then use -cab=2 behavior
- || $rOpts_comma_arrow_breakpoints == 3
- && $override_cab3[$current_depth]
+ || $cab_flag == 3 && $override_cab3[$current_depth]
)
# and we made breakpoints between the opening and closing
@@ -21767,9 +21779,9 @@ sub set_vertical_tightness_flags {
{
my $valid_flag = 1;
my $spaces = ( $types_to_go[ $ibeg_next - 1 ] eq 'b' ) ? 1 : 0;
- @{$rvertical_tightness_flags} =
- ( 2, $spaces, $type_sequence_to_go[$ibeg_next],
- $valid_flag, );
+ @{$rvertical_tightness_flags} = (
+ 2, $spaces, $type_sequence_to_go[$ibeg_next], $valid_flag,
+ );
}
}
}
diff --git a/local-docs/BugLog.pod b/local-docs/BugLog.pod
index 8cc0484c..624cf95b 100644
--- a/local-docs/BugLog.pod
+++ b/local-docs/BugLog.pod
@@ -2,6 +2,23 @@
=over 4
+=item B<Fix problem with -comma-arrow-breakpoint=n flag>
+
+Testing revealed a formatting irregularity which was caused when the flag
+-cab=2 got applied to a container which was not a list. This is fixed with
+update, which fixes case b939a.
+
+1 Jul 2021.
+
+=item B<Fix a formatting instability>
+
+Testing showed that a previously fixed case of instability, b1144, which was
+fixed 21 Jun 2021, 1b682fd, was unstable again. This update is a small change
+which fixes this. There are no other known unstable cases at this time
+but automated testing runs continue to search for instabilities.
+
+1 Jul 2021.
+
=item B<Fixed use of uninitialized value>
The previous Tokenizer update caused the use of an unitialized value when run on case b1053:
@@ -12,6 +29,8 @@ The previous Tokenizer update caused the use of an unitialized value when run on
This update fixes this.
+1 Jul 2021.
+
=item B<Fix token type of colon introducing anonomyous sub attribute list>
In the following example
@@ -39,7 +58,7 @@ look ahead to decide what to do. For example, this 'sub :' is a label:
In this case, the goto statement needs quotes around "sub" because it is a
keyword.
-29 Jun 2021.
+29 Jun 2021, d5fb3d5.
=item B<Minor adjustments to improve formatting stability>
@@ -48,7 +67,7 @@ instability involving unusual parameter combinations. This update fixes these
cases, b1169 b1170 b1171, and all previously discovered cases remain
stable with the update.
-28 Jun 2021.
+28 Jun 2021, e1f22e0.
=item B<Remove limit on -ci=n when -xci is set, see rt #136415>
@@ -56,7 +75,7 @@ This update undoes the update c16c5ee of 20 Feb 2021, in which the value
of -ci=n was limited to the value of -i=n when -xci was set. Recent
improvements in stability tolerances allow this limit to be removed.
-28 Jun 2021.
+28 Jun 2021, 1b3c5e9.
=item B<Minor optimization>
--
2.39.5