Fix missing parens for (string + string).contains(...) (#6094)

INRIA · Dec 11, 2024 · 2cf9fb2 · 2cf9fb2
1 parent a1acd7b
commit 2cf9fb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -431,7 +431,7 @@ private boolean shouldSetBracketAroundExpressionAndCast(CtExpression<?> e) {
 				return requiresBrackets == RoundBracketAnalyzer.EncloseInRoundBrackets.YES || !e.getTypeCasts().isEmpty();
 			}
 			if (e.isParentInitialized() && e.getParent() instanceof CtTargetedExpression && ((CtTargetedExpression) e.getParent()).getTarget() == e) {
-				return e instanceof CtVariableRead<?> && !e.getTypeCasts().isEmpty();
+				return e instanceof CtVariableRead<?> && !e.getTypeCasts().isEmpty() || e instanceof CtBinaryOperator<?>;
 			}
 		} else if (!e.getTypeCasts().isEmpty()) {
 			return true;

diff --git a/src/test/java/spoon/reflect/visitor/DefaultJavaPrettyPrinterTest.java b/src/test/java/spoon/reflect/visitor/DefaultJavaPrettyPrinterTest.java
@@ -77,6 +77,7 @@ public class DefaultJavaPrettyPrinterTest {
             "(1 | 2) ^ 3",
             "((int) (1 + 2)) * 3",
             "(int) (int) (1 + 1)",
+            "(\"1\" + \"2\").contains(\"1\")",
     })
     public void testParenOptimizationCorrectlyPrintsParenthesesForExpressions(String rawExpression) {
         // contract: When input expressions are minimally parenthesized, pretty-printed output