From 3059ccc695e555f9bdb6bce5d6ab3e6ceda25e96 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 16 Jan 2019 10:18:17 +0700 Subject: [PATCH] ExceptionWorker: cosmetic --- .../execution/filters/ExceptionWorker.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java b/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java index 1a17dc3e63a0..890d43b5b82e 100644 --- a/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java +++ b/java/openapi/src/com/intellij/execution/filters/ExceptionWorker.java @@ -355,9 +355,7 @@ public class ExceptionWorker { } if (parent instanceof PsiNewExpression) { PsiJavaCodeReferenceElement ref = ((PsiNewExpression)parent).getClassOrAnonymousClassReference(); - if (ref != null && isTargetClass(ref.resolve())) { - return true; - } + return ref != null && isTargetClass(ref.resolve()); } } } @@ -365,9 +363,7 @@ public class ExceptionWorker { PsiElement parent = element.getParent(); if (parent instanceof PsiReferenceExpression) { PsiElement target = ((PsiReferenceExpression)parent).resolve(); - if (target instanceof PsiMethod && isTargetClass(((PsiMethod)target).getContainingClass())) { - return true; - } + return target instanceof PsiMethod && isTargetClass(((PsiMethod)target).getContainingClass()); } } return false; @@ -380,16 +376,14 @@ public class ExceptionWorker { private static boolean isTargetClass(PsiClass psiClass, String className) { if (psiClass == null) return false; - String name = psiClass.getQualifiedName(); - if (className.equals(name)) return true; - if (StringUtil.getShortName(className).contains("$")) { - 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; - } - 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; } }