fixed rt127633

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index e8ea6b4a83653c44533e38026c357c34385fcd72..4e50c2ed3f928cec47bc3b939076b474451507aa 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -14823,8 +14823,15 @@ sub undo_forced_breakpoint_stack {
 
                             # do not recombine if the two lines might align well
                             # this is a very approximate test for this
-                            && (   $ibeg_3 >= 0
-                                && $type_ibeg_2 ne $types_to_go[$ibeg_3] )
+                            && (
+
+                               # RT#127633 - the leading tokens are not operators
+                                ( $type_ibeg_2 ne $tokens_to_go[$ibeg_2] )
+
+                               # or they are different
+                                || (   $ibeg_3 >= 0
+                                    && $type_ibeg_2 ne $types_to_go[$ibeg_3] )
+                            )
                           );
 
                         if (

diff --git a/t/snippets/expect/math4.def b/t/snippets/expect/math4.def
index 1620dca540f9d5f16e28931fc2ee59794da4d8e4..f4566b276102c7d4b86982074f7502fd5e0b1e3a 100644 (file)
--- a/t/snippets/expect/math4.def
+++ b/t/snippets/expect/math4.def
@@ -1,7 +1,6 @@
 my $u      = ( $range * $pratio**( 1. / 3. ) ) / $wratio;
 my $factor = exp( -( 18 / $u )**4 );
-my $ovp =
-  ( 1 - $factor ) * ( 70 - 0.655515 * $u ) +
+my $ovp    = ( 1 - $factor ) * ( 70 - 0.655515 * $u ) +
   ( 1000 / ( $u**1.3 ) + 10000 / ( $u**3.3 ) ) * $factor;
 my $impulse =
   ( 1 - $factor ) * ( 170 - $u ) + ( 350 / $u**0.65 + 500 / $u**5 ) * $factor;

diff --git a/t/snippets/expect/pbp1.def b/t/snippets/expect/pbp1.def
index 682ecce54362f8bfb366c67be46c202c5c5316e2..fa4cb34098143c03c209ad07cd54a2f135a221cc 100644 (file)
--- a/t/snippets/expect/pbp1.def
+++ b/t/snippets/expect/pbp1.def
@@ -1,4 +1,3 @@
             # break after '+' if default, before + if pbp
-            my $min_gnu_indentation =
-              $standard_increment +
+            my $min_gnu_indentation = $standard_increment +
               $gnu_stack[$max_gnu_stack_index]->get_SPACES();

diff --git a/t/snippets/expect/rt127633.def b/t/snippets/expect/rt127633.def
index c7ee4ef40cfe4bea9ff49b456688b199fab84e41..7666b1030048392cc742d49170deb29402ab906e 100644 (file)
--- a/t/snippets/expect/rt127633.def
+++ b/t/snippets/expect/rt127633.def
@@ -1,4 +1,6 @@
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR'
   ? $self->encode_scalar( $object, $name, $type, $attr )
   : $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+  . 'bbbbbbbbbbbbbbbbbbbbbbbbb';

diff --git a/t/snippets/expect/rt127633.rt127633 b/t/snippets/expect/rt127633.rt127633
index eed8d0e6708fe81a17f58fb31f5fbb6917087a8c..df3510cf729e045826106206a5e7eface0a10a38 100644 (file)
--- a/t/snippets/expect/rt127633.rt127633
+++ b/t/snippets/expect/rt127633.rt127633
@@ -1,3 +1,5 @@
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR' ? $self->encode_scalar( $object, $name, $type, $attr ) :
   $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' .
+  'bbbbbbbbbbbbbbbbbbbbbbbbb';

diff --git a/t/snippets/packing_list.txt b/t/snippets/packing_list.txt
index 75ab8b24646f4050ba0384714f3f92517583b41c..4000e93314963fcee852a5a18f57344d463211e7 100644 (file)
--- a/t/snippets/packing_list.txt
+++ b/t/snippets/packing_list.txt
@@ -92,6 +92,8 @@
 ../snippets13.t        align19.def
 ../snippets13.t        align20.def
 ../snippets13.t        align21.def
+../snippets13.t        align22.def
+../snippets13.t        align23.def
 ../snippets2.t angle.def
 ../snippets2.t arrows1.def
 ../snippets2.t arrows2.def
@@ -252,5 +254,3 @@
 ../snippets9.t rt98902.def
 ../snippets9.t rt98902.rt98902
 ../snippets9.t rt99961.def
-../snippets13.t        align22.def
-../snippets13.t        align23.def

diff --git a/t/snippets/rt127633.in b/t/snippets/rt127633.in
index 0f9e1433801c3ba258cbf448a2c2e5ae270bbb89..8ea28267d25b8bfd3c949c527c71928af6ac1e89 100644 (file)
--- a/t/snippets/rt127633.in
+++ b/t/snippets/rt127633.in
@@ -1,2 +1,3 @@
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR' ? $self->encode_scalar( $object, $name, $type, $attr ) : $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' .  'bbbbbbbbbbbbbbbbbbbbbbbbb';

diff --git a/t/snippets/rt127633.par b/t/snippets/rt127633.par
index 8125ee4cb071b0743f0c33ad1a6f5f45b8f7fea6..14931b3be940a6fdccba0e1e33dcc2f5605973a4 100644 (file)
--- a/t/snippets/rt127633.par
+++ b/t/snippets/rt127633.par
@@ -1 +1 @@
--wba=':'
+-baao

diff --git a/t/snippets13.t b/t/snippets13.t
index b731cdde780128e4f80237d7108b6946aeebe7b9..139927d184323c29384b89d200b71e91933dffc1 100644 (file)
--- a/t/snippets13.t
+++ b/t/snippets13.t
@@ -34,9 +34,7 @@ BEGIN {
     ###########################################
     $rparams = {
         'def'      => "",
-        'rt127633' => <<'----------',
--wba=':'
-----------
+        'rt127633' => "-baao",
     };
 
     ############################
@@ -142,8 +140,9 @@ return (
 ----------
 
         'rt127633' => <<'----------',
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR' ? $self->encode_scalar( $object, $name, $type, $attr ) : $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' .  'bbbbbbbbbbbbbbbbbbbbbbbbb';
 ----------
     };
 
@@ -198,10 +197,12 @@ ok( $out !~ /<zap>/,       "Got 'zap'" );    # zap
             source => "rt127633",
             params => "def",
             expect => <<'#5...........',
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR'
   ? $self->encode_scalar( $object, $name, $type, $attr )
   : $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+  . 'bbbbbbbbbbbbbbbbbbbbbbbbb';
 #5...........
         },
 
@@ -209,9 +210,11 @@ return $ref eq 'SCALAR'
             source => "rt127633",
             params => "rt127633",
             expect => <<'#6...........',
-# do not break after return with -wba=':'
+# keep lines long; do not break after 'return' and '.' with -baoo
 return $ref eq 'SCALAR' ? $self->encode_scalar( $object, $name, $type, $attr ) :
   $ref eq 'ARRAY';
+my $s = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' .
+  'bbbbbbbbbbbbbbbbbbbbbbbbb';
 #6...........
         },
 

