Force using braces if the block is within a Binary within the predicate of a loop or conditional.

Author: kddnewton

CHANGELOG.md

@@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Force using braces if the block is within the predicate of a ternary.
 - Properly handle trailing comments after a `then` operator on a `When` or `In` clause.
 - Ensure nested `HshPtn` nodes use braces.
+- Force using braces if the block is within a `Binary` within the predicate of a loop or conditional.
 
 ### Removed
 

lib/syntax_tree.rb

@@ -2288,11 +2288,14 @@ def format(q)
       q.group do
         q.group { q.format(left) }
         q.text(" ") unless power
-        q.text(operator)
 
-        q.indent do
-          q.breakable(power ? "" : " ")
-          q.format(right)
+        q.group do
+          q.text(operator)
+
+          q.indent do
+            q.breakable(power ? "" : " ")
+            q.format(right)
+          end
         end
       end
     end
@@ -2788,8 +2791,14 @@ def forced_do_end_bounds?(q)
     # If we're the predicate of a loop or conditional, then we're going to have
     # to go with the {..} bounds.
     def forced_brace_bounds?(q)
-      parent, grandparent, = q.parents.to_a
-      [If, IfMod, IfOp, Unless, UnlessMod, While, WhileMod, Until, UntilMod].include?(grandparent.class) && parent == grandparent.predicate
+      parents = q.parents.to_a
+      parents.each_with_index.any? do |parent, index|
+        # If we hit certain breakpoints then we know we're safe.
+        break false if [Paren, Statements].include?(parent.class)
+
+        [If, IfMod, IfOp, Unless, UnlessMod, While, WhileMod, Until, UntilMod].include?(parent.class) &&
+          parent.predicate == parents[index - 1]
+      end
     end
 
     def format_break(q, opening, closing)