Add Parentheses to Right Associative Expressions

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/formatter/ExpressionFormatter.java

@@ -77,16 +77,22 @@ private boolean needsParentheses(Expression parent, Expression child, boolean ri
         if (parent instanceof BinaryExpression parentBinary && child instanceof BinaryExpression childBinary)
             return needsBinaryParentheses(parentBinary, childBinary, rightOperand);
 
+        if (parent instanceof Ite && child instanceof Ite)
+            return true;
+
         if (parent instanceof UnaryExpression parentUnary && child instanceof UnaryExpression childUnary)
             return parentUnary.getOp().equals("-") && childUnary.getOp().equals("-");
 
         return false;
     }
 
     private boolean needsBinaryParentheses(BinaryExpression parent, BinaryExpression child, boolean rightOperand) {
-        if (rightOperand)
+        if (rightOperand) {
+            if (isRightAssociative(parent.getOperator()))
+                return true;
             return !isRightAssociative(parent.getOperator())
                     && (!isAssociative(parent.getOperator()) || !parent.getOperator().equals(child.getOperator()));
+        }
         return isRightAssociative(parent.getOperator());
     }
 

liquidjava-verifier/src/test/java/liquidjava/rj_language/ast/ExpressionFormatterTest.java

@@ -66,7 +66,9 @@ void formatsRightGrouping() {
     void formatsLogicalExpressions() {
         assertEquals("a && b || c", parse("a && b || c").toDisplayString());
         assertEquals("a && (b || c)", parse("a && (b || c)").toDisplayString());
-        assertEquals("a --> b --> c", parse("a --> b --> c").toDisplayString());
+        assertEquals("a --> (b --> c)", parse("a --> b --> c").toDisplayString());
+        assertEquals("a --> (b --> c)", parse("a --> (b --> c)").toDisplayString());
+        assertEquals("a --> (b --> (c --> d))", parse("a --> b --> c --> d").toDisplayString());
         assertEquals("(a --> b) --> c", parse("(a --> b) --> c").toDisplayString());
         assertEquals("a && b && c", parse("a && b && c").toDisplayString());
         assertEquals("a || b || c", parse("a || b || c").toDisplayString());
@@ -77,9 +79,10 @@ void formatsTernaryExpressions() {
         assertEquals("(a ? b : c) + d", parse("(a ? b : c) + d").toDisplayString());
         assertEquals("(a ? b : c) ? d : e", parse("(a ? b : c) ? d : e").toDisplayString());
         assertEquals("a ? (b ? c : d) : e", parse("a ? (b ? c : d) : e").toDisplayString());
-        assertEquals("a ? b : c ? d : e", parse("a ? b : c ? d : e").toDisplayString());
+        assertEquals("a ? b : (c ? d : e)", parse("a ? b : c ? d : e").toDisplayString());
         assertEquals("(a ? b : c) ? d : e", parse("(a ? b : c) ? d : e").toDisplayString());
-        assertEquals("a ? b : c ? d : e", parse("a ? b : (c ? d : e)").toDisplayString());
+        assertEquals("a ? b : (c ? d : e)", parse("a ? b : (c ? d : e)").toDisplayString());
+        assertEquals("a ? b : (c ? d : (e ? f : g))", parse("a ? b : c ? d : e ? f : g").toDisplayString());
         assertEquals("a ? b : c", parse("a ? b : c").toDisplayString());
     }
 }