MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-inspections] IDEA-283015: fix at isSafeLambdaReplacement level (IJ-CR-17732)

Browse Source 
GitOrigin-RevId: 07a8235e72509e11a48a2304fbfc82aa637c8cf6
This commit is contained in:
Tagir Valeev
2021-12-01 10:38:43 +07:00
committed by intellij-monorepo-bot
parent 1806d3fb65
commit 064235a0b3
7 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
View File

@@ -4,6 +4,7 @@ package com.intellij.psi;
import com.intellij.codeInsight.AnnotationTargetUtil;
import com.intellij.core.JavaPsiBundle;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil;
@@ -939,6 +940,19 @@ public final class LambdaUtil {
}
}
}
else if (PsiPolyExpressionUtil.isInAssignmentOrInvocationContext(lambda)) {
PsiType origType = lambda.getFunctionalInterfaceType();
if (origType != null) {
Project project = lambda.getProject();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
PsiDeclarationStatement declaration = factory.createVariableDeclarationStatement("$$$", origType, lambda, lambda);
PsiLocalVariable variable = (PsiLocalVariable)declaration.getDeclaredElements()[0];
PsiLambdaExpression lambdaCopy = (PsiLambdaExpression)variable.getInitializer();
PsiExpression replacement = replacer.apply(lambdaCopy);
PsiType type = replacement.getType();
return type != null && origType.isAssignableFrom(type);
}
}
return true;
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/afterIdentityAssignment.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace lambda expression with 'Function.identity()'" "true"
import java.util.function.Function;
class Scratch {
public static void main(String[] args) {
Function<String, String> myFunc = Function.identity();
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/afterIdentityAssignment2.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace lambda expression with 'Function.identity()'" "true"
import java.util.function.Function;
class Scratch {
public static void main(String[] args) {
Function<? super CharSequence, ? extends CharSequence> myFunc = Function.identity();
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/beforeIdentityAssignment.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace lambda expression with 'Function.identity()'" "true"
import java.util.function.Function;
class Scratch {
public static void main(String[] args) {
Function<String, String> myFunc = c <caret>-> c;
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/beforeIdentityAssignment2.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace lambda expression with 'Function.identity()'" "true"
import java.util.function.Function;
class Scratch {
public static void main(String[] args) {
Function<? super CharSequence, ? extends CharSequence> myFunc = c <caret>-> c;
}
}

0
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/beforeTypeMismatch.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodCall/beforeIdentityAssignmentTypeMismatch.java
View File

8
plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java
View File

@@ -85,14 +85,6 @@ public class LambdaCanBeMethodCallInspection extends AbstractBaseJavaLocalInspec
if (typeParameters.length != 2 || !typeParameters[1].isAssignableFrom(typeParameters[0])) return;
@NlsSafe String replacement = CommonClassNames.JAVA_UTIL_FUNCTION_FUNCTION + ".identity()";
if (!LambdaUtil.isSafeLambdaReplacement(lambda, replacement)) return;
PsiElement parent = PsiUtil.skipParenthesizedExprUp(lambda.getParent());
if (parent instanceof PsiAssignmentExpression || parent instanceof PsiReturnStatement ||
parent instanceof PsiVariable || parent instanceof PsiLambdaExpression) {
if (typeParameters[1] instanceof PsiClassType && typeParameters[0] instanceof PsiClassType &&
!typeParameters[0].equals(typeParameters[1])) {
return;
}
}
registerProblem(lambda, "Function.identity()", replacement);
}