MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

trivial functional expressions usage: inline args if provided (IDEA-131090)

Browse Source
This commit is contained in:
Anna Kozlova
2016-01-12 16:01:51 +01:00
parent e39f57a94e
commit aad1c273e1
3 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/afterPassArgs.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace method call on method reference with corresponding method call" "true"
import java.util.function.ToIntFunction;
class Test {
{
int i = Integer.parseInt("123");
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/beforePassArgs.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace method call on method reference with corresponding method call" "true"
import java.util.function.ToIntFunction;
class Test {
{
int i = ((ToIntFunction<String>) Integer::parseInt).apply<caret>AsInt("123");
}
}

22
plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java
View File

@@ -18,9 +18,11 @@ package com.intellij.codeInspection;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.MethodSignatureUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.InlineUtil;
import com.intellij.refactoring.util.LambdaRefactoringUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -105,7 +107,8 @@ public class TrivialFunctionalExpressionUsageInspection extends BaseJavaBatchLoc
final PsiMethod resolveMethod = ((PsiMethodCallExpression)ggParent).resolveMethod();
final PsiElement referenceNameElement = ((PsiMethodCallExpression)ggParent).getMethodExpression().getReferenceNameElement();
if (resolveMethod != null &&
resolveMethod.getParameterList().getParametersCount() == 0 &&
!resolveMethod.isVarArgs() &&
((PsiMethodCallExpression)ggParent).getArgumentList().getExpressions().length == resolveMethod.getParameterList().getParametersCount() &&
referenceNameElement != null &&
elementContainerCondition.value(ggParent)) {
final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(interfaceType);
@@ -172,6 +175,8 @@ public class TrivialFunctionalExpressionUsageInspection extends BaseJavaBatchLoc
}
private static void replaceWithLambdaBody(PsiMethodCallExpression callExpression, PsiLambdaExpression element) {
inlineCallArguments(callExpression, element);
final PsiElement body = element.getBody();
if (body instanceof PsiExpression) {
callExpression.replace(body);
@@ -213,5 +218,20 @@ public class TrivialFunctionalExpressionUsageInspection extends BaseJavaBatchLoc
}
}
}
private static void inlineCallArguments(PsiMethodCallExpression callExpression, PsiLambdaExpression element) {
final PsiExpression[] args = callExpression.getArgumentList().getExpressions();
final PsiParameter[] parameters = element.getParameterList().getParameters();
for (int i = 0; i < parameters.length; i++) {
final PsiParameter parameter = parameters[i];
final PsiExpression initializer = args[i];
for (PsiReference reference : ReferencesSearch.search(parameter)) {
final PsiElement referenceElement = reference.getElement();
if (referenceElement instanceof PsiJavaCodeReferenceElement) {
InlineUtil.inlineVariable(parameter, initializer, (PsiJavaCodeReferenceElement)referenceElement);
}
}
}
}
}
}