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

fix foreach matching

Browse Source
This commit is contained in:
Roman Ivanov
2017-09-01 17:26:19 +07:00
parent 029b97749b
commit f7e89c348e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java
+5 -7
View File
@@ -40,10 +40,6 @@ public class SimplifyForEachInspection extends BaseJavaBatchLocalInspectionTool
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_STREAM_BASE_STREAM, "forEachOrdered").parameterCount(1);
private static final CallMatcher STREAM_FOREACH =
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_STREAM_BASE_STREAM, "forEach", "forEachOrdered").parameterCount(1);
private static final CallMatcher FOREACH = CallMatcher.anyOf(
STREAM_FOREACH,
ITERABLE_FOREACH
);
@Nls
@@ -136,13 +132,15 @@ public class SimplifyForEachInspection extends BaseJavaBatchLocalInspectionTool
@Nullable
static PsiLambdaExpression extractLambdaFromForEach(PsiMethodCallExpression call) {
PsiExpression qualifier = call.getMethodExpression().getQualifierExpression();
if (qualifier == null ||
!FOREACH.test(call) ||
!InheritanceUtil.isInheritor(qualifier.getType(), CommonClassNames.JAVA_UTIL_COLLECTION)) return null;
if (qualifier == null || !(STREAM_FOREACH.test(call) || isCollectionForEach(call, qualifier))) return null;
PsiExpression arg = call.getArgumentList().getExpressions()[0];
return tryCast(PsiUtil.skipParenthesizedExprDown(arg), PsiLambdaExpression.class);
}
private static boolean isCollectionForEach(PsiMethodCallExpression call, PsiExpression qualifier) {
return ITERABLE_FOREACH.test(call) && InheritanceUtil.isInheritor(qualifier.getType(), CommonClassNames.JAVA_UTIL_COLLECTION);
}
static class LightExpressionStatement extends LightElement implements PsiExpressionStatement {
@NotNull private final PsiExpression myExpression;