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 339a21f95ba4594cbd12865b284644c29fd77ba7..3cebb220e8d54667033577216b178e722297332f 100644 (file)
--- 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 d23bffa0050b5a17b38e6a8aca7e381563653bd8..f1a4dbf38f5ad5ca6d3270707f88fdd9b610737c 100644 (file)
--- 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 e57af163e3e75a11cb265dd0a93ac62a0a1a0fc1..1c5d3361d3d2a2d620a15899bff4c69d1ebd0329 100644 (file)
--- 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;