From ff4f92842056ee41b731bd5ff6c0d43833289470 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 24 Aug 2017 16:02:12 +0300
Subject: [PATCH] KT-19896: Fix force parenthesizing of multiline elvis

 #KT-19896 fixed
---
 .../frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
index cd4d38896c8..1b2a7028bca 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
@@ -530,7 +530,10 @@ public class KtPsiUtil {
             return false;
         }
 
-        if (innerExpression instanceof KtBinaryExpression && isKeepBinaryExpressionParenthesized((KtBinaryExpression) innerExpression)) {
+        // '(x operator y)' case
+        if (innerExpression instanceof KtBinaryExpression &&
+            innerOperation != KtTokens.ELVIS &&
+            isKeepBinaryExpressionParenthesized((KtBinaryExpression) innerExpression)) {
             return true;
         }