fix b1451

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index df817837d1ee926dd1f1318fa04f9f5b4c41d2bf..d95eb88d79e3888a5b6c14525ccaf41675028415 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -11490,6 +11490,30 @@ $last = after (
 --paren-vertical-tightness-closing=2
 --paren-vertical-tightness=1
 
+==> b1451.in <==
+my %distance_pref =
+     (
+        meter => 1.1,
+        inch  => 0.7,
+        foot  => 0.9,
+        yard  => 0,
+        mile  => 1.0
+     );
+
+my %distance_pref =
+        ( meter => 1.1, inch => 0.7, foot => 0.9, yard => 0, mile => 1.0, );
+
+
+==> b1451.par <==
+--add-trailing-commas
+--break-before-paren-and-indent=2
+--break-before-paren=1
+--comma-arrow-breakpoints=3
+--continuation-indentation=5
+--delete-trailing-commas
+--indent-columns=8
+--want-trailing-commas='m'
+
 ==> b146.in <==
 # State 1
 

diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index 04c5abc30b702105bc3acdc076b66caeb8038753..4d23105f34a0a085a39893fe3e44a2863c44a8d4 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -6933,19 +6933,21 @@ print star (
 
 ==> b1381 <==
 my $formatter = new HTML::FormatPS(
-    'PaperSize'   => 'Letter',
-    'LeftMargin'  => 20,         # in points
-    'RightMargin' => 20,         # ditto
-    'TopMargin'   => 10, 'BottomMargin' => 30,
-    'FontFamily'  => 'Helvetica',
+    'PaperSize'    => 'Letter',
+    'LeftMargin'   => 20,            # in points
+    'RightMargin'  => 20,            # ditto
+    'TopMargin'    => 10,
+    'BottomMargin' => 30,
+    'FontFamily'   => 'Helvetica',
 );
 
 my $formatter = new HTML::FormatPS(
-    'PaperSize'   => 'Letter',
-    'LeftMargin'  => 20,         # in points
-    'RightMargin' => 20,         # ditto
-    'TopMargin'   => 10, 'BottomMargin' => 30,
-    'FontFamily'  => 'Helvetica',
+    'PaperSize'    => 'Letter',
+    'LeftMargin'   => 20,            # in points
+    'RightMargin'  => 20,            # ditto
+    'TopMargin'    => 10,
+    'BottomMargin' => 30,
+    'FontFamily'   => 'Helvetica',
 );
 
 ==> b1384 <==
@@ -7790,6 +7792,26 @@ $last = after (
                               return 1;
                     }
 
+==> b1451 <==
+my %distance_pref =
+        (
+        meter => 1.1,
+        inch  => 0.7,
+        foot  => 0.9,
+        yard  => 0,
+        mile  => 1.0,
+        );
+
+my %distance_pref =
+        (
+        meter => 1.1,
+        inch  => 0.7,
+        foot  => 0.9,
+        yard  => 0,
+        mile  => 1.0,
+        );
+
+
 ==> b146 <==
 # State 1
 

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index cef78da902c526260043cb765752c2481828ff4a..24c59ef912b012f56484c5aa01a003ac8f581be5 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -8106,17 +8106,19 @@ sub respace_post_loop_ops {
             next unless ( $rtype_count && $rtype_count->{'=>'} );
 
             # override -cab=3 if this contains a sub-list
-            if ( $rhas_list->{$seqno} ) {
-                $roverride_cab3->{$seqno} = 1;
-            }
+            if ( !defined( $roverride_cab3->{$seqno} ) ) {
+                if ( $rhas_list->{$seqno} ) {
+                    $roverride_cab3->{$seqno} = 2;
+                }
 
-            # or if this is a sub-list of its parent container
-            else {
-                my $seqno_parent = $rparent_of_seqno->{$seqno};
-                if ( defined($seqno_parent)
-                    && $ris_list_by_seqno->{$seqno_parent} )
-                {
-                    $roverride_cab3->{$seqno} = 1;
+                # or if this is a sub-list of its parent container
+                else {
+                    my $seqno_parent = $rparent_of_seqno->{$seqno};
+                    if ( defined($seqno_parent)
+                        && $ris_list_by_seqno->{$seqno_parent} )
+                    {
+                        $roverride_cab3->{$seqno} = 2;
+                    }
                 }
             }
         }
@@ -8999,8 +9001,9 @@ sub match_trailing_comma_rule {
 
             # The combination of -atc and -dtc and -cab=3 can be unstable
             # (b1394). So we deactivate -cab=3 in this case.
+            # A value of '0' or '4' is required for stability of case b1451.
             if ( $rOpts_comma_arrow_breakpoints == 3 ) {
-                $self->[_roverride_cab3_]->{$type_sequence} = 1;
+                $self->[_roverride_cab3_]->{$type_sequence} = 0;
             }
         }
     }
@@ -21274,12 +21277,10 @@ sub do_colon_breaks {
 
             # these arrays need not retain values between calls
             $type_sequence_stack[$depth_t] = $seqno;
-            $override_cab3[$depth_t] =
-                 $rOpts_comma_arrow_breakpoints == 3
-              && $seqno
-              && $self->[_roverride_cab3_]->{$seqno};
-
-            $override_cab3[$depth_t]          = undef;
+            $override_cab3[$depth_t]       = undef;
+            if ( $rOpts_comma_arrow_breakpoints == 3 && $seqno ) {
+                $override_cab3[$depth_t] = $self->[_roverride_cab3_]->{$seqno};
+            }
             $breakpoint_stack[$depth_t]       = $starting_breakpoint_count;
             $container_type[$depth_t]         = EMPTY_STRING;
             $identifier_count_stack[$depth_t] = 0;
@@ -21848,7 +21849,7 @@ EOM
                 next if $rOpts_break_at_old_comma_breakpoints;
                 next
                   if ( $rOpts_comma_arrow_breakpoints == 3
-                    && !$override_cab3[$depth] );
+                    && !defined( $override_cab3[$depth] ) );
                 $want_comma_break[$depth]   = 1;
                 $index_before_arrow[$depth] = $i_last_nonblank_token;
                 next;
@@ -22277,10 +22278,12 @@ EOM
         # ... use the same order as sub check_for_new_minimum_depth
         #----------------------------------------------------------
         $type_sequence_stack[$depth] = $type_sequence;
-        $override_cab3[$depth] =
-             $rOpts_comma_arrow_breakpoints == 3
-          && $type_sequence
-          && $self->[_roverride_cab3_]->{$type_sequence};
+
+        $override_cab3[$depth] = undef;
+        if ( $rOpts_comma_arrow_breakpoints == 3 && $type_sequence ) {
+            $override_cab3[$depth] =
+              $self->[_roverride_cab3_]->{$type_sequence};
+        }
 
         $breakpoint_stack[$depth] = $forced_breakpoint_count;
         $container_type[$depth] =
@@ -22433,11 +22436,18 @@ EOM
         #    4 - always open up if vt=0
         #    5 - stable: even for one line blocks if vt=0
 
+        my $cab_flag = $rOpts_comma_arrow_breakpoints;
+
+        # replace -cab=3 if overriden
+        if ( $cab_flag == 3 && $type_sequence ) {
+            my $test_cab = $self->[_roverride_cab3_]->{$type_sequence};
+            if ( defined($test_cab) ) { $cab_flag = $test_cab }
+        }
+
         # 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 && !$self->[_ris_list_by_seqno_]->{$type_sequence} )
         {
             $cab_flag = 5;
@@ -22553,9 +22563,6 @@ EOM
 
                 # or user wants to form long blocks with arrows
                 || $cab_flag == 2
-
-                # if -cab=3 is overridden then use -cab=2 behavior
-                || $cab_flag == 3 && $override_cab3[$current_depth]
             )
 
             # and we made breakpoints between the opening and closing