Merge pull request #54 from DRBragg/drbragg/adding_features

Adding Features

Author: kddnewton

lib/syntax_tree/node.rb

@@ -2066,7 +2066,12 @@ def format(q)
             part = arguments.parts.first
 
             if part.is_a?(Paren)
-              q.format(arguments)
+              if part.contents.body.length == 1 && skip_parens?(part.contents.body.first)
+                q.text(" ")
+                q.format(part.contents.body.first)
+              else
+                q.format(arguments)
+              end
             elsif part.is_a?(ArrayLiteral)
               q.text(" ")
               q.format(arguments)
@@ -2091,6 +2096,17 @@ def format_arguments(q, opening, closing)
       q.breakable("")
       q.if_break { q.text(closing) }
     end
+
+    def skip_parens?(node)
+      case node
+      in Int | FloatLiteral
+        true
+      in VarRef[value: GVar | IVar | CVar | Kw | Const]
+        true
+      else
+        false
+      end
+    end
   end
 
   # Break represents using the +break+ keyword.
@@ -4664,6 +4680,11 @@ def format(q)
         return
       end
 
+      if contains_conditional?
+        format_break(q, force: true)
+        return
+      end
+
       if node.consequent || node.statements.empty?
         q.group { format_break(q, force: true) }
       else
@@ -4700,6 +4721,11 @@ def format_break(q, force:)
       q.breakable(force: force)
       q.text("end")
     end
+
+    def contains_conditional?
+      node.statements.body.length == 1 &&
+      [If, IfMod, IfOp, Unless, UnlessMod].include?(node.statements.body.first.class)
+    end
   end
 
   # If represents the first clause in an +if+ chain.

test/fixtures/if.rb

@@ -28,3 +28,7 @@
 if (foo += 1)
   foo
 end
+%
+if foo
+  a ? b : c
+end

test/fixtures/next.rb

@@ -25,3 +25,31 @@
   foo
   bar
 )
+%
+next(1)
+-
+next 1
+%
+next(1.0)
+-
+next 1.0
+%
+next($a)
+-
+next $a
+%
+next(@@a)
+-
+next @@a
+%
+next(self)
+-
+next self
+%
+next(@a)
+-
+next @a
+%
+next(A)
+-
+next A

test/fixtures/unless.rb

@@ -28,3 +28,7 @@
 unless (foo += 1)
   foo
 end
+%
+unless foo
+  a ? b : c
+end