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

Java: don't add instance check when generating equals() (IDEA-357686)

Browse Source 
GitOrigin-RevId: 21a0555c2fe6be705fe4d510c8d8d08238af4585
This commit is contained in:
Bas Leijdekkers
2024-09-25 09:48:53 +02:00
committed by intellij-monorepo-bot
parent 9ad64512e3
commit 7fbe663b37
35 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-impl/src/com/intellij/codeInsight/generation/equalsHelper.vm
View File

@@ -24,7 +24,6 @@
#end
##
#macro(addEqualsPrologue)
if(this == $paramName) return true;
#addInstanceOfToText()
#if ($superHasEquals)
if(!super.equals($paramName)) return false;

1
java/java-tests/testData/codeInsight/completion/normal/InvokeGenerateEqualsHashCodeOnOverrideCompletion_after.java
View File

@@ -5,7 +5,6 @@ class A {
@Override
public boolean equals(Object o) {<caret>
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
A a1 = (A) o;
return a == a1.a;

1
java/java-tests/testData/codeInsight/generateEquals/afterAbstractSuperEquals.java
View File

@@ -3,7 +3,6 @@ abstract class SuperTest {
}
class Test extends SuperTest {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
return true;
}

1
java/java-tests/testData/codeInsight/generateEquals/afterArrayAndNotOnlyArrayWithObjectsTemplate.java
View File

@@ -9,7 +9,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;
return i == a.i &&

1
java/java-tests/testData/codeInsight/generateEquals/afterArrayAndSuperWithObjectsTemplate.java
View File

@@ -15,7 +15,6 @@ class A extends I {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterArrays.java
View File

@@ -6,7 +6,6 @@ class Test {
int[] myIs;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterArraysClass.java
View File

@@ -3,7 +3,6 @@ class Arrays {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Arrays arrays = (Arrays) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterArraysFromJava15.java
View File

@@ -6,7 +6,6 @@ class Test {
int[] myIs;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterClassWithTypeParams.java
View File

@@ -5,7 +5,6 @@ class A<T extends String, K> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A<?, ?> a = (A<?, ?>) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypes.java
View File

@@ -22,7 +22,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesAllNotNull.java
View File

@@ -21,7 +21,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesGetters.java
View File

@@ -70,7 +70,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesNoDouble.java
View File

@@ -20,7 +20,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCode.java
View File

@@ -32,7 +32,6 @@ class A extends B {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;

1
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCodeGuava.java
View File

@@ -30,7 +30,6 @@ class A extends B {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterFields.java
View File

@@ -6,7 +6,6 @@ class Test {
Test b;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterHashCode.java
View File

@@ -7,7 +7,6 @@ class Test {
double c;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterInsertOverride.java
View File

@@ -3,7 +3,6 @@ class Test {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterInstanceof.java
View File

@@ -7,7 +7,6 @@ class A {
@Override
public final boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof A)) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterLangClass.java
View File

@@ -3,7 +3,6 @@ class Integer {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Integer integer = (Integer) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterLocalLangClass.java
View File

@@ -5,7 +5,6 @@ class Test {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Integer integer = (Integer) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterNameConflicts.java
View File

@@ -21,7 +21,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterNoBaseEquals.java
View File

@@ -1,6 +1,5 @@
public class Test {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
return true;
}

1
java/java-tests/testData/codeInsight/generateEquals/afterNotNull.java
View File

@@ -4,7 +4,6 @@ class Test {
@org.jetbrains.annotations.NotNull Object d;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterOneDoubleField.java
View File

@@ -2,7 +2,6 @@ class Test {
double d;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterOneDoubleFieldJava8.java
View File

@@ -2,7 +2,6 @@ class Test {
double d;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterOneField.java
View File

@@ -4,7 +4,6 @@ class Test {
Object d;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterOneFloatField.java
View File

@@ -2,7 +2,6 @@ class Test {
float d;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterPrefixes.java
View File

@@ -3,7 +3,6 @@ class Simple {
@Override
public boolean equals(Object p_o_r) {
if (this == p_o_r) return true;
if (p_o_r == null || getClass() != p_o_r.getClass()) return false;
final Simple l_that_v = (Simple) p_o_r;

1
java/java-tests/testData/codeInsight/generateEquals/afterPrimitiveFields.java
View File

@@ -4,7 +4,6 @@ public class Test {
int h;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final Test test = (Test) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterPrimitiveFieldsJava8.java
View File

@@ -8,7 +8,6 @@ public class X {
private double d = 1.0;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final X x = (X) o;

1
java/java-tests/testData/codeInsight/generateEquals/afterSingleArrayFieldWithObjectsTemplate.java
View File

@@ -6,7 +6,6 @@ class X {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final X x = (X) o;
return Objects.deepEquals(s, x.s);

1
java/java-tests/testData/codeInsight/generateEquals/afterSingleArrayOfPrimitiveWithObjectsTemplate.java
View File

@@ -6,7 +6,6 @@ class A {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;
return Objects.deepEquals(a1, a.a1);

1
java/java-tests/testData/codeInsight/generateEquals/afterSingleFieldWithObjectsTemplate.java
View File

@@ -5,7 +5,6 @@ class X {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final X x = (X) o;
return Objects.equals(s, x.s);

1
java/java-tests/testData/codeInsight/generateEquals/afterSuperEquals.java
View File

@@ -8,7 +8,6 @@ abstract class SuperTest {
}
class Test extends SuperTest {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
return true;