Fix RT#132059, -dac was not working

diff --git a/BUGS.md b/BUGS.md
index 1ec2b4874ca01c584a96c780bd1822a0f48b38f7..a64b8ae11edc011eed778c5a2b1b7fa7cda26066 100644 (file)
--- a/BUGS.md
+++ b/BUGS.md
@@ -38,6 +38,21 @@ perltidy is untangling complex ternary statements. Use the iteration parameter
 **-it=2** if it is important that the results be unchanged on subsequent passes,
 but note that this doubles the run time.
 
+## Perltidy does not look for here-document targets inside of quoted strings
+
+For example, consider the following script
+
+```
+print "${ \<<END1 }${ \<<END2 }";
+Hello 
+END1
+World 
+END2
+```
+
+Perltidy will not look for the here-doc targets within the quotes, so it
+will not format the script correctly.
+
 ## Latest Bug and Wishlist at CPAN:
 
 For the latest list of bugs and feature requests at CPAN see:

diff --git a/MANIFEST b/MANIFEST
index e2d52ae6761dbc6eb7edbfc7866814111e6aaa8d..cc8c9c51a138be8aa11eb95d34f5054234ca1f5d 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,4 @@
+.pre-commit-hooks.yaml
 bin/perltidy
 BUGS.md
 CHANGES.md
@@ -61,6 +62,7 @@ t/snippets13.t
 t/snippets14.t
 t/snippets15.t
 t/snippets16.t
+t/snippets17.t
 t/snippets2.t
 t/snippets3.t
 t/snippets4.t

diff --git a/dev-bin/build.pl b/dev-bin/build.pl
index 842e3b746ba4c149e9ce3c7fa3803a615e033760..483ca8d079925f8de54277030cc9db15af0a6eb9 100755 (executable)
--- a/dev-bin/build.pl
+++ b/dev-bin/build.pl
@@ -573,6 +573,10 @@ git add -A  [or whatever]
 git commit
 git tag -a $new_VERSION;
 
+You should also push any new tags:
+
+git push origin --tags
+
 To avoid error, I put this last command in a script $runme 
 EOM
         hitcr();
@@ -586,6 +590,7 @@ sub make_tag_script {
         print RUN <<EOM;
 #!/bin/sh
 git tag -a $new_VERSION
+git push origin --tags
 unlink \$0;
 EOM
     }

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index faa0f5e7c69a8fd58725edb9a43698101c967a0d..38e94a044d1932f930a37e4f24d6a21838222e38 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -7752,8 +7752,11 @@ EOM
         # we have to flush ..
         if (
 
-            # if there is a side comment
-            ( ( $type eq '#' ) && !$rOpts->{'delete-side-comments'} )
+           # if there is a side comment...
+            # Even if we deleted it! Otherwise,
+           # i-K indexing will have a gap and be incorrect ( see RT #132059)
+            ## ( ( $type eq '#' ) && !$rOpts->{'delete-side-comments'} )
+            $type eq '#'
 
             # if this line ends in a quote
             # NOTE: This is critically important for insuring that quoted lines

diff --git a/local-docs/Release-Checklist.md b/local-docs/Release-Checklist.md
index 8aadf4757bd2d028d8bffb60d3081534f9861358..8915e2e86328c534742b6350b9b8e0ff5f048a9f 100644 (file)
--- a/local-docs/Release-Checklist.md
+++ b/local-docs/Release-Checklist.md
@@ -40,3 +40,10 @@
 - Update CPAN tickets
 - Upload release to sourceforge
 - Update web sites
+- Be sure to run the RUNME.sh file to tag this version and also push the tags to github. Check that the tags are uploaded at:
+
+   https://github.com/perltidy/perltidy/tags
+
+- If you forget, or need to modify tags, see the directions in the book:
+
+   https://git-scm.com/book/en/v2/Git-Basics-Tagging

diff --git a/t/snippets/packing_list.txt b/t/snippets/packing_list.txt
index a959c9d458c9e362810c04acae7f706c2e7a2720..4ac536286888d73e773a957f770b1fb979e5cca7 100644 (file)
--- a/t/snippets/packing_list.txt
+++ b/t/snippets/packing_list.txt
@@ -154,6 +154,7 @@
 ../snippets16.t        rt131288.def
 ../snippets16.t        rt130394.rt130394
 ../snippets16.t        git18.def
+../snippets16.t        here2.def
 ../snippets2.t angle.def
 ../snippets2.t arrows1.def
 ../snippets2.t arrows2.def
@@ -314,4 +315,5 @@
 ../snippets9.t rt98902.def
 ../snippets9.t rt98902.rt98902
 ../snippets9.t rt99961.def
-../snippets16.t        here2.def
+../snippets17.t        rt132059.def
+../snippets17.t        rt132059.rt132059