azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code Insight: Format generated declarations

Browse Source 
#KT-11176 Fixed
(cherry picked from commit 3641ad6)
This commit is contained in:
Alexey Sedunov
2016-06-30 15:02:14 +03:00
parent a33f946c14
commit 3ba776fffa
51 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ class A(val n: IntArray, val s: Array<String>) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -20,7 +20,7 @@ class A(val n: IntArray, val s: Array<String>) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = Arrays.hashCode(n)
result = 31 * result + Arrays.hashCode(s)
result = 31 * result + f.hashCode()
idea/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ class Test {
field = value.toUpperCase()
}
var name: String = ""
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -16,7 +16,7 @@ class Test {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = serial.hashCode()
result = 31 * result + name.hashCode()
return result
idea/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
Vendored
+2 -2
View File
@@ -5,13 +5,13 @@ class Test {
var name: String = ""
get
override fun equals(other: Any?): Boolean{
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return 0
}
idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class A<T>(val n: T) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -14,7 +14,7 @@ class A<T>(val n: T) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return n?.hashCode() ?: 0
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt.after
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is A<*>) return false
@@ -13,7 +13,7 @@ class A<T>(val n: T) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return n?.hashCode() ?: 0
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ class A(val n: Int, val s: String) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -18,7 +18,7 @@ class A(val n: Int, val s: String) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = n
result = 31 * result + s.hashCode()
result = 31 * result + f.hashCode()
idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ class A(val n: Int?, val s: String) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -18,7 +18,7 @@ class A(val n: Int?, val s: String) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = n ?: 0
result = 31 * result + s.hashCode()
result = 31 * result + (f?.hashCode() ?: 0)
idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@ class A(val n: Int, val s: String) : X() {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
if (!super.equals(other)) return false
@@ -24,7 +24,7 @@ class A(val n: Int, val s: String) : X() {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = super.hashCode()
result = 31 * result + n
result = 31 * result + s.hashCode()
idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class A(val result: Int, val s: String) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -15,7 +15,7 @@ class A(val result: Int, val s: String) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result1 = result
result1 = 31 * result1 + s.hashCode()
return result1
idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt.after
Vendored
+2 -2
View File
@@ -4,13 +4,13 @@ class A {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return 0
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt.after
Vendored
+2 -2
View File
@@ -9,14 +9,14 @@ class A : X() {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
if (!super.equals(other)) return false
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return super.hashCode()
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@ class A(val n: IntArray?, val s: Array<String>?) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -20,7 +20,7 @@ class A(val n: IntArray?, val s: Array<String>?) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = n?.let { Arrays.hashCode(it) } ?: 0
result = 31 * result + (s?.let { Arrays.hashCode(it) } ?: 0)
result = 31 * result + f.hashCode()
idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class A(val n: Int) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -14,7 +14,7 @@ class A(val n: Int) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return n
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class A(val n: Int?) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
@@ -14,7 +14,7 @@ class A(val n: Int?) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return n ?: 0
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt.after
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ class A(val n: Int) {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is A) return false
@@ -13,7 +13,7 @@ class A(val n: Int) {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
return n
}
}
idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ class A(val n: Int) : X() {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
if (!super.equals(other)) return false
@@ -15,7 +15,7 @@ class A(val n: Int) : X() {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = super.hashCode()
result = 31 * result + n
return result
idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ class A(val n: Int) : X() {
}
<caret>override fun equals(other: Any?): Boolean{
<caret>override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other?.javaClass != javaClass) return false
if (!super.equals(other)) return false
@@ -20,7 +20,7 @@ class A(val n: Int) : X() {
return true
}
override fun hashCode(): Int{
override fun hashCode(): Int {
var result = super.hashCode()
result = 31 * result + n
return result
idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ class A(val n: IntArray, val s: Array<String>) {
}
override fun toString(): String{
override fun toString(): String {
return "A(" +
"n=${Arrays.toString(n)}," +
"s=${Arrays.toString(s)}," +
idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ class Test {
field = value.toUpperCase()
}
var name: String = ""
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "Test(" +
"serial='$serial'," +
"name='$name'" +
idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class A(val n: Int, val s: String) {
}
override fun toString(): String{
override fun toString(): String {
return "A(" +
"n=$n," +
"s='$s'," +
idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class A(val n: Int, val s: String) : X() {
}
override fun toString(): String{
override fun toString(): String {
return "A(" +
"n=$n," +
"s='$s'," +
idea/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A()"
}
}
idea/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class A(val n: Int) {
}
override fun toString(): String{
override fun toString(): String {
return "A(" +
"n=$n" +
")"
idea/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt.after
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ class A : X() {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A()" +
" ${super.toString()}"
}
idea/testData/codeInsight/generate/toString/singleTemplate/arrays.kt.after
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ class A(val n: IntArray, val s: Array<String>) {
}
override fun toString(): String{
override fun toString(): String {
return "A(n=${Arrays.toString(n)}, s=${Arrays.toString(s)}, f=$f)"
}
}
idea/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class Test {
field = value.toUpperCase()
}
var name: String = ""
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "Test(serial='$serial', name='$name')"
}
idea/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt.after
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ class Test {
var name: String = ""
get
override fun toString(): String{
override fun toString(): String {
return "Test()"
}
idea/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt.after
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class A(val n: Int, val s: String) {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A(n=$n, s='$s', f=$f)"
}
}
idea/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt.after
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class A(val n: Int, val s: String) : X() {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A(n=$n, s='$s', f=$f) ${super.toString()}"
}
}
idea/testData/codeInsight/generate/toString/singleTemplate/noVars.kt.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A()"
}
}
idea/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class A(val n: Int) {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A(n=$n)"
}
}
idea/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt.after
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ class A : X() {
}
<caret>override fun toString(): String{
<caret>override fun toString(): String {
return "A() ${super.toString()}"
}
}