From: Steve Hancock Date: Thu, 18 Jun 2020 15:27:31 +0000 (-0700) Subject: updates for next release, v20200619 X-Git-Tag: 20200619~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e93c0da916f62a0353cefd3299aa697d13c5f1e3;p=perltidy.git updates for next release, v20200619 --- diff --git a/CHANGES.md b/CHANGES.md index 28d4f9f6..0c03a486 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Perltidy Change Log -## 2020 01 10.01 +## 2020 06 19 - Added support for Switch::Plain syntax, issue git #31. @@ -38,25 +38,23 @@ - Added --character-encoding=guess or -guess to have perltidy guess if a file (or other input stream) is encoded as -utf8 or some - older single-byte encoding. This is useful when processing a mixture - of file types, such as utf8 and latin-1. + other single-byte encoding. This is useful when processing a mixture + of file types, such as utf8 and latin-1. Please Note: The default encoding has been set to be 'guess' - instead of 'none'. I do not like to change defaults, but this seems like - the best choice, since it should make perltidy work properly with both + instead of 'none'. This seems like the best default, since + it allows perltidy work properly with both utf8 files and older latin-1 files. The guess mode uses Encode::Guess, which is included in standard perl distributions, and only tries to guess if a file is utf8 or not, never any other encoding. If the guess is utf8, and if the file successfully decodes as utf8, then it the encoding - is assumed to be utf8. Otherwise, no encoding is assumed. I have done - extensive testing and have not detected any problems with this - rather conservative guess method, so I think it is a good default. + is assumed to be utf8. Otherwise, no encoding is assumed. If you do not want to use this new default guess mode, or have a problem with it, you can set --character-encoding=none (the previous default) or --character-encoding=utf8 (if you deal with utf8 files). - Specific encodings of input files other than utf8 may now be given, for - example --character-encoding=euc-jp. + example --character-encoding=euc-jp. - Fix for git#22, Preserve function signature on a single line. An unwanted line break was being introduced when a closing signature paren diff --git a/MANIFEST b/MANIFEST index 015ced2d..2cebfab3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -23,7 +23,6 @@ examples/lextest examples/perlcomment.pl examples/perllinetype.pl examples/perlmask.pl -examples/perltidy.DEBUG examples/perltidy_okw.pl examples/perltidyrc_dump.pl examples/perlxmltok.pl diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 34c51be2..883dc63e 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -105,9 +105,10 @@ _config.yml # any zip files \.zip$ -# Perl::Tidy error, log and tidy files -\bperltidy\.ERR -\bperltidy\.LOG +# any Perl::Tidy error, log and tidy files +\.ERR$ +\.LOG$ +\.DEBUG$ # The temporary combined perltidy.pl made by pm2pl \bperltidy-.*\.pl diff --git a/bin/perltidy b/bin/perltidy index 87cb3d4e..4fa0e8e9 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -4052,7 +4052,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20200110.01 +This man page documents perltidy version 20200619 =head1 BUG REPORTS diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index 22da9478..4149d5f9 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -1,8 +1,10 @@

Perltidy Change Log

-

2020 01 10.01

+

2020 06 19

-
- Fixed minor problem where trailing 'unless' clauses were not 
+
- Added support for Switch::Plain syntax, issue git #31.
+
+- Fixed minor problem where trailing 'unless' clauses were not 
   getting vertically aligned.
 
 - Added a parameter --logical-padding or -lop to allow logical padding
@@ -36,25 +38,23 @@
 
 - Added --character-encoding=guess or -guess to have perltidy guess
   if a file (or other input stream) is encoded as -utf8 or some 
-  older single-byte encoding. This is useful when processing a mixture 
-  of file types, such as utf8 and latin-1.  
+  other single-byte encoding. This is useful when processing a mixture 
+  of file types, such as utf8 and latin-1.
 
   Please Note: The default encoding has been set to be 'guess'
-  instead of 'none'. I do not like to change defaults, but this seems like
-  the best choice, since it should make perltidy work properly with both
+  instead of 'none'. This seems like the best default, since 
+  it allows perltidy work properly with both
   utf8 files and older latin-1 files.  The guess mode uses Encode::Guess,
   which is included in standard perl distributions, and only tries to 
   guess if a file is utf8 or not, never any other encoding.  If the guess is 
   utf8, and if the file successfully decodes as utf8, then it the encoding 
