From f1840a4f39f85df5d9bae1154c962451284548ec Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 23 Dec 2014 22:19:53 +0300 Subject: [PATCH] Fixed detection of parenthesis needed (otherwise it added them around if when not needed) --- .../frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 48dc3be3c9f..adab4dcfb77 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -482,7 +482,11 @@ public class JetPsiUtil { if (expression instanceof JetPrefixExpression || expression instanceof JetLabeledExpression) return maxPriority - 2; - if (expression instanceof JetDeclaration || expression instanceof JetStatementExpression || expression instanceof JetIfExpression) { + if (expression instanceof JetIfExpression) { + return JetExpressionParsing.Precedence.ASSIGNMENT.ordinal(); + } + + if (expression instanceof JetDeclaration || expression instanceof JetStatementExpression) { return 0; }