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

guava type migration: do not allow migrate Predicates.or/and for array parameter

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-01-11 18:50:21 +03:00
parent 05d33f6911
commit c12b3d13bc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicatesUtil.java
+4 -3
View File
@@ -54,7 +54,7 @@ public class GuavaPredicatesUtil {
else if (name.equals("equalTo")) {
return new TypeConversionDescriptorWithLocalVariable("equalTo", "$x$ -> java.util.Objects.equals($x$, $v$)");
}
if (!isConvertablePredicatesMethod(method)) return null;
if (!isConvertablePredicatesMethod(method, (PsiMethodCallExpression)context)) return null;
if (PREDICATES_AND_OR.contains(name) && canMigrateAndOrOr((PsiMethodCallExpression)context)) {
return new AndOrOrConversionDescriptor(GuavaConversionUtil.addTypeParameters(GuavaLambda.PREDICATE.getJavaAnalogueClassQName(), context.getType(), context));
}
@@ -95,7 +95,7 @@ public class GuavaPredicatesUtil {
}
public static boolean isConvertablePredicatesMethod(@NotNull PsiMethod method) {
public static boolean isConvertablePredicatesMethod(@NotNull PsiMethod method, PsiMethodCallExpression context) {
if (method.getParameterList().getParametersCount() == 1) {
final PsiParameter parameter = method.getParameterList().getParameters()[0];
final PsiClass psiClass = PsiTypesUtil.getPsiClass(parameter.getType().getDeepComponentType());
@@ -103,7 +103,8 @@ public class GuavaPredicatesUtil {
return false;
}
}
return true;
final PsiExpression[] expressions = context.getArgumentList().getExpressions();
return !(expressions.length == 1 && expressions[0].getType() instanceof PsiArrayType);
}
private static boolean canMigrateAndOrOr(PsiMethodCallExpression expr) {