fix b1500

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 8503f2b1a99b8a1c6122f46f435ffda8e486ce5e..4e2f20a794ae21abb758fcbb92c8d678b1e2990c 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -12484,6 +12484,23 @@ a b c d e );
 --opening-paren-right
 --break-after-all-operators
 
+==> b1500.in <==
+$config = {
+    delay => 5, ppid => $$,
+};
+$config = {
+    delay => 5,
+    ppid  => $$
+};
+
+==> b1500.par <==
+--comma-arrow-breakpoints=2
+--add-trailing-commas
+--want-trailing-commas='i'
+--delete-trailing-commas
+--keep-old-breakpoints-after='t q .= ^.= .. i x R -> J'
+--break-at-trailing-comma-types='1'
+
 ==> b156.in <==
 # State 1
 {

diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index 940c2a961c48ca084cbb8cb450854f3f7556690c..b107cee764b80c28d35bda3c43e32db5345d8ff3 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -8439,6 +8439,16 @@ my @abc
       (
         ( $_[0] > 0 ) ? 1 : 0 );
 
+==> b1500 <==
+$config = {
+    delay => 5,
+    ppid  => $$,
+};
+$config = {
+    delay => 5,
+    ppid  => $$,
+};
+
 ==> b156 <==
 # State 1
 {

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 85e588b1fa2a1d5c00cdcc7ab5d5b78c958c3e8b..daf4ea646bf13859e0f416fc6eebbea53d20d1ee 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -32191,7 +32191,9 @@ EOM
                 $last_old_breakpoint_count
 
                 # or user wants to form long blocks with arrows
-                || $cab_flag == 2
+                # check on _rbreak_container_ added for b1500
+                || ( $cab_flag == 2
+                    && !$self->[_rbreak_container_]->{$type_sequence} )
             )
 
             # and we made breakpoints between the opening and closing