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 evaluation in a class with empty package

Browse Source
This commit is contained in:
Egor.Ushakov
2014-09-11 20:30:58 +04:00
parent 834ca87698
commit 148474ce10
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java
+15 -3
View File
@@ -27,7 +27,6 @@ import com.intellij.debugger.jdi.VirtualMachineProxyImpl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiCodeFragment;
import com.intellij.psi.PsiElement;
@@ -152,7 +151,7 @@ public class CompilingEvaluator implements ExpressionEvaluator {
classLoader.invokeMethod(threadReference, defineMethod, args, ClassType.INVOKE_SINGLE_THREADED);
}
}
return (ClassType)process.findClass(context, getGenPackageName() + '.' + getGenClassName(), classLoader);
return (ClassType)process.findClass(context, getGenClassFullName(), classLoader);
}
private static byte[] changeSuperToMagicAccessor(byte[] bytes) {
@@ -230,13 +229,26 @@ public class CompilingEvaluator implements ExpressionEvaluator {
}
private String getMainClassName() {
return ((PsiClass)myData.getGeneratedInnerClass().getParent()).getName();
return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
@Override
public String compute() {
return ((PsiClass)myData.getGeneratedInnerClass().getParent()).getName();
}
});
}
private String getGenClassName() {
return getMainClassName() + '$' + GEN_CLASS_NAME;
}
private String getGenClassFullName() {
String packageName = getGenPackageName();
if (packageName.isEmpty()) {
return getGenClassName();
}
return packageName + '.' + getGenClassName();
}
//private String createClassCode() {
// return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
// @Override