Code Insight: Format generated declarations

#KT-11176 Fixed
(cherry picked from commit 3641ad6)

ChangeLog.md

@@ -123,6 +123,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
 
 ###### Issues fixed
 
+- [`KT-11176`](https://youtrack.jetbrains.com/issue/KT-11176) Add a space before '{' in functions generated "Generate hashCode/equals/toString"
 - [`KT-12294`](https://youtrack.jetbrains.com/issue/KT-12294) Introduce Property: Fix extraction of expressions referring to primary constructor parameters
 - [`KT-12413`](https://youtrack.jetbrains.com/issue/KT-12413) Change Signature: Fix bogus warning about unresolved type parameters/invalid functional type replacement
 - [`KT-12084`](https://youtrack.jetbrains.com/issue/KT-12084) Introduce Property: Do not skip outer classes if extractable expression is contained in object literal

idea/idea-core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt

@@ -23,9 +23,9 @@ import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.SmartPointerManager
+import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.SmartList
-import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -174,7 +174,7 @@ fun <T : KtDeclaration> insertMembersAfter(
         if (otherMembers.isNotEmpty()) {
             val body = classOrObject.getOrCreateBody()
 
-            var afterAnchor = anchor ?: findInsertAfterAnchor(editor, body) ?: return@runWriteAction emptyList()
+            var afterAnchor = anchor ?: findInsertAfterAnchor(editor, body) ?: return@runWriteAction emptyList<T>()
             otherMembers.mapNotNullTo(insertedMembers) {
                 if (classOrObject is KtClass && classOrObject.isEnum()) {
                     val enumEntries = classOrObject.declarations.filterIsInstance<KtEnumEntry>()
@@ -204,6 +204,9 @@ fun <T : KtDeclaration> insertMembersAfter(
         }
 
         insertedMembers
+    }.apply {
+        val codeStyleManager = CodeStyleManager.getInstance(classOrObject.project)
+        forEach { codeStyleManager.reformat(it) }
     }
 }
 

idea/src/org/jetbrains/kotlin/idea/formatter/KotlinPreFormatProcessor.kt

@@ -45,13 +45,13 @@ private class Visitor(var range: TextRange) : KtTreeVisitorVoid() {
 
             val nextEntry = declaration.nextSiblingOfSameType()
             if (nextEntry != null && !declaration.containsToken(KtTokens.COMMA)) {
-                classBody.addAfter(comma, declaration)
+                declaration.add(comma)
                 delta += comma.textLength
             }
 
             val prevEntry = declaration.prevSiblingOfSameType()
             if (prevEntry != null && !prevEntry.containsToken(KtTokens.COMMA)) {
-                classBody.addAfter(comma, prevEntry)
+                prevEntry.add(comma)
                 delta += comma.textLength
             }
         }

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after

@@ -2,7 +2,6 @@
 
 class A<T>(val n: T) {
     operator fun unaryPlus(): A<T> = throw Exception()
-
     infix operator fun plus(t: T): A<T> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after

@@ -2,7 +2,6 @@
 
 class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()
-
     infix operator fun plus(t: T): A<T> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after

@@ -2,7 +2,6 @@
 
 class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()
-
     fun foo(a: T, s: String): A<T> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after

@@ -2,7 +2,6 @@
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()
-
     fun foo(i: T): A<T> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after

@@ -2,7 +2,6 @@
 class Foo<T> {
     operator fun component1(): Int { return 0 }
     operator fun component2(): Int { return 0 }
-
     operator fun component3(): Any {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after

@@ -2,7 +2,6 @@
 class Foo<T> {
     operator fun component1(): Int { return 0 }
     operator fun component2(): Int { return 0 }
-
     operator fun component3(): String {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after

@@ -3,7 +3,6 @@ import kotlin.reflect.KProperty
 
 class F {
     operator fun setValue(x: X, property: KProperty<*>, i: Int) { }
-
     operator fun getValue(x: X, property: KProperty<*>): Int {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after

@@ -3,7 +3,6 @@ import kotlin.reflect.KProperty
 
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int = 1
-
     operator fun setValue(x: X, property: KProperty<*>, i: Int) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after

@@ -1,7 +1,6 @@
 // "Create member function 'next'" "true"
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
-
     operator fun next(): Any {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after

@@ -1,7 +1,6 @@
 // "Create member function 'next'" "true"
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
-
     operator fun next(): Int {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after

@@ -1,7 +1,6 @@
 // "Create member function 'next'" "true"
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
-
     operator fun next(): T {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after

@@ -1,7 +1,6 @@
 // "Create member function 'set'" "true"
 class A {
     operator fun get(s: String): Int = 1
-
     operator fun set(s: String, value: Int) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after

@@ -2,7 +2,6 @@
 
 class A<T>(val n: T) {
     operator fun minus(n: Int): A<T> = throw Exception()
-
     operator fun unaryMinus(): A<T> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

idea/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersImplicitSuperCall.kt.after

@@ -3,7 +3,6 @@ open class Base()
 
 class Creation {
     constructor(f: Int)
-
     constructor()
 }
 val v = Creation()

idea/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersSuperCall.kt.after

@@ -5,7 +5,6 @@ open class Base(val f: Int)
 
 class Creation: Base {
     constructor(f: Int): super(f)
-
     constructor() : super(<caret>)
 }
 val v = Creation()

idea/testData/quickfix/createFromUsage/createSecondaryConstructor/noneApplicable.kt.after

@@ -3,7 +3,6 @@
 
 class CtorSecondary() {
     constructor(p: Int) : this()
-
     constructor<caret>(i: Int, i1: Int)
 }