-  is assumed to be utf8.  Otherwise, no encoding is assumed.  I have done
-  extensive testing and have not detected any problems with this 
-  rather conservative guess method, so I think it is a good default. 
+  is assumed to be utf8.  Otherwise, no encoding is assumed. 
   If you do not want to use this new default guess mode, or have a 
   problem with it, you can set --character-encoding=none (the previous 
   default) or --character-encoding=utf8 (if you deal with utf8 files).
 
 - Specific encodings of input files other than utf8 may now be given, for
-  example --character-encoding=euc-jp.  
+  example --character-encoding=euc-jp.
 
 - Fix for git#22, Preserve function signature on a single line. An
   unwanted line break was being introduced when a closing signature paren
diff --git a/docs/Tidy.html b/docs/Tidy.html
index 00cdf7d4..c3501382 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -372,7 +372,7 @@
 
 
VERSION

 
-
This man page documents Perl::Tidy version 20200110.01

+
This man page documents Perl::Tidy version 20200619

 
 
LICENSE

 
diff --git a/docs/perltidy.html b/docs/perltidy.html
index 75322a6f..91e6b0f1 100644
--- a/docs/perltidy.html
+++ b/docs/perltidy.html
@@ -448,6 +448,8 @@
         $self->balance( $self->balance + $amount );
     }

 
+
For one of the extensions, module Switch::Plain, colons are marked as labels. If you use this module, you may want to also use the --nooutdent-labels flag to prevent lines such as 'default:' from being outdented.

+
 
This flag is enabled by default but it can be deactivated with -nxs. Probably the only reason to deactivate this flag is to generate more diagnostic messages when debugging a script.

 
 
@@ -552,7 +554,7 @@
 
 
The value given to -ci is also used by some commands when a small space is required. Examples are commands for outdenting labels, -ola, and control keywords, -okw.

 
-
When default values are not used, it is suggested that the value n given with -ci=n be no more than about one-half of the number of spaces assigned to a full indentation level on the -i=n command.

+
When default values are not used, it is highly recommended that the value n given with -ci=n be no more than about one-half of the number of spaces assigned to a full indentation level on the -i=n command. The reason is that discontinuities in the definition and control of continuation indentation arise in complex code, and this rule helps to smooth out these discontinuities.

 
 
 
-sil=n --starting-indentation-level=n

@@ -842,7 +844,7 @@
 
Note: Perltidy does always follow whitespace controls

 

 
-
The various parameters controlling whitespace within a program are requests which perltidy follows as well as possible, but there are a number of situations where changing whitespace could change program behavior and is not done. Examples are whitespace around bareword symbols and possible filehandles. For example, consider the problem of formatting the following subroutine:

+
The various parameters controlling whitespace within a program are requests which perltidy follows as well as possible, but there are a number of situations where changing whitespace could change program behavior and is not done. Some of these are obvious; for example, we should not remove the space between the two plus symbols in '$x+ +$y' to avoid creating a '++' operator. Some are more subtle and involve the whitespace around bareword symbols and locations of possible filehandles. For example, consider the problem of formatting the following subroutine:

 
 
   sub print_div {
       my ($x,$y)=@_;
@@ -856,9 +858,9 @@
        print $x /$y;
    }

 
-
If formatted in this way, the program will not run (at least with recent versions of perl) because the / is assumed to start a quote. In a complex program, there might happen to be a / which terminates the multiline quote without a syntax error, allowing the program to run, but incorrectly.

+
If formatted in this way, the program will not run (at least with recent versions of perl) because the $x is taken to be a filehandle and / is assumed to start a quote. In a complex program, there might happen to be a / which terminates the multiline quote without a syntax error, allowing the program to run, but incorrectly.

 
-
Related issues arise with other binary operator symbols, such as + and -, and in older versions of perl there could be problems with ternary operators. So to avoid changing program behavior, perltidy has the simple rule that whitespace around possible filehandles is left unchanged. Likewise, whitespace around barewords is left unchanged.

+
Related issues arise with other binary operator symbols, such as + and -, and in older versions of perl there could be problems with ternary operators. So to avoid changing program behavior, perltidy has the simple rule that whitespace around possible filehandles is left unchanged. Likewise, whitespace around barewords is left unchanged. The reason is that if the barewords are defined in other modules, or in code that has not even been written yet, perltidy will not have seen their prototypes and must treat them cautiously.

 
 

 
Space between specific keywords and opening paren

@@ -866,7 +868,7 @@
 
 
When an opening paren follows a Perl keyword, no space is introduced after the keyword, unless it is (by default) one of these:

 
-
   my local our and or eq ne if else elsif until unless 