diff --git a/t/snippets5.t b/t/snippets5.t
index 3279c82543cda560a637467cb143ebd778b09ddf..f65be6ecc051b28d70b3d762c915b7dd3d3be732 100644 (file)
--- a/t/snippets5.t
+++ b/t/snippets5.t
@@ -853,8 +853,7 @@ $ans = pdl(
             expect => <<'#15...........',
 my $u      = ( $range * $pratio**( 1. / 3. ) ) / $wratio;
 my $factor = exp( -( 18 / $u )**4 );
-my $ovp =
-  ( 1 - $factor ) * ( 70 - 0.655515 * $u ) +
+my $ovp    = ( 1 - $factor ) * ( 70 - 0.655515 * $u ) +
   ( 1000 / ( $u**1.3 ) + 10000 / ( $u**3.3 ) ) * $factor;
 my $impulse =
   ( 1 - $factor ) * ( 170 - $u ) + ( 350 / $u**0.65 + 500 / $u**5 ) * $factor;

diff --git a/t/snippets6.t b/t/snippets6.t
index 0e1e00f1c1d5efbce7f4273c9aecf71aa7447062..4836fffc4d04bf248851b88cdd13cfe53735d427 100644 (file)
--- a/t/snippets6.t
+++ b/t/snippets6.t
@@ -186,8 +186,7 @@ return $pdl->slice(
             params => "def",
             expect => <<'#2...........',
             # break after '+' if default, before + if pbp
-            my $min_gnu_indentation =
-              $standard_increment +
+            my $min_gnu_indentation = $standard_increment +
               $gnu_stack[$max_gnu_stack_index]->get_SPACES();
 #2...........
         },