fix b1271 b1273 b1304, formatting under stress

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 2398011401d1d618fc64c8fed3492519013a2f17..36816d8bd473e2ef27d20bb64ae29468fdb0420a 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -8491,6 +8491,23 @@ function(
 --maximum-line-length=37
 --vertical-tightness=2
 
+==> b1271.in <==
+          exit (
+                    $opts{"-exitval"}
+          ) ;
+
+          exit (
+                    $opts{
+"-exitval"
+                    } ) ;
+
+==> b1271.par <==
+--indent-columns=10
+--maximum-line-length=37
+--paren-vertical-tightness-closing=1
+--space-keyword-paren
+--space-terminal-semicolon
+
 ==> b1272.in <==
  $this->{Normals} =
    (
@@ -8521,6 +8538,29 @@ function(
 --maximum-line-length=47
 --opening-paren-right
 
+==> b1273.in <==
+                     if (
+                            (
+                                   $n = index( $trial,
+                                          $frag )
+                            ) >= $[
+                       );
+
+                     if (
+                            (
+                                   $n =
+                                   index( $trial,
+                                          $frag )
+                            ) >= $[
+                       );
+
+==> b1273.par <==
+--extended-line-up-parentheses
+--ignore-old-breakpoints
+--indent-columns=7
+--keyword-paren-inner-tightness=2
+--maximum-line-length=56
+
 ==> b1280.in <==
 # S1
     for my $method qw(GetBook Wishlist AddBook RemoveBook
@@ -8763,6 +8803,29 @@ if (( $response = $browser->request($curreq)
 --paren-vertical-tightness-closing=2
 --novalign-code
 
+==> b1304.in <==
+# S1
+          (
+                    $hisaddr=recv(
+                              SOCKET,$histime='',4,
+                              0
+                    )
+          );
+# S2
+          (
+                    $hisaddr=
+                            recv(SOCKET,
+                              $histime='',4,0)
+          );
+
+==> b1304.par <==
+--noadd-whitespace
+--continuation-indentation=8
+--ignore-old-breakpoints
+--indent-columns=10
+--line-up-parentheses
+--maximum-line-length=52
+
 ==> b131.in <==
         unless
           ( open( SCORE, "+>>$Score_File" ) )

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index ee259bc77a4ec9dd3c67d89c05c08a663b8f9b04..bd61ae0a39643e526c131beece626529aba64aee 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -18531,9 +18531,11 @@ EOM
                 # b1264 to see if this check is still required at all, and
                 # these still require a check, but at higher level beta+3
                 # instead of beta:  b1193 b780
-                if (   $saw_opening_structure
+                if (
+                    $saw_opening_structure
                     && !$lp_object
-                    && $levels_to_go[$i_opening] >= $stress_level_beta + 3 )
+                    && $levels_to_go[$i_opening] >= $list_stress_level
+                  )
                 {
                     $cab_flag = 2;