unrelated defaults: check if current class contains explicit method (IDEA-164732)

This commit is contained in:
Anna.Kozlova
2016-12-02 11:51:07 +01:00
parent 4cddcc91a3
commit 382b78aeca
3 changed files with 32 additions and 0 deletions
@@ -458,6 +458,7 @@ public class GenericsHighlightUtil {
if (!hasConcrete && defaults != null) {
final PsiMethod defaultMethod = defaults.get(0);
if (MethodSignatureUtil.findMethodBySuperMethod(aClass, defaultMethod, false) != null) continue;
final PsiClass defaultMethodContainingClass = defaultMethod.getContainingClass();
if (defaultMethodContainingClass == null) continue;
final PsiMethod unrelatedMethod = abstracts != null ? abstracts.get(0) : defaults.get(1);