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

disable emulation for native methods

Browse Source
This commit is contained in:
Egor.Ushakov
2016-11-07 17:10:37 +03:00
parent bdb25aa4b8
commit fcfb13f844
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+9 -2
View File
@@ -49,7 +49,6 @@ import com.intellij.openapi.util.JDOMExternalizerUtil;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.*;
import com.intellij.ui.AppUIUtil;
import com.intellij.util.StringBuilderSpinAllocator;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
@@ -157,7 +156,8 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
() -> processSubTypes(baseType, subType -> createRequestForPreparedClassEmulated(debugProcess, subType, false), indicator),
indicator);
if (indicator.isCanceled()) {
AppUIUtil.invokeOnEdt(() -> DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().removeBreakpoint(this));
ApplicationManager.getApplication().invokeLater(
() -> DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().removeBreakpoint(this));
}
}
@@ -179,6 +179,13 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
}
}
if (method != null) {
if (method.isNative()) {
ApplicationManager.getApplication().invokeLater(() -> {
getProperties().EMULATED = false;
fireBreakpointChanged();
});
return;
}
Method target = MethodBytecodeUtil.getBridgeTargetMethod(method);
if (target != null && !DebuggerUtilsEx.allLineLocations(target).isEmpty()) {
method = target;