From b0a05f7c1bc9c0ed0ed85153107fef3ce0d0675f Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 21 Mar 2016 12:16:45 +0100 Subject: [PATCH] IDEA-149939 CCE in com.intellij.execution.stacktrace.StackTraceLine.getMethodLocation causes frozen UI --- .../com/intellij/execution/stacktrace/StackTraceLine.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java b/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java index c85686c80b5c..7079d61bd650 100644 --- a/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java +++ b/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java @@ -118,9 +118,10 @@ public class StackTraceLine { if (project == null) return null; final PsiManager psiManager = PsiManager.getInstance(project); PsiClass psiClass = JavaPsiFacade.getInstance(psiManager.getProject()).findClass(className, GlobalSearchScope.allScope(project)); - if (psiClass == null || (psiClass.getNavigationElement() instanceof PsiCompiledElement)) return null; - psiClass = (PsiClass)psiClass.getNavigationElement(); - final PsiFile psiFile = psiClass.getContainingFile(); + PsiElement navElement = psiClass == null ? null : psiClass.getNavigationElement(); + if (psiClass == null || navElement instanceof PsiCompiledElement) return null; + + final PsiFile psiFile = navElement.getContainingFile(); return PsiTreeUtil.getParentOfType(psiFile.findElementAt(offsetOfLine(psiFile, lineNumber)), PsiClass.class, false); }