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

[kotlin] Prepare For a ComposeFunctionBreakpoint Subclass, IDEA-322802

Browse Source 
1. Change KotlinFunctionBreakpointType to not support @Composable methods and open it for subclasses to extend.
2. Make KotlinFunctionBreakpoint and open class, so we can subclass it with ComposeFunctionBreakpoint.
1. Extend MethodBreakpoint to allow a derived class to check for a method signature match.

https://youtrack.jetbrains.com/issue/IDEA-322802/Composable-Kotlin-Method-Breakpoints-Dont-Break

closes https://github.com/JetBrains/intellij-community/pull/2494

GitOrigin-RevId: e91d5e443548bcd6454da8cc67769872ad17d970
This commit is contained in:
Alon Albert
2023-06-16 13:18:33 -07:00
committed by intellij-monorepo-bot
parent 1e74039a64
commit 388f8c92dc
3 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
View File

@@ -280,55 +280,63 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
}
}
private void createRequestForPreparedClassOriginal(@NotNull DebugProcessImpl debugProcess, @NotNull ReferenceType classType) {
/**
* Return `true` if the method has the same name and signature as the breakpoint.
*/
protected boolean isMethodMatch(@NotNull Method method, @NotNull DebugProcessImpl debugProcess) {
try {
boolean hasMethod = false;
for (Method method : classType.allMethods()) {
String signature = method.signature();
String name = method.name();
String name = getMethodName();
return
name != null && name.equals(method.name()) &&
mySignature != null && mySignature.getName(debugProcess).equals(method.signature());
}
catch (EvaluateException e) {
LOG.debug("Should not happen. mySignature is a JVMRawText and it doesn't throw", e);
return false;
}
}
if (getMethodName().equals(name) && mySignature.getName(debugProcess).equals(signature)) {
hasMethod = true;
break;
}
}
if (!hasMethod) {
debugProcess.getRequestsManager().setInvalid(
this, JavaDebuggerBundle.message("error.invalid.breakpoint.method.not.found", classType.name())
);
return;
}
RequestManagerImpl requestManager = debugProcess.getRequestsManager();
if (isWatchEntry()) {
MethodEntryRequest entryRequest = findRequest(debugProcess, MethodEntryRequest.class, this);
if (entryRequest == null) {
entryRequest = requestManager.createMethodEntryRequest(this);
}
else {
entryRequest.disable();
}
//entryRequest.addClassFilter(myClassQualifiedName);
// use addClassFilter(ReferenceType) in order to stop on subclasses also!
entryRequest.addClassFilter(classType);
debugProcess.getRequestsManager().enableRequest(entryRequest);
}
if (isWatchExit()) {
MethodExitRequest exitRequest = findRequest(debugProcess, MethodExitRequest.class, this);
if (exitRequest == null) {
exitRequest = requestManager.createMethodExitRequest(this);
}
else {
exitRequest.disable();
}
//exitRequest.addClassFilter(myClassQualifiedName);
exitRequest.addClassFilter(classType);
debugProcess.getRequestsManager().enableRequest(exitRequest);
private void createRequestForPreparedClassOriginal(@NotNull DebugProcessImpl debugProcess, @NotNull ReferenceType classType) {
boolean hasMethod = false;
for (Method method : classType.allMethods()) {
if (isMethodMatch(method, debugProcess)) {
hasMethod = true;
break;
}
}
catch (Exception e) {
LOG.debug(e);
if (!hasMethod) {
debugProcess.getRequestsManager().setInvalid(
this, JavaDebuggerBundle.message("error.invalid.breakpoint.method.not.found", classType.name())
);
return;
}
RequestManagerImpl requestManager = debugProcess.getRequestsManager();
if (isWatchEntry()) {
MethodEntryRequest entryRequest = findRequest(debugProcess, MethodEntryRequest.class, this);
if (entryRequest == null) {
entryRequest = requestManager.createMethodEntryRequest(this);
}
else {
entryRequest.disable();
}
//entryRequest.addClassFilter(myClassQualifiedName);
// use addClassFilter(ReferenceType) in order to stop on subclasses also!
entryRequest.addClassFilter(classType);
debugProcess.getRequestsManager().enableRequest(entryRequest);
}
if (isWatchExit()) {
MethodExitRequest exitRequest = findRequest(debugProcess, MethodExitRequest.class, this);
if (exitRequest == null) {
exitRequest = requestManager.createMethodExitRequest(this);
}
else {
exitRequest.disable();
}
//exitRequest.addClassFilter(myClassQualifiedName);
exitRequest.addClassFilter(classType);
debugProcess.getRequestsManager().enableRequest(exitRequest);
}
}
@@ -419,7 +427,7 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
return super.evaluateCondition(context, event);
}
public boolean matchesEvent(@NotNull final LocatableEvent event, final DebugProcessImpl process) throws EvaluateException {
public boolean matchesEvent(@NotNull final LocatableEvent event, final DebugProcessImpl process) {
if (isEmulated()) {
return true;
}
@@ -427,7 +435,7 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
return false;
}
final Method method = event.location().method();
return method != null && method.name().equals(getMethodName()) && method.signature().equals(mySignature.getName(process));
return isMethodMatch(method, process);
}
@Nullable
@@ -533,7 +541,7 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
}
@Nullable
private String getMethodName() {
protected String getMethodName() {
return getProperties().myMethodName;
}