diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt
index 8c8e3219924f..4bb7a4966f31 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/generateUtil.kt
+++ b/plugins/kotlin/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) }
     }
 }
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinPreFormatProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinPreFormatProcessor.kt
index bd88d1def48e..a54cd0c08f8c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinPreFormatProcessor.kt
+++ b/plugins/kotlin/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
             }
         }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
index 68afca06f34e..ebf0bb0b3675 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
@@ -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()
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
index 4c33ee5eb280..f491f3b1fe55 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
@@ -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
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
index 721454f7d37c..1c6ff3cd0166 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
@@ -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
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
index c43cd4864887..4d3fc193dcb8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt.after
index e8ec46e86365..1cb556d738a7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
index 36e75ab4ec64..df1d50d95f08 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
@@ -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()
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
index dc5e0f1a7e5c..f8c7f4a32fa7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
@@ -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)
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
index 9d793886423e..3d194ed47d7d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
@@ -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()
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
index 0c0263d67d49..eb233767dfd4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
@@ -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
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt.after
index 3b43fc11f228..9469725c1568 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt.after
index fd8cfdc9756c..613abd7c39d2 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt.after
@@ -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()
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
index 94897f0ec006..05fee20cd0cc 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
@@ -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()
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
index 22a86c7565c0..1970177ca004 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
index 4814af485d23..7493fce059bf 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt.after
index 0a00aea5095a..0c6254a85ed6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt.after
@@ -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
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
index 4cf6708665e4..7764d03a78ae 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
@@ -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
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
index 4d7a1bb5140b..bd6b50804c29 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
@@ -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
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
index 69c75ac96c76..52a9700e6f2d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
@@ -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)}," +
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
index 6157c295300a..d52ad22b32e3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
@@ -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'" +
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
index 027bf2ba5f88..2a8f0c412938 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
@@ -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'," +
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
index 45d2464fa5c5..2b4af609acdf 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
@@ -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'," +
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt.after
index 05925e77b6d4..9c5975366912 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/noVars.kt.after
@@ -4,7 +4,7 @@ class A {
 
     }
 
-    <caret>override fun toString(): String{
+    <caret>override fun toString(): String {
         return "A()"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt.after
index 2d427579e4a5..4e536dc31463 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/singleVar.kt.after
@@ -4,7 +4,7 @@ class A(val n: Int) {
 
     }
 
-    override fun toString(): String{
+    override fun toString(): String {
         return "A(" +
                 "n=$n" +
                 ")"
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt.after
index b62335648f28..293ca12a18d5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/multipeTemplates/superClassNoVars.kt.after
@@ -9,7 +9,7 @@ class A : X() {
 
     }
 
-    <caret>override fun toString(): String{
+    <caret>override fun toString(): String {
         return "A()" +
                 " ${super.toString()}"
     }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/arrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/arrays.kt.after
index 72ee26b8acef..415524a34f67 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/arrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/arrays.kt.after
@@ -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)"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt.after
index 209fbf33a024..a4375357c961 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/customAccessors.kt.after
@@ -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')"
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt.after
index aca5eca0e57b..7f0b6ee6628d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/explicitDefaultAccessors.kt.after
@@ -5,7 +5,7 @@ class Test {
     var name: String = ""
         get
 
-    override fun toString(): String{
+    override fun toString(): String {
         return "Test()"
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt.after
index 5d872b4d2c54..d339dae54003 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVars.kt.after
@@ -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)"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt.after
index 19812fd7ee93..2679ab934037 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/multipleVarsWithSuperClass.kt.after
@@ -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()}"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/noVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/noVars.kt.after
index 523206f73d64..df1c84d0b495 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/noVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/noVars.kt.after
@@ -4,7 +4,7 @@ class A {
 
     }
 
-    <caret>override fun toString(): String{
+    <caret>override fun toString(): String {
         return "A()"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt.after
index 7b1a91d72a53..6e49f0ffb32a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/singleVar.kt.after
@@ -4,7 +4,7 @@ class A(val n: Int) {
 
     }
 
-    <caret>override fun toString(): String{
+    <caret>override fun toString(): String {
         return "A(n=$n)"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt.after
index c4529ef2f75b..dd1de534d253 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/toString/singleTemplate/superClassNoVars.kt.after
@@ -9,7 +9,7 @@ class A : X() {
 
     }
 
-    <caret>override fun toString(): String{
+    <caret>override fun toString(): String {
         return "A() ${super.toString()}"
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
index 85a531024740..512e119385f0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
index 9d329d92dd37..334fec23a8f9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
index d61a8a0388c2..037a661210ad 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
index 020eb7ee9179..b3a0b92e1137 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
index c5938bbb3009..902e32a257ae 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
index aa8036dbda61..fd040400f1d8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
index bc72de1fec49..a544486ec4c7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
index b0f9be1c6799..b697b26db942 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
index 25bfe3fc02d9..9879417e2430 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
index 463652920a15..4aff8d4ba757 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
index 04199a313ab4..be12dc24f85e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
index 9784659a0eef..f64a10cd5ec2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
index 2a3a0c49107c..a7c7a7277d19 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/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.
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersImplicitSuperCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersImplicitSuperCall.kt.after
index 2ef02eadf872..6e09034a3fee 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersImplicitSuperCall.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersImplicitSuperCall.kt.after
@@ -3,7 +3,6 @@ open class Base()
 
 class Creation {
     constructor(f: Int)
-
     constructor()
 }
 val v = Creation()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersSuperCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersSuperCall.kt.after
index c41d52d9e1d1..8834cbcf9297 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noParametersSuperCall.kt.after
+++ b/plugins/kotlin/idea/tests/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()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noneApplicable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noneApplicable.kt.after
index 9059e4164f11..384c365b9499 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noneApplicable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createSecondaryConstructor/noneApplicable.kt.after
@@ -3,7 +3,6 @@
 
 class CtorSecondary() {
     constructor(p: Int) : this()
-
     constructor<caret>(i: Int, i1: Int)
 }