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

Author: kddnewton

CHANGELOG.md

@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Ensure `For` loops keep their trailing commas.
 - Replicate content for `__END__` keyword exactly.
 - Keep block `If`, `Unless`, `While`, and `Until` forms if there is an assignment in the predicate.
+- Force using braces if the block is within the predicate of a conditional or loop.
 
 ### Removed
 

lib/syntax_tree.rb

@@ -2723,6 +2723,8 @@ def format(q)
           [block_open.value, block_close, block_open.value, block_close]
         elsif forced_do_end_bounds?(q)
           ["do", "end", "do", "end"]
+        elsif forced_brace_bounds?(q)
+          ["{", "}", "{", "}"]
         else
           ["do", "end", "{", "}"]
         end
@@ -2764,6 +2766,13 @@ def forced_do_end_bounds?(q)
       [Break, Next, Return, Super].include?(q.parent.call.class)
     end
 
+    # 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 = q.parents.to_a[1]
+      [If, IfMod, Unless, UnlessMod, While, WhileMod, Until, UntilMod].include?(parent.class) && node == parent.predicate.block
+    end
+
     def format_break(q, opening, closing)
       q.text(" ")
       q.format(BlockOpenFormatter.new(opening, block_open))