From a017d7e0abc0715194afe459e5d613641fcb4632 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Sun, 8 Nov 2020 17:56:43 -0800 Subject: [PATCH] minor code cleanups --- lib/Perl/Tidy/Formatter.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index c29eb371..4cabf5fb 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -5150,10 +5150,13 @@ sub respace_tokens { # Examples: <> # change '$ var' to '$var' etc - if ( substr( $token, 1, 1 ) =~ /^\s$/ - && $token =~ /^[\$\&\%\*\@]/ ) + # change '@ ' to '@' + my ( $sigil, $word ) = split /\s+/, $token, 2; + if ( length($sigil) == 1 + && $sigil =~ /^[\$\&\%\*\@]$/ ) { - $token =~ s/\s+//g; + $token = $sigil; + $token .= $word if ($word); $rtoken_vars->[_TOKEN_] = $token; } @@ -8122,7 +8125,7 @@ EOM ++$max_index_to_go; $K_to_go[$max_index_to_go] = $Ktoken_vars; - $types_to_go[$max_index_to_go] = $rtoken_vars->[_TYPE_]; + $types_to_go[$max_index_to_go] = $type; $old_breakpoint_to_go[$max_index_to_go] = 0; $forced_breakpoint_to_go[$max_index_to_go] = 0; -- 2.39.5