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

generate equals: skip equals generated in the same class (IDEA-170746)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-02-07 18:36:34 +01:00
parent cc36b57c19
commit d536d50a3c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
+12 -1
View File
@@ -226,8 +226,19 @@ public class GenerateEqualsHelper implements Runnable {
LOG.assertTrue(myClass.isValid());
PsiMethod superEquals = MethodSignatureUtil.findMethodBySignature(myClass, methodSignature, true);
if (superEquals == null) return true;
PsiClass containingClass = superEquals.getContainingClass();
//implicit equals e.g. generated by lombok
if (containingClass == myClass) {
return Arrays.stream(superEquals.findSuperMethods()).anyMatch(superMethod -> {
PsiClass superClass = superMethod.getContainingClass();
return !superMethod.hasModifierProperty(PsiModifier.ABSTRACT) &&
superClass != null &&
!CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName());
});
}
if (superEquals.hasModifierProperty(PsiModifier.ABSTRACT)) return false;
return !CommonClassNames.JAVA_LANG_OBJECT.equals(superEquals.getContainingClass().getQualifiedName());
if (containingClass == null) return false;
return !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName());
}
private PsiMethod createHashCode() throws IncorrectOperationException {