From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Tue, 24 Jan 2023 01:46:00 +0000 (-0800)
Subject: give -kba priority over -otr (b1445)
X-Git-Tag: 20221112.04~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ff102a33bff69b00744b3e40cb04ed7f20788a9;p=perltidy.git

give -kba priority over -otr (b1445)
---

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index 339a21f9..3cebb220 100644
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -11310,6 +11310,34 @@ $last = after (
 --space-keyword-paren
 --vertical-tightness=1
 
+==> b1445.in <==
+         $cfg
+                  ->
+                  {
+                  $type
+                  }
+                  [$num
+                  ]
+                  or
+                  die
+"Unrecognized $type number: $num\n";
+
+         $cfg->{
+                  $type
+                  }
+                  [$num
+                  ]
+                  or
+                  die
+"Unrecognized $type number: $num\n";
+
+==> b1445.par <==
+--continuation-indentation=9
+--indent-columns=9
+--keep-old-breakpoints-after='->'
+--maximum-line-length=20
+--opening-hash-brace-right
+
 ==> b146.in <==
 # State 1
 
diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index d23bffa0..f1a4dbf3 100644
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -7673,6 +7673,27 @@ $last = after (
                   }
 
 
+==> b1445 <==
+         $cfg->
+                  {
+                  $type
+                  }
+                  [$num
+                  ]
+                  or
+                  die
+"Unrecognized $type number: $num\n";
+
+         $cfg->
+                  {
+                  $type
+                  }
+                  [$num
+                  ]
+                  or
+                  die
+"Unrecognized $type number: $num\n";
+
 ==> b146 <==
 # State 1
 
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index e57af163..1c5d3361 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -29006,6 +29006,9 @@ sub set_vertical_tightness_flags {
 
             # looks bad if we align vertically with the wrong container
             && $tokens_to_go[$ibeg] ne $tokens_to_go[$ibeg_next]
+
+            # give -kba priority over -otr (b1445)
+            && !$self->[_rbreak_after_Klast_]->{ $K_to_go[$iend] }
           )
         {
             my $spaces = ( $types_to_go[ $ibeg_next - 1 ] eq 'b' ) ? 1 : 0;