SSR: fix AssertionError when searching for class (IDEA-218006)

GitOrigin-RevId: c61cf113b5d3d819c31c40c3d37d8ef769782178
This commit is contained in:
Bas Leijdekkers
2019-07-10 16:19:44 +02:00
committed by intellij-monorepo-bot
parent f80972690a
commit 10a54a5361

View File

@@ -1666,14 +1666,13 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
final PsiElement result = other instanceof PsiAnonymousClass
? ((PsiAnonymousClass)other).getBaseClassReference().getReferenceNameElement()
: identifier2;
assert result != null;
if (handler.isSubtype() || handler.isStrictSubtype()) {
if (myMatchingVisitor.setResult(checkMatchWithinHierarchy(identifier1, other, handler))) {
handler.addResult(result, context);
handler.addResult(result == null ? other : result, context);
}
}
else if (myMatchingVisitor.setResult(handler.validate(matchElement, context))) {
handler.addResult(result, context);
handler.addResult(result == null ? other : result, context);
}
}
}