MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in exception column finder (IDEA-CR-42121)

Browse Source 
1. Process hierarchy when actually called method is declared in the subclass
2. Check whether document is committed
3. Parse exception string manually for performance
This commit is contained in:
Tagir Valeev
2019-01-18 15:54:23 +07:00
parent 0b8ca557fa
commit ec926e80f4
3 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java
+12 -15
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.search.PsiShortNamesCache;
import com.intellij.psi.util.ClassUtil;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiElementFilter;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
@@ -369,21 +370,16 @@ public class ExceptionWorker {
return false;
}
private boolean isTargetClass(PsiElement psiClass) {
if (!(psiClass instanceof PsiClass)) return false;
return isTargetClass((PsiClass)psiClass, myClassName);
}
private static boolean isTargetClass(PsiClass psiClass, String className) {
if (psiClass == null) return false;
if (className.equals(psiClass.getQualifiedName())) return true;
if (!StringUtil.getShortName(className).contains("$")) return false;
String prefix = StringUtil.substringBeforeLast(className, "$");
String suffix = StringUtil.substringAfterLast(className, "$");
PsiClass containingClass = PsiTreeUtil.getParentOfType(psiClass, PsiClass.class, true);
return suffix != null && isTargetClass(containingClass, prefix) &&
ClassUtil.findNonQualifiedClassByIndex(suffix, containingClass, true) == psiClass;
private boolean isTargetClass(PsiElement maybeClass) {
if (!(maybeClass instanceof PsiClass)) return false;
PsiClass declaredClass = (PsiClass)maybeClass;
String declaredName = declaredClass.getQualifiedName();
if (myClassName.equals(declaredName)) return true;
PsiClass calledClass = ClassUtil.findPsiClass(maybeClass.getManager(), myClassName, declaredClass, true);
if (calledClass == null) {
calledClass = ClassUtil.findPsiClass(maybeClass.getManager(), myClassName, null, true);
}
return calledClass == declaredClass || declaredName != null && InheritanceUtil.isInheritor(calledClass, false, declaredName);
}
}
@@ -400,6 +396,7 @@ public class ExceptionWorker {
public int applyAsInt(PsiFile file) {
Document document = FileDocumentManager.getInstance().getDocument(file.getVirtualFile());
if (document == null || document.getLineCount() <= myLineNumber) return 0;
if (!PsiDocumentManager.getInstance(file.getProject()).isCommitted(document)) return 0;
int startOffset = document.getLineStartOffset(myLineNumber);
int endOffset = document.getLineEndOffset(myLineNumber);
PsiElement element = file.findElementAt(startOffset);