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

"Replace 'invoke' with direct call" intention: do not add unnecessary parenthesis

Browse Source 
#KT-37967 Fixed
This commit is contained in:
Toshiaki Kameyama
2020-04-03 11:33:53 +09:00
committed by Vladimir Dolzhenko
parent 2f29b38b19
commit 9b3c3ae4ba
8 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+14 -8
View File
@@ -455,15 +455,21 @@ public class KtPsiUtil {
if (parentElement instanceof KtCallExpression && currentInner == ((KtCallExpression) parentElement).getCalleeExpression()) {
KtCallExpression parentCall = (KtCallExpression) parentElement;
if (innerExpression instanceof KtSimpleNameExpression) return false;
KtExpression targetInnerExpression = innerExpression;
if (targetInnerExpression instanceof KtDotQualifiedExpression) {
KtExpression selector = ((KtDotQualifiedExpression) targetInnerExpression).getSelectorExpression();
if (selector != null) {
targetInnerExpression = selector;
}
}
if (targetInnerExpression instanceof KtSimpleNameExpression) return false;
if (KtPsiUtilKt.getQualifiedExpressionForSelector(parentElement) != null) return true;
if (innerExpression instanceof KtCallExpression
&& parentCall.getValueArgumentList() == null) return true;
return !(innerExpression instanceof KtThisExpression
|| innerExpression instanceof KtArrayAccessExpression
|| innerExpression instanceof KtConstantExpression
|| innerExpression instanceof KtStringTemplateExpression
|| innerExpression instanceof KtCallExpression);
if (targetInnerExpression instanceof KtCallExpression && parentCall.getValueArgumentList() == null) return true;
return !(targetInnerExpression instanceof KtThisExpression
|| targetInnerExpression instanceof KtArrayAccessExpression
|| targetInnerExpression instanceof KtConstantExpression
|| targetInnerExpression instanceof KtStringTemplateExpression
|| targetInnerExpression instanceof KtCallExpression);
}
if (parentElement instanceof KtValueArgument) {