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 our classByName not searching the same way as in VirtualMachineProxy

Browse Source
This commit is contained in:
Egor.Ushakov
2016-11-11 19:27:58 +03:00
parent 756e7d697c
commit 96fe5ed0c9
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class MethodBytecodeUtil {
visit(applicableMethods.get(0), new MethodVisitor(Opcodes.API_VERSION) {
@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
ReferenceType cls = ContainerUtil.getFirstItem(vm.classesByName(owner.replace("/", ".")));
ReferenceType cls = ContainerUtil.getFirstItem(vm.classesByName(owner));
if (cls != null) {
Method method = DebuggerUtils.findMethod(cls, name, desc);
if (method != null) {
java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
+34 -4
View File
@@ -35,6 +35,7 @@ import com.intellij.util.containers.MultiMap;
import com.sun.jdi.*;
import com.sun.jdi.event.EventQueue;
import com.sun.jdi.request.EventRequestManager;
import com.sun.tools.jdi.JNITypeParser;
import com.sun.tools.jdi.TargetVM;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@@ -100,12 +101,41 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
return myVirtualMachine;
}
static final class JNITypeParserReflect {
static final Method typeNameToSignatureMethod;
static {
typeNameToSignatureMethod = ReflectionUtil.getDeclaredMethod(JNITypeParser.class, "typeNameToSignature", String.class);
if (typeNameToSignatureMethod == null) {
LOG.warn("Unable to find JNITypeParser.typeNameToSignature method");
}
}
@Nullable
static String typeNameToSignature(@NotNull String name) {
if (typeNameToSignatureMethod != null) {
try {
return (String)typeNameToSignatureMethod.invoke(null, name);
}
catch (Exception ignored) {
}
}
return null;
}
}
public List<ReferenceType> classesByName(String s) {
if (myAllClassesByName == null) {
myAllClassesByName = new MultiMap<>();
allClasses().forEach(t -> myAllClassesByName.putValue(t.name(), t));
String signature = JNITypeParserReflect.typeNameToSignature(s);
if (signature != null) {
if (myAllClassesByName == null) {
myAllClassesByName = new MultiMap<>();
allClasses().forEach(t -> myAllClassesByName.putValue(t.signature(), t));
}
return (List<ReferenceType>)myAllClassesByName.get(signature);
}
else {
return myVirtualMachine.classesByName(s);
}
return (List<ReferenceType>)myAllClassesByName.get(s);
}
public List<ReferenceType> nestedTypes(ReferenceType refType) {