From 4dacd37e36d9cba5f0ad649839e6c75810c22d03 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Thu, 29 Feb 2024 12:27:17 -0800 Subject: [PATCH] fix b1467 --- dev-bin/run_convergence_tests.pl.data | 19 +++++++++++++++++++ dev-bin/run_convergence_tests.pl.expect | 11 +++++++++++ lib/Perl/Tidy/Formatter.pm | 8 ++++++++ 3 files changed, 38 insertions(+) diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data index ea6d0055..3e9556ea 100644 --- a/dev-bin/run_convergence_tests.pl.data +++ b/dev-bin/run_convergence_tests.pl.data @@ -12025,6 +12025,25 @@ sub new{ --extended-continuation-indentation --extended-line-up-parentheses +==> b1467.in <== + my $self = [ + { receive => 1, + transmit => 2, + }] ; + + my $self + = [ + { receive => 1, transmit => 2, } + ] ; + +==> b1467.par <== +--maximum-line-length=44 +--indent-columns=6 +--want-break-before='=' +--square-bracket-vertical-tightness-closing=1 +--square-bracket-tightness=2 +--brace-vertical-tightness=1 + ==> b148.in <== # state 1 @yydgoto=( diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect index 9d8b807d..a8f7f127 100644 --- a/dev-bin/run_convergence_tests.pl.expect +++ b/dev-bin/run_convergence_tests.pl.expect @@ -8158,6 +8158,17 @@ sub new{ } +==> b1467 <== + my $self = [ + { receive => 1, + transmit => 2, + }]; + + my $self = [ + { receive => 1, + transmit => 2, + }]; + ==> b148 <== # state 1 @yydgoto=( diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index 1d4a9d3d..e210dccb 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -27479,6 +27479,14 @@ sub find_token_starting_list { } if ( $types_to_go[$i_opening_minus] eq 'b' ) { $i_opening_minus++ } } + + # fix for b1467 + elsif ( $type_prev_nb eq '=' ) { + if ( $want_break_before{$type_prev_nb} ) { + $i_opening_minus = $iprev_nb; + } + } + else { ## previous token not special } -- 2.39.5