KT-11710 "Replace 'if' with elvis operator": incorrect code generated for 'if' expression

#KT-11710 Fixed
2016-04-07 13:22:19 +03:00
parent 6a65442095
commit cdab9d5103
4 changed files with 18 additions and 1 deletions
@@ -475,7 +475,7 @@ public class KtPsiUtil {

            while (!(current instanceof KtBlockExpression || current instanceof KtDeclaration || current instanceof KtStatementExpression)) {
                if (current.getTextRange().getEndOffset() != currentInner.getTextRange().getEndOffset()) {
-                    return current.getText().charAt(current.getTextLength() - 1) != ')'; // if current expression is "guarded" by parenthesis, no extra parenthesis is necessary
+                    return !(current instanceof KtParenthesizedExpression) && !(current instanceof KtValueArgumentList); // if current expression is "guarded" by parenthesis, no extra parenthesis is necessary
                }

                current = current.getParent();