+
   my local our and or xor eq ne if else elsif until unless 
    while for foreach return switch case given when

 
 
These defaults can be modified with two commands:

@@ -1997,7 +1999,7 @@
 
 
Controlling List Formatting

 
-
Perltidy attempts to format lists of comma-separated values in tables which look good. Its default algorithms usually work well, but sometimes parameters available to control list formatting. In this case, there are several methods available to control list formatting.

+
Perltidy attempts to format lists of comma-separated values in tables which look good. Its default algorithms usually work well, but sometimes they don't. In this case, there are several methods available to control list formatting.

 
 
A very simple way to prevent perltidy from changing the line breaks within a comma-separated list of values is to insert a blank line, comment, or side-comment anywhere between the opening and closing parens (or braces or brackets). This causes perltidy to skip over its list formatting logic. (The reason is that any of these items put a constraint on line breaks, and perltidy needs complete control over line breaks within a container to adjust a list layout). For example, let us consider

 
@@ -3119,7 +3121,7 @@
 
 
VERSION

 
-
This man page documents perltidy version 20200110.01

+
This man page documents perltidy version 20200619

 
 
BUG REPORTS

 
diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
index 96b7710b..004bcd7b 100644
--- a/lib/Perl/Tidy.pm
+++ b/lib/Perl/Tidy.pm
@@ -110,7 +110,7 @@ BEGIN {
     # Release version must be bumped, and it is probably past time for a
     # release anyway.
 
-    $VERSION = '20200110.01';
+    $VERSION = '20200619';
 }
 
 sub streamhandle {
diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod
index 803912a2..f90ad0ee 100644
--- a/lib/Perl/Tidy.pod
+++ b/lib/Perl/Tidy.pod
@@ -432,7 +432,7 @@ The module 'Perl::Tidy' comes with a binary 'perltidy' which is installed when t
 
 =head1 VERSION
 
-This man page documents Perl::Tidy version 20200110.01
+This man page documents Perl::Tidy version 20200619
 
 =head1 LICENSE
 
diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm
index 74ec6123..70bb0164 100644
--- a/lib/Perl/Tidy/Debugger.pm
+++ b/lib/Perl/Tidy/Debugger.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::Debugger;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm
index ab2d645c..110c7376 100644
--- a/lib/Perl/Tidy/DevNull.pm
+++ b/lib/Perl/Tidy/DevNull.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::DevNull;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 sub new   { my $self = shift; return bless {}, $self }
 sub print { return }
 sub close { return }
diff --git a/lib/Perl/Tidy/Diagnostics.pm b/lib/Perl/Tidy/Diagnostics.pm
index b0fd5d24..495fd4ab 100644
--- a/lib/Perl/Tidy/Diagnostics.pm
+++ b/lib/Perl/Tidy/Diagnostics.pm
@@ -20,7 +20,7 @@
 package Perl::Tidy::Diagnostics;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm
index 943cefe5..e5c6eab6 100644
--- a/lib/Perl/Tidy/FileWriter.pm
+++ b/lib/Perl/Tidy/FileWriter.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::FileWriter;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 # Maximum number of little messages; probably need not be changed.
 my $MAX_NAG_MESSAGES = 6;
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index ef1fa775..c865d989 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -12,7 +12,7 @@ package Perl::Tidy::Formatter;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 # The Tokenizer will be loaded with the Formatter
 ##use Perl::Tidy::Tokenizer;    # for is_keyword()
@@ -2230,9 +2230,9 @@ sub set_whitespace_flags {
         }
         elsif ( $type eq 'k' ) {
 
-	    # Keywords 'for', 'foreach' are special cases for -kpit since the
-	    # opening paren does not always immediately follow the keyword. So
-	    # we have to search forward for the paren in this case.  I have
+            # Keywords 'for', 'foreach' are special cases for -kpit since the
+            # opening paren does not always immediately follow the keyword. So
+            # we have to search forward for the paren in this case.  I have
             # limited the search to 10 tokens ahead, just in case somebody
             # has a big file and no opening paren.  This should be enough for
             # all normal code.
@@ -9411,10 +9411,10 @@ sub pad_token {
                 # token
                 if ( $pad_spaces < 0 ) {
 
-		    # Deactivated for -kpit due to conflict. This block deletes
-		    # a space in an attempt to improve alignment in some cases,
-		    # but it may conflict with user spacing requests.  For now
-		    # it is just deactivated if the -kpit option is used.
+                    # Deactivated for -kpit due to conflict. This block deletes
+                    # a space in an attempt to improve alignment in some cases,
+                    # but it may conflict with user spacing requests.  For now
+                    # it is just deactivated if the -kpit option is used.
                     if ( $pad_spaces == -1 ) {
                         if (   $ipad > $ibeg
                             && $types_to_go[ $ipad - 1 ] eq 'b'
diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm
index cc2419a1..ac432c7b 100644
--- a/lib/Perl/Tidy/HtmlWriter.pm
+++ b/lib/Perl/Tidy/HtmlWriter.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::HtmlWriter;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 use File::Basename;
 
diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm
index 460c00b5..00761316 100644
--- a/lib/Perl/Tidy/IOScalar.pm
+++ b/lib/Perl/Tidy/IOScalar.pm
@@ -10,7 +10,7 @@ package Perl::Tidy::IOScalar;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
     my ( $package, $rscalar, $mode ) = @_;
diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm
index fe3a283a..873e28cc 100644
--- a/lib/Perl/Tidy/IOScalarArray.pm
+++ b/lib/Perl/Tidy/IOScalarArray.pm
@@ -14,7 +14,7 @@ package Perl::Tidy::IOScalarArray;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
     my ( $package, $rarray, $mode ) = @_;
diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm
index dca3473b..36ab7b68 100644
--- a/lib/Perl/Tidy/IndentationItem.pm
+++ b/lib/Perl/Tidy/IndentationItem.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::IndentationItem;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm
index 8b9efba9..7ff88408 100644
--- a/lib/Perl/Tidy/LineBuffer.pm
+++ b/lib/Perl/Tidy/LineBuffer.pm
@@ -12,7 +12,7 @@
 package Perl::Tidy::LineBuffer;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm
index bdd899d7..6305599d 100644
--- a/lib/Perl/Tidy/LineSink.pm
+++ b/lib/Perl/Tidy/LineSink.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::LineSink;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm
index 15cc2aca..f44382a4 100644
--- a/lib/Perl/Tidy/LineSource.pm
+++ b/lib/Perl/Tidy/LineSource.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::LineSource;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm
index df9b5436..446a8926 100644
--- a/lib/Perl/Tidy/Logger.pm
+++ b/lib/Perl/Tidy/Logger.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::Logger;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 872a37e7..697913d5 100644
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -21,7 +21,7 @@
 package Perl::Tidy::Tokenizer;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 use Perl::Tidy::LineBuffer;
 
diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm
index 723d3bb4..f4367cf5 100644
--- a/lib/Perl/Tidy/VerticalAligner.pm
+++ b/lib/Perl/Tidy/VerticalAligner.pm
@@ -1,7 +1,7 @@
 package Perl::Tidy::VerticalAligner;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 use Perl::Tidy::VerticalAligner::Alignment;
 use Perl::Tidy::VerticalAligner::Line;
@@ -2029,7 +2029,7 @@ sub my_flush_comment {
     # look for excessively long lines
     my $max_excess = 0;
     foreach my $item (@group_lines) {
-        my ($str, $str_len) = @{$item}; 
+        my ( $str, $str_len ) = @{$item};
         my $excess =
           $str_len +
           $leading_space_count -
@@ -2337,7 +2337,7 @@ EOM
     my $k         = 0;
     my $jdel_next = $ridel->[$k];
 
-    if ( $jdel_next < 0 ) { return }  # shouldnt happen
+    if ( $jdel_next < 0 ) { return }    # shouldnt happen
     my $pattern      = $rpatterns_old->[0];
     my $field        = $rfields_old->[0];
     my $field_length = $rfield_lengths_old->[0];
@@ -2409,8 +2409,8 @@ EOM
         my ( $raw_tok, $lev, $tag, $tok_count ) =
           decode_alignment_token($new_list_type);
 
-	# But for lines with leading commas, we will require that they be
-	# tagged before converting a line from non-list to a list.
+        # But for lines with leading commas, we will require that they be
+        # tagged before converting a line from non-list to a list.
         if ($tag) {
             for ( my $i = 1 ; $i < @{$rtokens_new} - 1 ; $i++ ) {
                 if ( $rtokens_new->[$i] !~ /^(,|=>)/ ) {
@@ -2654,8 +2654,8 @@ sub delete_unmatched_tokens {
     foreach my $line ( @{$rnew_lines} ) {
         my $rhash   = {};
         my $rtokens = $line->get_rtokens();
-        if ( !$saw_list_type && $line->get_list_type() ) { $saw_list_type = 1}
-        my $i       = 0;
+        if ( !$saw_list_type && $line->get_list_type() ) { $saw_list_type = 1 }
+        my $i = 0;
         my $i_eq;
         my $lev_min;
         foreach my $tok ( @{$rtokens} ) {
@@ -2833,7 +2833,7 @@ sub delete_unmatched_tokens {
     return;
 }
 
-{    # fix_ragged_matches
+{        # fix_ragged_matches
 
     my %is_comma_or_comment;
     my $BLOCK_MERGE_RATIO;
@@ -2845,13 +2845,13 @@ sub delete_unmatched_tokens {
         @q = ( ',', '=>', '#' );
         @is_comma_or_comment{@q} = (1) x scalar(@q);
 
-	# This fraction controls merges. Only merge a long block into a shorter
-	# block if the ratio of the number of lines is less than this ratio.
-	# The idea is to avoid merging away a significant block that would
-	# otherwise be aligned.  This is not a critical parameter.  Some
-	# testing showed that it is best between about 0.3 and 0.5.  The
-	# original test snippet, git25, worked best with a value >=0.35. 
-        $BLOCK_MERGE_RATIO = 0.5; 
+        # This fraction controls merges. Only merge a long block into a shorter
+        # block if the ratio of the number of lines is less than this ratio.
+        # The idea is to avoid merging away a significant block that would
+        # otherwise be aligned.  This is not a critical parameter.  Some
+        # testing showed that it is best between about 0.3 and 0.5.  The
+        # original test snippet, git25, worked best with a value >=0.35.
+        $BLOCK_MERGE_RATIO = 0.5;
 
         # Debug flag
         $EXPLAIN = 0;
@@ -2866,7 +2866,7 @@ sub delete_unmatched_tokens {
         # which can be improved by adjusting alignments.
 
         # TODO: This version only treats lists.  It might be generalized
-        # to handle more types of matches. 
+        # to handle more types of matches.
 
         #########################################################
         # Step 1. Start by scanning the lines and collecting info
@@ -2893,7 +2893,7 @@ sub delete_unmatched_tokens {
             my $list_type = $line->get_list_type();
 
             # No matches if there is a group ending flag set between these lines
-            my $end_group = ( $jj_m >= 0 && $rlines->[$jj_m]->{_end_group} ); 
+            my $end_group = ( $jj_m >= 0 && $rlines->[$jj_m]->{_end_group} );
 
             # Also skip past a non-list line; we are working on pure lists here
             if ( $end_group || !$list_type ) {
@@ -2944,7 +2944,7 @@ sub delete_unmatched_tokens {
         # imax_match = index of maximum alignment token for lines in this batch.
         #    This value applies to matches between all lines j=jbeg to jend and
         #    j=jbeg-1 to jend-1.  In other words, the value for a pair of lines
-        #    is stored with the line with the higher index. 
+        #    is stored with the line with the higher index.
         my $imatch      = -10;
         my $j_last_line = @{$rlines} - 1;
         my %counts;
@@ -3126,10 +3126,10 @@ sub delete_unmatched_tokens {
 
                 # Now delete the unused alignment tokens
 
-                # NOTE: We are currently only working on lists, so we can allow
-                # lines to be promoted as lists.  But if this coding is generalized
-                # this flag may have to be adjusted to handle or non-lists.
-                my $new_list_ok = 1;  
+             # NOTE: We are currently only working on lists, so we can allow
+             # lines to be promoted as lists.  But if this coding is generalized
+             # this flag may have to be adjusted to handle or non-lists.
+                my $new_list_ok = 1;
 
                 if ( $imax_match_j < $imax ) {
                     my @idel = ( $imax_match_j + 1 .. $imax );
@@ -3141,7 +3141,7 @@ sub delete_unmatched_tokens {
     }
 }
 
-{        # decide_if_aligned_pair
+{    # decide_if_aligned_pair
 
     my %is_if_or;
     my %is_assignment;
diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
index 81233fbd..3c5a7ee1 100644
--- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::VerticalAligner::Alignment;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 {
 
diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm
index c61345c2..46aeb278 100644
--- a/lib/Perl/Tidy/VerticalAligner/Line.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Line.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::VerticalAligner::Line;
 use strict;
 use warnings;
-our $VERSION = '20200110.01';
+our $VERSION = '20200619';
 
 {