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

lambda -> method ref: do not skip array initializer; ensure dimension expressions are correct

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-02 11:02:37 +01:00
parent dc2ec22efb
commit fa99ec2a74
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
View File

@@ -89,12 +89,16 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
final PsiParameter[] parameters,
PsiType functionalInterfaceType) {
final PsiCallExpression callExpression = extractMethodCallFromBlock(body);
if (callExpression instanceof PsiNewExpression && ((PsiNewExpression)callExpression).getAnonymousClass() != null) {
return null;
if (callExpression instanceof PsiNewExpression) {
final PsiNewExpression newExpression = (PsiNewExpression)callExpression;
if (newExpression.getAnonymousClass() != null || newExpression.getArrayInitializer() != null) {
return null;
}
}
final String methodReferenceText = createMethodReferenceText(callExpression, functionalInterfaceType, parameters);
if (methodReferenceText != null) {
LOG.assertTrue(callExpression != null);
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(callExpression.getProject());
final PsiMethodReferenceExpression methodReferenceExpression =
(PsiMethodReferenceExpression)elementFactory.createExpressionFromText(methodReferenceText, callExpression);
@@ -108,6 +112,16 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
return null;
}
if (!(element instanceof PsiMethod)) {
LOG.assertTrue(callExpression instanceof PsiNewExpression);
final PsiExpression[] dims = ((PsiNewExpression)callExpression).getArrayDimensions();
if (dims.length == 1 && parameters.length == 1){
if (!resolvesToParameter(dims[0], parameters[0])) {
return null;
}
}
else if (dims.length > 0) {
return null;
}
return callExpression;
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeArrayConstructorRefNonParameterDimension.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "false"
class Test {
{
java.util.stream.IntStream.range(0, 8).mapToObj(i -> new St<caret>ring[i + 4]);
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeArrayConstructorRefTooManyDimensions.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "false"
class Test {
{
java.util.stream.IntStream.range(0, 8).mapToObj(i -> new St<caret>ring[i][i]);
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeNewArrayExpressionWithArrayInitializer.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "false"
class Test {
{
java.util.stream.IntStream.range(0, 8).mapToObj(i -> new St<caret>ring[] {"".substring(i)});
}
}