fix b1402

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 691bf301c15be193a032190e7b6dee33c1917cfe..e77ac768315c39582b62657d14d99a435b72d5b2 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -10608,6 +10608,26 @@ $cmd[ $i ]=
 --maximum-line-length=32
 --weld-nested-containers
 
+==> b1402.in <==
+ok (  3,
+      int(  at ( sum ( conv2d ( $b, $a, { Boundary => 'Reflect' } ) - $ans ) )
+      ) == 0
+);
+
+ok (  3,
+      int(
+            at ( sum ( conv2d ( $b, $a, { Boundary => 'Reflect' } ) - $ans ) )
+      ) == 0
+);
+
+
+==> b1402.par <==
+--extended-line-up-parentheses
+--indent-columns=9
+--paren-vertical-tightness=1
+--space-function-paren
+--weld-nested-containers
+
 ==> b1403.in <==
  $template->param(
   index        => $index,

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index b7381312f7163eee076c04edd69bc796e3426d11..4abea51a4dbec560a8e4bff212c771553e34edf3 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -531,8 +531,8 @@ BEGIN {
         _ris_short_broken_eval_block_      => $i++,
         _ris_bare_trailing_comma_by_seqno_ => $i++,
 
-        _rseqno_non_indenting_brace_by_ix_    => $i++,
-        _rreduce_vertical_tightness_by_seqno_ => $i++,
+        _rseqno_non_indenting_brace_by_ix_ => $i++,
+        _rzero_vertical_tightness_         => $i++,
 
         _no_vertical_tightness_flags_ => $i++,
 
@@ -954,8 +954,8 @@ sub new {
     $self->[_ris_short_broken_eval_block_]      = {};
     $self->[_ris_bare_trailing_comma_by_seqno_] = {};
 
-    $self->[_rseqno_non_indenting_brace_by_ix_]    = {};
-    $self->[_rreduce_vertical_tightness_by_seqno_] = {};
+    $self->[_rseqno_non_indenting_brace_by_ix_] = {};
+    $self->[_rzero_vertical_tightness_]         = {};
 
     $self->[_no_vertical_tightness_flags_] = 0;
 
@@ -9800,6 +9800,8 @@ sub weld_nested_containers {
     my $rblock_type_of_seqno      = $self->[_rblock_type_of_seqno_];
     my $ris_excluded_lp_container = $self->[_ris_excluded_lp_container_];
     my $ris_asub_block            = $self->[_ris_asub_block_];
+    my $rzero_vertical_tightness  = $self->[_rzero_vertical_tightness_];
+
     my $rOpts_asbl = $rOpts->{'opening-anonymous-sub-brace-on-new-line'};
 
     # Find nested pairs of container tokens for any welding.
@@ -9812,29 +9814,6 @@ sub weld_nested_containers {
     # pairs.  But it isn't clear if this is possible because we don't know
     # which sequences might actually start a weld.
 
-    # Setup a hash to avoid instabilities with combination -lp -wn -pvt=2.
-    # We do this by reducing -vt=2 to -vt=1 where there could be a conflict
-    # with welding at the same tokens.
-    # See issues b1338, b1339, b1340, b1341, b1342, b1343.
-    if ($rOpts_line_up_parentheses) {
-
-        # NOTE: just parens for now but this could be applied to all types if
-        # necessary.
-        if ( $opening_vertical_tightness{'('} == 2 ) {
-            my $rreduce_vertical_tightness_by_seqno =
-              $self->[_rreduce_vertical_tightness_by_seqno_];
-            foreach my $item ( @{$rnested_pairs} ) {
-                my ( $inner_seqno, $outer_seqno ) = @{$item};
-                if ( !$ris_excluded_lp_container->{$outer_seqno} ) {
-
-                    # Set a flag which means that if a token has -vt=2
-                    # then reduce it to -vt=1.
-                    $rreduce_vertical_tightness_by_seqno->{$outer_seqno} = 1;
-                }
-            }
-        }
-    }
-
     my $rOpts_break_at_old_method_breakpoints =
       $rOpts->{'break-at-old-method-breakpoints'};
 
@@ -9959,6 +9938,17 @@ sub weld_nested_containers {
         my $token_oo = $outer_opening->[_TOKEN_];
         my $token_io = $inner_opening->[_TOKEN_];
 
+        # Turn off vertical tightness at possible one-line welds.
+        # Fixes b1402.  Also replaces a previous patch for
+        # issues b1338, b1339, b1340, b1341, b1342, b1343.
+        if (   %opening_vertical_tightness
+            && $opening_vertical_tightness{$token_oo} )
+        {
+            if ( $iline_oc - $iline_oo <= 2 ) {
+                $rzero_vertical_tightness->{$outer_seqno} = 1;
+            }
+        }
+
         my $is_multiline_weld =
              $iline_oo == $iline_io
           && $iline_ic == $iline_oc
@@ -27479,17 +27469,17 @@ sub set_vertical_tightness_flags {
               if ( $self->[_rK_weld_left_]->{ $K_to_go[$iend_next] }
                 && $is_closing_type{$type_end_next} );
 
-            # Avoid conflict of -bom and -pt=1 or -pt=2, fixes b1270
-            # See similar patch above for $cvt.
+           # The flag '_rwant_container_open_' avoids conflict of -bom and -pt=1
+           # or -pt=2; fixes b1270. See similar patch above for $cvt.
+           # The flag '_rzero_vertical_tightness_' avoids welding conflicts.
             my $seqno = $type_sequence_to_go[$iend];
-            if ( $ovt && $self->[_rwant_container_open_]->{$seqno} ) {
-                $ovt = 0;
-            }
-
-            if (   $ovt == 2
-                && $self->[_rreduce_vertical_tightness_by_seqno_]->{$seqno} )
+            if (
+                $ovt
+                && (   $self->[_rwant_container_open_]->{$seqno}
+                    || $self->[_rzero_vertical_tightness_]->{$seqno} )
+              )
             {
-                $ovt = 1;
+                $ovt = 0;
             }
 
             unless (