avoid unnecessary parens around ternary operators

rubys · rubys · commit 8d0a51732fc2 · 2020-03-21T15:04:38.000-04:00
diff --git a/lib/ruby2js/converter.rb b/lib/ruby2js/converter.rb
@@ -28,7 +28,7 @@ class Converter < Serializer
       :=== => :'!=='
     }
 
-    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn]
+    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn, :if]
 
     VASGN = [:cvasgn, :ivasgn, :gvasgn, :lvasgn]
 
diff --git a/lib/ruby2js/converter/if.rb b/lib/ruby2js/converter/if.rb
@@ -55,8 +55,8 @@ class Converter
         end
       else
         else_block ||= s(:nil)
-        put '('; parse condition; put ' ? '; parse then_block
-        put ' : '; parse else_block; put ')'
+        parse condition; put ' ? '; parse then_block
+        put ' : '; parse else_block
       end
     end
   end
diff --git a/spec/transliteration_spec.rb b/spec/transliteration_spec.rb
@@ -114,11 +114,13 @@ def to_js( string, opts={} )
     
     it "should parse ternary operator" do
       to_js( 'x = true ? true : false').
-        must_equal "var x = (true ? true : false)"
+        must_equal "var x = true ? true : false"
       to_js( 'x = (true if y)').
-        must_equal "var x = (y ? true : null)"
+        must_equal "var x = y ? true : null"
       to_js( 'x = (true unless y)').
-        must_equal "var x = (!y ? true : null)"
+        must_equal "var x = !y ? true : null"
+      to_js( 'x = a + (b ? 1 : 0)').
+        must_equal "var x = a + (b ? 1 : 0)"
     end
   end
   
diff --git a/spec/vue_spec.rb b/spec/vue_spec.rb
@@ -389,7 +389,7 @@ def to_js_fn(string)
 
     it "should handle mixed strings and a conditional value" do
       to_js( 'class Foo<Vue; def render; _a.b class: ("c" if d); end; end' ).
-        must_include '$h("a", {class: ["b", (d ? "c" : null)]})'
+        must_include '$h("a", {class: ["b", d ? "c" : null]})'
     end
 
     it "should handle only a value" do

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Converter < Serializer`
`28`	`28`	`:=== => :'!=='`
`29`	`29`	`}`
`30`	`30`
`31`		`- GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn]`
	`31`	`+ GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn, :if]`
`32`	`32`
`33`	`33`	`VASGN = [:cvasgn, :ivasgn, :gvasgn, :lvasgn]`
`34`	`34`