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

java generate eq template: let formatter wrap lines (IDEA-238510)

Browse Source 
GitOrigin-RevId: d9de5f37341fd7eeb64b9a598c75a513edbe810e
This commit is contained in:
Anna Kozlova
2020-09-09 18:08:01 +00:00
committed by intellij-monorepo-bot
parent ebd1710c7b
commit e429717fa2
9 changed files with 18 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/apacheEqualsBuilder.vm
+3 -3
View File
@@ -10,12 +10,12 @@ Object $paramName){
#addClassInstance()
return new org.apache.commons.lang.builder.EqualsBuilder()
return new org.apache.commons.lang.builder.EqualsBuilder()##
#if($superHasEquals)
.appendSuper(super.equals($paramName))
.appendSuper(super.equals($paramName))##
#end
#foreach($field in $fields)
.append($field.accessor, ${classInstanceName}.$field.accessor)
.append($field.accessor, ${classInstanceName}.$field.accessor)##
#end
.isEquals();
}
java/java-impl/src/com/intellij/codeInsight/generation/apacheEqualsBuilder3.vm
+3 -3
View File
@@ -10,12 +10,12 @@ Object $paramName){
#addClassInstance()
return new org.apache.commons.lang3.builder.EqualsBuilder()
return new org.apache.commons.lang3.builder.EqualsBuilder()##
#if($superHasEquals)
.appendSuper(super.equals($paramName))
.appendSuper(super.equals($paramName))##
#end
#foreach($field in $fields)
.append($field.accessor, ${classInstanceName}.$field.accessor)
.append($field.accessor, ${classInstanceName}.$field.accessor)##
#end
.isEquals();
}
java/java-impl/src/com/intellij/codeInsight/generation/apacheHashCodeBuilder.vm
+3 -3
View File
@@ -1,10 +1,10 @@
public int hashCode() {
return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37)
return new org.apache.commons.lang.builder.HashCodeBuilder(17, 37)##
#if($superHasHashCode)
.appendSuper(super.hashCode())
.appendSuper(super.hashCode())##
#end
#foreach($field in $fields)
.append($field.accessor)
.append($field.accessor)##
#end
.toHashCode();
}
java/java-impl/src/com/intellij/codeInsight/generation/apacheHashCodeBuilder3.vm
+3 -3
View File
@@ -1,10 +1,10 @@
public int hashCode() {
return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37)
return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37)##
#if($superHasHashCode)
.appendSuper(super.hashCode())
.appendSuper(super.hashCode())##
#end
#foreach($field in $fields)
.append($field.accessor)
.append($field.accessor)##
#end
.toHashCode();
}
java/java-impl/src/com/intellij/codeInsight/generation/guavaEquals.vm
+1 -1
View File
@@ -10,7 +10,7 @@ Object $paramName){
#set($i = 0)
#foreach($field in $fields)
#if ($i > 0)
&&
&& ##
#end
#set($i = $i + 1)
#if ($field.primitive)
java/java-impl/src/com/intellij/codeInsight/generation/objectsEquals.vm
+1 -1
View File
@@ -10,7 +10,7 @@ Object $paramName){
#set($i = 0)
#foreach($field in $fields)
#if ($i > 0)
&&
&& ##
#end
#set($i = $i + 1)
#if ($field.primitive)
java/java-tests/testData/codeInsight/generateEquals/afterArrayAndNotOnlyArrayWithObjectsTemplate.java
+1 -4
View File
@@ -12,10 +12,7 @@ class A {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final A a = (A) o;
return i == a.i &&
s.equals(a.s) &&
Arrays.equals(a1, a.a1) &&
Arrays.equals(a2, a.a2);
return i == a.i && s.equals(a.s) && Arrays.equals(a1, a.a1) && Arrays.equals(a2, a.a2);
}
@Override
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCodeApache3.java
+2 -34
View File
@@ -36,43 +36,11 @@ class A extends B {
final A a = (A) o;
return new org.apache.commons.lang3.builder.EqualsBuilder()
.appendSuper(super.equals(o))
.append(a7, a.a7)
.append(a8, a.a8)
.append(a9, a.a9)
.append(a10, a.a10)
.append(a11, a.a11)
.append(a12, a.a12)
.append(a1, a.a1)
.append(a2, a.a2)
.append(a3, a.a3)
.append(a4, a.a4)
.append(a5, a.a5)
.append(a6, a.a6)
.append(a13, a.a13)
.append(a14, a.a14)
.isEquals();
return new org.apache.commons.lang3.builder.EqualsBuilder().appendSuper(super.equals(o)).append(a7, a.a7).append(a8, a.a8).append(a9, a.a9).append(a10, a.a10).append(a11, a.a11).append(a12, a.a12).append(a1, a.a1).append(a2, a.a2).append(a3, a.a3).append(a4, a.a4).append(a5, a.a5).append(a6, a.a6).append(a13, a.a13).append(a14, a.a14).isEquals();
}
@Override
public int hashCode() {
return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37)
.appendSuper(super.hashCode())
.append(a1)
.append(a2)
.append(a3)
.append(a4)
.append(a5)
.append(a6)
.append(a7)
.append(a8)
.append(a9)
.append(a10)
.append(a11)
.append(a12)
.append(a13)
.append(a14)
.toHashCode();
return new org.apache.commons.lang3.builder.HashCodeBuilder(17, 37).appendSuper(super.hashCode()).append(a1).append(a2).append(a3).append(a4).append(a5).append(a6).append(a7).append(a8).append(a9).append(a10).append(a11).append(a12).append(a13).append(a14).toHashCode();
}
}
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCodeGuava.java
+1 -14
View File
@@ -34,20 +34,7 @@ class A extends B {
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
final A a = (A) o;
return a7 == a.a7 &&
a8 == a.a8 &&
a9 == a.a9 &&
a10 == a.a10 &&
Float.compare(a.a11, a11) == 0 &&
Double.compare(a.a12, a12) == 0 &&
com.google.common.base.Objects.equal(a1, a.a1) &&
com.google.common.base.Objects.equal(a2, a.a2) &&
com.google.common.base.Objects.equal(a3, a.a3) &&
com.google.common.base.Objects.equal(a4, a.a4) &&
com.google.common.base.Objects.equal(a5, a.a5) &&
com.google.common.base.Objects.equal(a6, a.a6) &&
com.google.common.base.Objects.equal(a13, a.a13) &&
com.google.common.base.Objects.equal(a14, a.a14);
return a7 == a.a7 && a8 == a.a8 && a9 == a.a9 && a10 == a.a10 && Float.compare(a.a11, a11) == 0 && Double.compare(a.a12, a12) == 0 && com.google.common.base.Objects.equal(a1, a.a1) && com.google.common.base.Objects.equal(a2, a.a2) && com.google.common.base.Objects.equal(a3, a.a3) && com.google.common.base.Objects.equal(a4, a.a4) && com.google.common.base.Objects.equal(a5, a.a5) && com.google.common.base.Objects.equal(a6, a.a6) && com.google.common.base.Objects.equal(a13, a.a13) && com.google.common.base.Objects.equal(a14, a.a14);
}
@Override