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

fixed smart step into interface method implemented by lambda

Browse Source
This commit is contained in:
Egor.Ushakov
2016-10-28 18:12:27 +03:00
parent 4e3c0dc687
commit d4813330e0
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/BasicStepMethodFilter.java
+17 -23
View File
@@ -66,40 +66,34 @@ public class BasicStepMethodFilter implements NamedMethodFilter {
}
public boolean locationMatches(final DebugProcessImpl process, final Location location) throws EvaluateException {
final Method method = location.method();
boolean lambdaMatched = false;
Method method = location.method();
String name = method.name();
if (!myTargetMethodName.equals(name)) {
if (LambdaMethodFilter.isLambdaName(name)) {
SourcePosition position = process.getPositionManager().getSourcePosition(location);
lambdaMatched = ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
PsiElement psiMethod = DebuggerUtilsEx.getContainingMethod(position);
if (psiMethod instanceof PsiLambdaExpression) {
PsiType type = ((PsiLambdaExpression)psiMethod).getFunctionalInterfaceType();
PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(type);
if (type != null && interfaceMethod != null && myTargetMethodName.equals(interfaceMethod.getName())) {
try {
return type.getCanonicalText().equals(myDeclaringClassName.getName(process).replace('$', '.'));
}
catch (EvaluateException e) {
LOG.info(e);
}
return ApplicationManager.getApplication().runReadAction((Computable<Boolean>)() -> {
PsiElement psiMethod = DebuggerUtilsEx.getContainingMethod(position);
if (psiMethod instanceof PsiLambdaExpression) {
PsiType type = ((PsiLambdaExpression)psiMethod).getFunctionalInterfaceType();
PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(type);
if (type != null && interfaceMethod != null && myTargetMethodName.equals(interfaceMethod.getName())) {
try {
return type.getCanonicalText().equals(myDeclaringClassName.getName(process).replace('$', '.'));
}
catch (EvaluateException e) {
LOG.info(e);
}
}
return false;
}
return false;
});
}
if (!lambdaMatched) return false;
return false;
}
if (myTargetMethodSignature != null) {
if (!signatureMatches(method, myTargetMethodSignature.getName(process))) {
return false;
}
if (myTargetMethodSignature != null && !signatureMatches(method, myTargetMethodSignature.getName(process))) {
return false;
}
return lambdaMatched || DebuggerUtilsEx.isAssignableFrom(myDeclaringClassName.getName(process), location.declaringType());
return DebuggerUtilsEx.isAssignableFrom(myDeclaringClassName.getName(process), location.declaringType());
}
private static boolean signatureMatches(Method method, final String expectedSignature) throws EvaluateException {