fix issue b1284, adjust a weld tolerance

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 0c86385a2338047cae15adad536b2e3e032fa14d..c3439cef6809e2a8732999205d8cba6412dcd6b2 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -8697,6 +8697,26 @@ use overload
 ==> b1280.par <==
 --brace-left-and-indent
 
+==> b1284.in <==
+# S1
+                     if (   ($before)
+                            && (   !(     $before=~
+                                          /$begin_env_rx|$begin_cmd_rx/ ) ) );
+# S2
+                     if (   ($before)
+                            && ( !($before=~/$begin_env_rx|$begin_cmd_rx/ ) )
+                       );
+
+
+==> b1284.par <==
+--indent-columns=7
+--maximum-line-length=77
+--nowant-left-space='/= &&= .= = -= + += ^= += //= % >>= % |= >= ||= =~'
+--nowant-right-space='>= / / - &= ||= ||= /= + =~ >>= == = ||= >= -= |='
+--paren-vertical-tightness-closing=2
+--paren-vertical-tightness=2
+--weld-nested-containers
+
 ==> b1289.in <==
 my $sim4
         = new Bio::Tools::Sim4::Results (

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 1341dc50ae0ec2478c43fd82d46f6ef27ff416a4..9e157e5bf70b115c430edf8e1820fda303c3c065 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -8777,7 +8777,8 @@ EOM
                   $self->excess_line_length_for_Krange( $Kstart, $Kstop );
 
                 # Coding simplified here for case b1219.
-                $is_one_line_weld = $excess <= 0;
+                # Increased tol to 1 to fix b1284.
+                $is_one_line_weld = $excess <= 1;    ##0;
             }
 
             # DO-NOT-WELD RULE 1: