From a93939e9ab633c78f5129c84e3a2b44c860e26a0 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Mon, 23 Dec 2024 15:42:24 -0800 Subject: [PATCH] add alternate fix for b1502 --- lib/Perl/Tidy/Formatter.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index 79798726..645cffad 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -19792,10 +19792,16 @@ sub setup_new_weld_measurements { my $iline_prev = $rLL->[$Kprev]->[_LINE_INDEX_]; my $rK_range_prev = $rlines->[$iline_prev]->{_rK_range}; my ( $Kfirst_prev, $Klast_prev_uu ) = @{$rK_range_prev}; + my $nb_count = 0; foreach my $KK ( reverse( $Kfirst_prev .. $Kref - 1 ) ) { next if ( $rLL->[$KK]->[_TYPE_] eq 'b' ); $Kref = $KK; - last; + + # Continue at type 'w' to get previous dash. Example: + # -classification => [ qw( + # This fixes b1502. + last if ( $nb_count || $rLL->[$KK]->[_TYPE_] ne 'w' ); + $nb_count++; } } } @@ -20712,7 +20718,7 @@ sub weld_nested_quotes { # look bad. next if ( $Kinner_closing == $Kinner_opening ); - # RULE: Avoid welding under stress. Fixes b1502. + # RULE: Avoid welding under stress. This is an alternate b1502 fix. my $inner_level = $rLL->[$Kinner_opening]->[_LEVEL_]; if ( $inner_level >= $high_stress_level ) { next } -- 2.39.5