Add parentheses to ternary conditional (#715)

TheLartians · Perryvw · commit 20a5d92f9775 · 2019-09-03T19:31:36.000+02:00
* add broken ternary test case

* add parentheses to ternary condition
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -3829,7 +3829,7 @@ export class LuaTransformer {
     }
 
     protected transformProtectedConditionalExpression(expression: ts.ConditionalExpression): tstl.CallExpression {
-        const condition = this.transformExpression(expression.condition);
+        const condition = tstl.createParenthesizedExpression(this.transformExpression(expression.condition));
         const val1 = this.transformExpression(expression.whenTrue);
         const val2 = this.transformExpression(expression.whenFalse);
 
@@ -3847,7 +3847,7 @@ export class LuaTransformer {
         if (tsHelper.isFalsible(this.checker.getTypeAtLocation(expression.whenTrue), isStrict)) {
             return this.transformProtectedConditionalExpression(expression);
         }
-        const condition = this.transformExpression(expression.condition);
+        const condition = tstl.createParenthesizedExpression(this.transformExpression(expression.condition));
         const val1 = this.transformExpression(expression.whenTrue);
         const val2 = this.transformExpression(expression.whenFalse);
 
diff --git a/test/unit/conditionals.spec.ts b/test/unit/conditionals.spec.ts
@@ -288,6 +288,10 @@ test.each([
     { input: "false ? 'a' : 'b'" },
     { input: "true ? false : true" },
     { input: "false ? false : true" },
+    { input: "true || true ? 'a' : 'b'" },
+    { input: "true || false ? 'a' : 'b'" },
+    { input: "false || true ? 'a' : 'b'" },
+    { input: "false || false ? 'a' : 'b'" },
     { input: "true ? literalValue : true" },
     { input: "true ? variableValue : true" },
     { input: "true ? maybeUndefinedValue : true" },

Original file line number	Diff line number	Diff line change
`@@ -3829,7 +3829,7 @@ export class LuaTransformer {`
`3829`	`3829`	`}`
`3830`	`3830`
`3831`	`3831`	`protected transformProtectedConditionalExpression(expression: ts.ConditionalExpression): tstl.CallExpression {`
`3832`		`- const condition = this.transformExpression(expression.condition);`
	`3832`	`+ const condition = tstl.createParenthesizedExpression(this.transformExpression(expression.condition));`
`3833`	`3833`	`const val1 = this.transformExpression(expression.whenTrue);`
`3834`	`3834`	`const val2 = this.transformExpression(expression.whenFalse);`
`3835`	`3835`
`@@ -3847,7 +3847,7 @@ export class LuaTransformer {`
`3847`	`3847`	`if (tsHelper.isFalsible(this.checker.getTypeAtLocation(expression.whenTrue), isStrict)) {`
`3848`	`3848`	`return this.transformProtectedConditionalExpression(expression);`
`3849`	`3849`	`}`
`3850`		`- const condition = this.transformExpression(expression.condition);`
	`3850`	`+ const condition = tstl.createParenthesizedExpression(this.transformExpression(expression.condition));`
`3851`	`3851`	`const val1 = this.transformExpression(expression.whenTrue);`
`3852`	`3852`	`const val2 = this.transformExpression(expression.whenFalse);`
`3853`	`3853`