From 7ee72f2ebc97c722eb76b25f78011f02a70b37af Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 11 Aug 2016 20:02:15 +0200 Subject: [PATCH] stop at file level when going up the tree in KtPsiUtil.areParenthesesNecessary() (EA-86495 - NPE: KtPsiUtil.areParenthesesNecessary) --- compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 51d990be07e..e9a72817c14 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -480,7 +480,7 @@ public class KtPsiUtil { PsiElement current = parentElement; - while (!(current instanceof KtBlockExpression || current instanceof KtDeclaration || current instanceof KtStatementExpression)) { + while (!(current instanceof KtBlockExpression || current instanceof KtDeclaration || current instanceof KtStatementExpression || current instanceof KtFile)) { if (current.getTextRange().getEndOffset() != currentInner.getTextRange().getEndOffset()) { return !(current instanceof KtParenthesizedExpression) && !(current instanceof KtValueArgumentList); // if current expression is "guarded" by parenthesis, no extra parenthesis is necessary }