azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-862 Exception when debugger starts - read action request before reading PSI is added

Browse Source
This commit is contained in:
Nikolay Krasko
2011-12-29 20:36:06 +04:00
parent 28c449168c
commit 26b9647591
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+25 -15
View File
@@ -5,6 +5,7 @@ import com.intellij.debugger.PositionManager;
import com.intellij.debugger.SourcePosition; import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.DebugProcess; import com.intellij.debugger.engine.DebugProcess;
import com.intellij.debugger.requests.ClassPrepareRequestor; import com.intellij.debugger.requests.ClassPrepareRequestor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
@@ -101,23 +102,32 @@ public class JetPositionManager implements PositionManager {
return result; return result;
} }
private Collection<String> classNamesForPosition(SourcePosition sourcePosition) { private Collection<String> classNamesForPosition(final SourcePosition sourcePosition) {
final JetFile file = (JetFile) sourcePosition.getFile();
JetTypeMapper typeMapper = prepareTypeMapper(file);
final Collection<String> names = new ArrayList<String>(); final Collection<String> names = new ArrayList<String>();
JetClassOrObject jetClass = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class);
if (jetClass != null) { ApplicationManager.getApplication().runReadAction(new Runnable() {
names.addAll(typeMapper.allJvmNames(jetClass)); @Override
} public void run() {
else { final JetFile file = (JetFile) sourcePosition.getFile();
JetFile namespace = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetFile.class); JetTypeMapper typeMapper = prepareTypeMapper(file);
if (namespace != null) {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(namespace))); JetClassOrObject jetClass = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class);
if (jetClass != null) {
names.addAll(typeMapper.allJvmNames(jetClass));
}
else {
JetFile namespace = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetFile.class);
if (namespace != null) {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(namespace)));
}
else {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(file)));
}
}
} }
else { });
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(file)));
}
}
return names; return names;
} }