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

lambda: cleanup

Browse Source
This commit is contained in:
Anna Kozlova
2012-08-13 18:30:55 +04:00
parent 400f579850
commit a38f0a1f3b
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+12 -1
View File
@@ -142,7 +142,7 @@ public class LambdaUtil {
}
else if (parent instanceof PsiExpressionList) {
final PsiExpressionList expressionList = (PsiExpressionList)parent;
final int lambdaIdx = ArrayUtil.find(expressionList.getExpressions(), lambdaExpression);
final int lambdaIdx = getLambdaIdx(expressionList, lambdaExpression);
if (lambdaIdx > -1) {
final PsiElement gParent = expressionList.getParent();
if (gParent instanceof PsiMethodCallExpression) {
@@ -320,6 +320,17 @@ public class LambdaUtil {
return lambdaReturnType != null && methodReturnType.isAssignableFrom(lambdaReturnType);
}
public static int getLambdaIdx(PsiExpressionList expressionList, final PsiLambdaExpression element) {
PsiExpression[] expressions = expressionList.getExpressions();
for (int i = 0; i < expressions.length; i++) {
PsiExpression expression = expressions[i];
if (PsiTreeUtil.isAncestor(expression, element, false)) {
return i;
}
}
return -1;
}
private static class TypeParamsChecker extends PsiTypeVisitor<Boolean> {
private final PsiLambdaExpression myExpression;