Merge pull request #831 from null-a/fix-760

Fix bug directly calling conditional
probmods · Apr 21, 2017 · 83adc18 · 83adc18
2 parents 5e91397 + 1dd4676
commit 83adc18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/syntax.js b/src/syntax.js
@@ -131,6 +131,7 @@ function isPrimitive(node) {
     case Syntax.FunctionExpression:
     case Syntax.Identifier:
     case Syntax.CallExpression:
+    case Syntax.ConditionalExpression:
       return false;
     case Syntax.MemberExpression:
       return (types.Identifier.check(node.object) ||

diff --git a/tests/test-transforms.js b/tests/test-transforms.js
@@ -451,7 +451,14 @@ var tests = {
         'var a = ((x === undefined) ? false : id(x.foo)) || true;',
         'a'
       ].join('\n'),
-      expected: true }
+      expected: true },
+
+    { name: 'testConditional5',
+      code: [
+        'var id = function(x){return x};',
+        '(true ? id : id)(0)'
+      ].join('\n'),
+      expected: 0 }
 
   ],