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

lambda: correct type migration of lambda params (IDEA-91814)

Browse Source
This commit is contained in:
anna
2012-09-21 13:01:11 +02:00
parent f108f8bd3d
commit df0eeb95fd
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/Util.java
+15 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.refactoring.typeMigration;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.Nullable;
/**
* @author db
@@ -35,6 +36,7 @@ public class Util {
return parent;
}
@Nullable
public static PsiElement normalizeElement(final PsiElement element) {
if (element instanceof PsiMethod) {
final PsiMethod superMethod = ((PsiMethod)element).findDeepestSuperMethod();
@@ -42,6 +44,18 @@ public class Util {
return superMethod == null ? element : superMethod;
}
else if (element instanceof PsiParameter && element.getParent() instanceof PsiParameterList) {
final PsiElement declarationScope = ((PsiParameter)element).getDeclarationScope();
if (declarationScope instanceof PsiLambdaExpression) {
final PsiType interfaceType = ((PsiLambdaExpression)declarationScope).getFunctionalInterfaceType();
if (interfaceType != null) {
final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(interfaceType);
if (interfaceMethod != null) {
final int index = ((PsiParameterList)element.getParent()).getParameterIndex((PsiParameter)element);
return interfaceMethod.getParameterList().getParameters()[index];
}
}
return null;
}
final PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
if (method != null) {
@@ -64,7 +78,7 @@ public class Util {
final PsiElement element = normalizeElement(e);
if (!element.getManager().isInProject(element)) {
if (element == null || !element.getManager().isInProject(element)) {
return false;
}