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

fixed breakpoints in lambdas inside local classes

Browse Source
This commit is contained in:
Egor.Ushakov
2015-07-23 16:20:01 +03:00
parent df1e9f196f
commit 4bd81f0d56
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
+9 -3
View File
@@ -476,10 +476,16 @@ public class JVMNameUtil {
@Nullable
public static String getClassVMName(@Nullable PsiClass containingClass) {
if (containingClass == null) return null;
// no support for local classes for now
if (containingClass == null || PsiUtil.isLocalClass(containingClass)) return null;
if (containingClass instanceof PsiAnonymousClass) {
return getClassVMName(PsiTreeUtil.getParentOfType(containingClass, PsiClass.class)) +
JavaAnonymousClassesHelper.getName((PsiAnonymousClass)containingClass);
String parentName = getClassVMName(PsiTreeUtil.getParentOfType(containingClass, PsiClass.class));
if (parentName == null) {
return null;
}
else {
return parentName + JavaAnonymousClassesHelper.getName((PsiAnonymousClass)containingClass);
}
}
return ClassUtil.getJVMClassName(containingClass);
}
java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java
+2 -2
View File
@@ -213,8 +213,8 @@ public class PositionManagerImpl implements PositionManager, MultiRequestPositio
}
private PsiElement remapElement(PsiElement element) {
PsiClass aClass = getEnclosingClass(element);
if (!Comparing.equal(myExpectedClassName, JVMNameUtil.getClassVMName(aClass))) {
String name = JVMNameUtil.getClassVMName(getEnclosingClass(element));
if (name != null && !name.equals(myExpectedClassName)) {
return null;
}
PsiElement method = DebuggerUtilsEx.getContainingMethod(element);