From b6134a2df459e50a8d0031dd2cc292c4fd58ceee Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Sat, 26 Nov 2022 19:24:54 -0800 Subject: [PATCH] fix b1427 --- dev-bin/run_convergence_tests.pl.data | 19 +++++++++++++++++++ lib/Perl/Tidy/Formatter.pm | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data index 05994e4d..09d4813b 100644 --- a/dev-bin/run_convergence_tests.pl.data +++ b/dev-bin/run_convergence_tests.pl.data @@ -10988,6 +10988,25 @@ my$sem=sub --variable-maximum-line-length --want-trailing-commas='m' +==> b1427.in <== +print join( "\n", + @intersection, ), + "\n"; + +print join( "\n", + @intersection + ), + "\n"; + +==> b1427.par <== +--add-trailing-commas +--delete-trailing-commas +--extended-line-up-parentheses +--indent-columns=0 +--maximum-fields-per-table=80 +--maximum-line-length=27 +--want-trailing-commas='b' + ==> b1428.in <== is( grep ( { $_->{branchcode} eq 'MYLIBRARY' and $_->{selected} == 1 } diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index 84344bd5..8eb583e1 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -22015,6 +22015,13 @@ EOM $number_of_fields = $number_of_fields_best; } + # fix b1427 + elsif ($number_of_fields_best > 1 + && $number_of_fields_best > $number_of_fields_max ) + { + $number_of_fields_best = $number_of_fields_max; + } + # If we are crowded and the -lp option is being used, try # to undo some indentation if ( -- 2.39.5