From f129fd126c1df2bf6faafa6e43e3eb4161c080ec Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Sun, 3 Oct 2021 16:19:04 -0700 Subject: [PATCH] fix b1221, -vmll issue where max line length could be exceeded --- dev-bin/run_convergence_tests.pl.data | 23 +++++++++++++++++++++++ lib/Perl/Tidy/VerticalAligner.pm | 1 + 2 files changed, 24 insertions(+) diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data index cda2e948..4ef25024 100644 --- a/dev-bin/run_convergence_tests.pl.data +++ b/dev-bin/run_convergence_tests.pl.data @@ -7500,6 +7500,29 @@ print$msg, --continuation-indentation=1 --maximum-line-length=12 +==> b1221.in <== +# S1 + ok( + defined( + $pdf->{'ROOT'}->{'Resources'}->{'Font'}->{$fk} + )); + +# S2 + ok(defined($pdf->{'ROOT'}->{'Resources'}->{'Font'}->{$fk})); + +==> b1221.par <== +--noadd-whitespace +--continuation-indentation=10 +--delete-old-whitespace +--extended-continuation-indentation +--indent-columns=1 +--line-up-parentheses +--maximum-line-length=59 +--stack-closing-paren +--variable-maximum-line-length +--vertical-tightness=1 +--weld-nested-containers + ==> b1224.in <== # S1 return ( $self->_testStrand ( $other, $so ) diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm index 62597ecb..ff164913 100644 --- a/lib/Perl/Tidy/VerticalAligner.pm +++ b/lib/Perl/Tidy/VerticalAligner.pm @@ -4965,6 +4965,7 @@ sub get_output_line_number { } if ( $gap >= 0 && defined($seqno_beg) ) { + $maximum_line_length = $cached_line_maximum_length; $leading_string = $cached_line_text . ' ' x $gap; $leading_string_length = $cached_line_text_length + $gap; $leading_space_count = $cached_line_leading_space_count; -- 2.39.5