azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lift assignment out: if last statement is lambda, enclose it in parentheses if necessary

Browse Source 
#KT-38155 Fixed
This commit is contained in:
Toshiaki Kameyama
2020-04-11 04:10:49 +02:00
committed by Vladimir Dolzhenko
parent e6476c39ca
commit ee406f1622
10 changed files with 126 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+10 -1
View File
@@ -450,7 +450,7 @@ public class KtPsiUtil {
if (innerExpression instanceof KtLambdaExpression) {
PsiElement prevSibling = PsiTreeUtil.skipWhitespacesAndCommentsBackward(currentInner);
if (prevSibling != null && prevSibling.getText().endsWith(KtTokens.RPAR.getValue())) return true;
if (endWithParenthesisOrCallExpression(prevSibling)) return true;
}
if (parentElement instanceof KtCallExpression && currentInner == ((KtCallExpression) parentElement).getCalleeExpression()) {
@@ -557,6 +557,15 @@ public class KtPsiUtil {
return innerPriority < parentPriority;
}
private static boolean endWithParenthesisOrCallExpression(PsiElement element) {
if (element == null) return false;
if (element.getText().endsWith(KtTokens.RPAR.getValue()) || element instanceof KtCallExpression) return true;
PsiElement[] children = element.getChildren();
int length = children.length;
if (length == 0) return false;
return endWithParenthesisOrCallExpression(children[length - 1]);
}
private static boolean isKeepBinaryExpressionParenthesized(KtBinaryExpression expression) {
PsiElement expr = expression.getFirstChild();
while (expr != null) {