From adfeaa5dc2d9407b49ae7cf7b98a4e0188243ff2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 8 Feb 2018 22:44:08 +0100 Subject: [PATCH] [java] restores PsiUtil.getTopLevelClass() behavior --- java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index eceed3d537d7..a2c6fefcced1 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -703,7 +703,8 @@ public final class PsiUtil extends PsiUtilCore { @Nullable public static PsiClass getTopLevelClass(@NotNull PsiElement element) { - return JBIterable.generate(element, PsiElement::getParent).filter(PsiClass.class).last(); + PsiClass topClass = JBIterable.generate(element, PsiElement::getParent).filter(PsiClass.class).last(); + return topClass instanceof PsiTypeParameter ? null : topClass; } @Nullable