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

another case of IDEA-149939 CCE in com.intellij.execution.stacktrace.StackTraceLine.getMethodLocation causes frozen UI

Browse Source
This commit is contained in:
peter
2016-03-21 15:22:37 +01:00
parent 2087ca24ee
commit 34bd807cd1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
+9 -8
View File
@@ -103,15 +103,16 @@ public class StackTraceLine {
final int dollarIndex = className.indexOf('$');
if (dollarIndex != -1) className = className.substring(0, dollarIndex);
PsiClass psiClass = findClass(project, className, lineNumber);
if (psiClass == null || (psiClass.getNavigationElement() instanceof PsiCompiledElement)) return null;
psiClass = (PsiClass)psiClass.getNavigationElement();
final PsiMethod psiMethod = getMethodAtLine(psiClass, methodName, lineNumber);
if (psiMethod != null) {
return new MethodLineLocation(project, psiMethod, PsiLocation.fromPsiElement(psiClass), lineNumber);
}
else {
return null;
PsiElement navElement = psiClass == null ? null : psiClass.getNavigationElement();
if (psiClass == null || navElement instanceof PsiCompiledElement) return null;
if (navElement instanceof PsiClass) {
final PsiMethod psiMethod = getMethodAtLine((PsiClass)navElement, methodName, lineNumber);
if (psiMethod != null) {
return new MethodLineLocation(project, psiMethod, PsiLocation.fromPsiElement((PsiClass)navElement), lineNumber);
}
}
return null;
}
private static PsiClass findClass(final Project project, final String className, final int lineNumber) {