From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Thu, 27 Jun 2024 02:55:23 +0000 (-0700)
Subject: fix b1476
X-Git-Tag: 20240511.05~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=41a960e5512f9bc25f9861cb87a554c7d523ee02;p=perltidy.git

fix b1476
---

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 59db65ca..12879377 100644
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -12166,6 +12166,30 @@ run_sub ( ->$blah{ say "ok 5" ; }
 --space-terminal-semicolon
 --break-at-old-method-breakpoints
 
+==> b1476.in <==
+        $apply->configure(
+            -command => sub
+            {
+                get_button_values_from_panel();
+                execute_decors(0);
+                set_unsaved();
+            }
+        );
+
+        $apply->configure(
+            -command => sub
+            {
+                get_button_values_from_panel();
+                execute_decors(0);
+                set_unsaved();
+            },
+        );
+
+==> b1476.par <==
+--add-trailing-commas
+--want-trailing-commas='h'
+--delete-trailing-commas
+
 ==> b148.in <==
 # state 1
 @yydgoto=(
diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index 63e0b9fc..f41ad4bf 100644
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -8251,6 +8251,23 @@ run_sub (
          ->$blah{ say "ok 5" ; } ) ;
 
 
+==> b1476 <==
+        $apply->configure(
+            -command => sub {
+                get_button_values_from_panel();
+                execute_decors(0);
+                set_unsaved();
+            },
+        );
+
+        $apply->configure(
+            -command => sub {
+                get_button_values_from_panel();
+                execute_decors(0);
+                set_unsaved();
+            },
+        );
+
 ==> b148 <==
 # state 1
 @yydgoto=(
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index ab9a9333..01d00c69 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -12729,7 +12729,7 @@ sub match_trailing_comma_rule {
                 # - an isolated fat comma is a match for type 'h'
                 || (   $fat_comma_count == 1
                     && $new_comma_count == 1
-                    && $if_add
+                    ## && $if_add ## removed to fix b1476
                     && $trailing_comma_style eq 'h' )
             )
           )