From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Tue, 26 Nov 2024 20:17:07 +0000 (-0800)
Subject: fix b1466
X-Git-Tag: 20240903.07~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=201127dfb5ccf86d3743e1cfad08a0e85f2a042f;p=perltidy.git

fix b1466
---

diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index 6f91b8a1..aaed1ca1 100644
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -6508,7 +6508,8 @@ my $parser =
 ==> b1325 <==
 WriteMakefile(
    PREREQ_PM    => {
-      'Tk'            =>'800.025',
+      'Tk'            =>
+            '800.025',
       'Tk::DiffText'  => 0,
       'Perl::Tidy'    => 0
       , # comes in the perltidy application
@@ -6520,7 +6521,8 @@ WriteMakefile(
 
 WriteMakefile(
    PREREQ_PM    => {
-      'Tk'            =>'800.025',
+      'Tk'            =>
+            '800.025',
       'Tk::DiffText'  => 0,
       'Perl::Tidy'    => 0
       , # comes in the perltidy application
@@ -8104,8 +8106,8 @@ sub new{
                               while(($k,$v,)=each(%{$_[3]})){
                                    if($k eq"email_"){
                                         if(
-                                                 defined$groups{$_[1]}
-                                                 ->{"email_work"})
+                                                   defined$groups{$_[1]}
+                                                   ->{"email_work"})
                                         {
                                              $k="email_home";
                                         }
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 9d7b1957..ff70cc56 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -2874,7 +2874,10 @@ EOM
     #-----------------------------------------------------------
     # The combination -xlp -xci and ci>i can be unstable (b1466)
     #-----------------------------------------------------------
-    if (   $rOpts->{'extended-line-up-parentheses'}
+    # Deactivated: the fix for b1501 also fixed b1466 in a simpler way.
+    # So this block can eventually be removed.
+    if (   0
+        && $rOpts->{'extended-line-up-parentheses'}
         && $rOpts->{'extended-continuation-indentation'}
         && $rOpts->{'continuation-indentation'} > $rOpts->{'indent-columns'}
         && $rOpts->{'indent-columns'} > 1 )