diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt
index d458c3d7b85..3b231f6a5b4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.kt
@@ -109,10 +109,15 @@ public class JetPsiFactory(private val project: Project) {
         return createProperty("val${text}x").findElementAt(3)!!
     }
 
+    // Remove when all Java usages are rewritten to Kotlin
     public fun createNewLine(): PsiElement {
         return createWhiteSpace("\n")
     }
 
+    public fun createNewLine(lineBreaks: Int): PsiElement {
+        return createWhiteSpace("\n".repeat(lineBreaks))
+    }
+
     public fun createClass(text: String): JetClass {
         return createDeclaration(text)
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index a9464bff1ae..45ce8b13381 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -66,6 +66,8 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind
 import org.jetbrains.jet.plugin.util.isAny
 import org.jetbrains.jet.utils.addToStdlib.singletonOrEmptyList
+import org.jetbrains.jet.lang.psi.psiUtil.siblings
+import org.jetbrains.jet.plugin.refactoring.getLineCount
 
 private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
 private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
@@ -427,40 +429,31 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
 
                 val newLine = psiFactory.createNewLine()
 
-                fun prepend(element: PsiElement, elementBeforeStart: PsiElement, skipInitial: Boolean): PsiElement {
-                    val parent = elementBeforeStart.getParent()!!
-                    val anchor =
-                            if (!skipInitial && elementBeforeStart !is PsiWhiteSpace) {
-                                elementBeforeStart
+                fun calcNecessaryEmptyLines(decl: JetDeclaration, after: Boolean): Int {
+                    var lineBreaksPresent: Int = 0
+                    var neighbor: PsiElement? = null
+                    for (sibling in decl.siblings(forward = after, withItself = false)) {
+                        when (sibling) {
+                            is PsiWhiteSpace -> lineBreaksPresent += (sibling.getText() ?: "").count { it == '\n' }
+                            else -> {
+                                neighbor = sibling
+                                break
                             }
-                            else {
-                                PsiTreeUtil.skipSiblingsForward(elementBeforeStart, javaClass<PsiWhiteSpace>())
-                            }
-                    val addedElement = parent.addBefore(element, anchor)!!
-                    parent.addAfter(newLine, addedElement)
-                    parent.addAfter(newLine, addedElement)
-                    return addedElement
-                }
-
-                fun append(element: PsiElement, elementAfterEnd: PsiElement, skipInitial: Boolean): PsiElement {
-                    val parent = elementAfterEnd.getParent()!!
-                    val anchor =
-                            if (!skipInitial && elementAfterEnd !is PsiWhiteSpace) {
-                                elementAfterEnd
-                            }
-                            else {
-                                PsiTreeUtil.skipSiblingsBackward(elementAfterEnd, javaClass<PsiWhiteSpace>())
-                            }
-                    val addedElement = parent.addAfter(element, anchor)!!
-                    if (anchor?.getNode()?.getElementType() != JetTokens.LBRACE) {
-                        parent.addAfter(newLine, anchor)
-                        parent.addAfter(newLine, anchor)
+                        }
                     }
-                    return addedElement
+
+                    val neighborType = neighbor?.getNode()?.getElementType()
+                    val lineBreaksNeeded = when {
+                        neighborType == JetTokens.LBRACE, neighborType == JetTokens.RBRACE -> 1
+                        neighbor is JetDeclaration && (neighbor !is JetProperty || decl !is JetProperty) -> 2
+                        else -> 1
+                    }
+
+                    return Math.max(lineBreaksNeeded - lineBreaksPresent, 0)
                 }
 
-                when (containingElement) {
-                    is JetFile -> return append(declaration, containingElement.getLastChild()!!, false) as JetNamedDeclaration
+                val declarationInPlace = when (containingElement) {
+                    is JetFile -> containingElement.add(declaration) as JetNamedDeclaration
 
                     is JetClassOrObject -> {
                         var classBody = containingElement.getBody()
@@ -470,11 +463,13 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                         }
 
                         if (declaration is JetNamedFunction) {
-                            val rBrace = classBody!!.getRBrace()
-                            return (rBrace?.let { append(declaration, it, true) }
-                                    ?: append(declaration, classBody!!.getLastChild()!!, false)) as JetNamedDeclaration
+                            val anchor = PsiTreeUtil.skipSiblingsBackward(
+                                    classBody!!.getRBrace() ?: classBody!!.getLastChild()!!,
+                                    javaClass<PsiWhiteSpace>()
+                            )
+                            classBody.addAfter(declaration, anchor) as JetNamedDeclaration
                         }
-                        return prepend(declaration, classBody!!.getLBrace()!!, true) as JetNamedDeclaration
+                        else classBody.addAfter(declaration, classBody!!.getLBrace()!!) as JetNamedDeclaration
                     }
 
                     is JetBlockExpression -> {
@@ -485,13 +480,23 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                                 parent.addAfter(newLine, containingElement)
                             }
 
-                            return prepend(declaration, containingElement.getFirstChild()!!, false) as JetNamedDeclaration
+                            containingElement.addBefore(declaration, containingElement.getFirstChild()!!) as JetNamedDeclaration
                         }
-                        return prepend(declaration, containingElement.getLBrace()!!, true) as JetNamedDeclaration
+                        else containingElement.addAfter(declaration, containingElement.getLBrace()!!) as JetNamedDeclaration
                     }
 
                     else -> throw AssertionError("Invalid containing element: ${containingElement.getText()}")
                 }
+
+                val parent = declarationInPlace.getParent()
+                calcNecessaryEmptyLines(declarationInPlace, false).let {
+                    if (it > 0) parent.addBefore(psiFactory.createNewLine(it), declarationInPlace)
+                }
+                calcNecessaryEmptyLines(declarationInPlace, true).let {
+                    if (it > 0) parent.addAfter(psiFactory.createNewLine(it), declarationInPlace)
+                }
+
+                return declarationInPlace
             }
         }
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt
index 3d1dd8391f8..9f5247765e0 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt
@@ -4,4 +4,4 @@ foo(1, "2") fun test() {
 
 }
 
-annotation class foo(val i: Int, val s: String)
\ No newline at end of file
+annotation class foo(val i: Int, val s: String)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt
index 720a0e3a913..38aadd57eb9 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo
\ No newline at end of file
+annotation class foo
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt
index e7474e9e6f3..e6dbac4e158 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo
\ No newline at end of file
+annotation class foo
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt
index 8c71656bee5..4f95727e553 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo(val i: Int, val s: String)
\ No newline at end of file
+annotation class foo(val i: Int, val s: String)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt
index 8c71656bee5..4f95727e553 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo(val i: Int, val s: String)
\ No newline at end of file
+annotation class foo(val i: Int, val s: String)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt
index b4f2f1879cc..4e08686987c 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo(val value: Int)
\ No newline at end of file
+annotation class foo(val value: Int)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt
index 9e3833f0b56..c28272b79d6 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt
@@ -4,4 +4,4 @@
 
 }
 
-annotation class foo(val fooBar: Int)
\ No newline at end of file
+annotation class foo(val fooBar: Int)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt
index 95adfcc75d5..1c9a690ec3e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt
@@ -5,4 +5,4 @@
 
 }
 
-annotation class bar(val s: String, val i: Int)
\ No newline at end of file
+annotation class bar(val s: String, val i: Int)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt
index a4932e904f4..2e85934058b 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt
@@ -8,4 +8,4 @@ fun test() {
 
 class Foo {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt
index a9efc4c104a..3344ffe661e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt
@@ -6,4 +6,4 @@ fun test() {
 
 class Foo(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt
index 8928c9bc86c..c745a937b42 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt
@@ -8,4 +8,4 @@ class A {
 
 class Foo(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt
index 09bf85afe5b..71349e2432f 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt
@@ -4,4 +4,4 @@ fun test() = Foo(2, "2")
 
 class Foo(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt
index 9c1d639388f..f9a28cce817 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 class A<T>(val n: T) {
-
     class Foo(i: Int) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt
index 4fa97decc9c..da903a55094 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt
@@ -6,4 +6,4 @@ fun test() = Foo(abc = 1, ghi = A(2), def = "s")
 
 class Foo(abc: Int, ghi: A, def: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt
index 23e08fc7ca7..cff0b5de0f6 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt
@@ -3,7 +3,6 @@
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>U</td></tr><tr><td>Found:</td><td>U</td></tr></table></html>
 
 class A<T>(val n: T) {
-
     inner class Foo<U>(u: U) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt
index eee1d1a3919..50b709488a5 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt
@@ -6,4 +6,4 @@ fun test() {
 
 class Foo(i: Int, s: String, function: Function1<Int, Int>) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt
index a845dc5c344..e6167c3b6e5 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt
@@ -6,4 +6,4 @@ fun test() {
 
 class Foo(function: Function1<Int, Int>) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt
index 22b33a74815..214d4f2035e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 object A {
-
     class Foo(i: Int) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt
index 171d278107e..52cd2452f4d 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt
@@ -6,4 +6,4 @@ fun test() = Foo(2, "2")
 
 class Foo(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt
index b98cfe6d764..605f849b856 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 class A<T>(val n: T) {
-
     inner class Foo(i: Int) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt
index 50560c7803a..671a47a650f 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt
@@ -6,4 +6,4 @@ fun test(): A = Foo(2, "2")
 
 class Foo(i: Int, s: String) : A() {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt
index 3d6fe6e56e2..261a59e8c78 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt
@@ -7,4 +7,4 @@ fun test(): A = Foo(2, "2")
 
 class Foo(i: Int, s: String) : A() {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt
index 342d0561d14..a05ce26dd9d 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt
@@ -6,4 +6,4 @@ fun test(): A = Foo(2, "2")
 
 class Foo(i: Int, s: String) : A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt
index 36c33d98a5f..5f2037fe717 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 class A<T>(val n: T) {
-
     inner class Foo(i: Int, s: String) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt
index 95adfcc75d5..1c9a690ec3e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt
@@ -5,4 +5,4 @@
 
 }
 
-annotation class bar(val s: String, val i: Int)
\ No newline at end of file
+annotation class bar(val s: String, val i: Int)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt
index f19b8e6bf42..b524465098e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt
@@ -5,4 +5,4 @@
 
 }
 
-annotation class bar(val value: String)
\ No newline at end of file
+annotation class bar(val value: String)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt
index 54b6f084ef2..8f51beeba93 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt
@@ -5,4 +5,4 @@
 
 }
 
-annotation class bar(val fooBar: String)
\ No newline at end of file
+annotation class bar(val fooBar: String)
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt
index 625e5d89230..dabb0452969 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt
@@ -6,4 +6,4 @@ fun test() {
 
 class Foo(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt
index d8d227943e0..8ebd2fca51c 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 class B<T>(val t: T) {
-
     class Foo<U, V>(u: U, v: V) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt
index 33d95ca294e..0f4d5320c44 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt
@@ -3,7 +3,6 @@
 // ERROR: An integer literal does not conform to the expected type U
 
 class B<T>(val t: T) {
-
     inner class Foo<U, V>(u: U, v: V) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt
index 3ae05204378..f528b2c5885 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt
@@ -2,7 +2,6 @@
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>U</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
 
 class B<T>(val t: T) {
-
     inner class Foo<U>(i: Int, u: U) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt
index 9cab6c47f15..77c04d54650 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt
@@ -3,7 +3,6 @@
 // ERROR: An integer literal does not conform to the expected type V
 
 class B<T>(val t: T) {
-
     inner class Foo<U, V, W>(v: V, w: W) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt
index 6dd1c989506..bcab3a82b9e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt
@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 class B<T>(val t: T) {
-
     class Foo<U>(i: Int, u: U) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt
index 0c8e5d31ab7..eae9550e702 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt
@@ -4,4 +4,4 @@ fun test() = Foo<String, Int>(2, "2")
 
 class Foo<T, U>(u: U, t: T) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt
index 331eec57870..6e53a8649a9 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt
@@ -4,4 +4,4 @@ fun test() = Foo<String, Int, Boolean>(2, "2")
 
 class Foo<T, U, V>(u: U, t: T) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt
index 0c8e5d31ab7..eae9550e702 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt
@@ -4,4 +4,4 @@ fun test() = Foo<String, Int>(2, "2")
 
 class Foo<T, U>(u: U, t: T) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt
index ec1bd05d5e0..732044704f0 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt
@@ -4,4 +4,4 @@ fun test() = Foo<Int>(2, "2")
 
 class Foo<T>(t: T, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt
index bf6caaa8474..8ae2597b080 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt
@@ -8,4 +8,4 @@ fun test(a: A): A = Foo<A, Int>(a, 1)
 
 class Foo<T, U>(a: T, u: U) : A() {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt
index c89db0157c9..74dbd1f3eb2 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt
@@ -7,4 +7,4 @@ class Foo: A(1, "2") {
 
 open class A(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt
index ac54aa48f38..bb667cee713 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt
@@ -2,7 +2,6 @@
 package p
 
 class X {
-
     open class A(i: Int, s: String) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt
index 7a355d87816..d90271e047b 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt
@@ -7,4 +7,4 @@ class Foo: p.A(1, "2") {
 
 open class A(i: Int, s: String) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt
index 0b0e0af42a2..bbf6103ddc8 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt
@@ -11,4 +11,4 @@ class Foo: A(abc = 1, ghi = "2", def = B()) {
 
 open class A(abc: Int, ghi: String, def: B) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt
index 3fed372eb5f..94ac1a5725a 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt
@@ -7,4 +7,4 @@ class Foo: A<Int, String>(1, "2") {
 
 open class A<T, U>(t: T, u: U) {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt
index e64c4875183..d3f80be35b5 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt
@@ -7,4 +7,4 @@ class Foo: A {
 
 trait A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt
index 7ae14f93909..a94bc880359 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt
@@ -3,4 +3,4 @@ package p
 
 import p.A
 
-annotation class A
\ No newline at end of file
+annotation class A
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt
index 97067a59492..1cfd3f87244 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     annotation class A
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt
index 79e9a8d38b6..f2be7d36ae7 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt
@@ -5,4 +5,4 @@ import p.A
 
 class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt
index ad0e930faec..959cc57f1fa 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     class A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt
index bbf1f263063..55900807d66 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt
@@ -4,7 +4,6 @@ package p
 import p.E.A
 
 enum class E {
-
     A
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt
index a3713b9d9f9..fea857fecd0 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt
@@ -5,4 +5,4 @@ import p.A
 
 enum class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt
index 9b6a8aa061e..833f78e6e91 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     enum class A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt
index 30bd93957a0..a1ac8d0f889 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt
@@ -5,4 +5,4 @@ import p.A
 
 object A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt
index d7deede0288..1f0cb3b5551 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     object A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt
index b1b2359f011..cca6acd26c9 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt
@@ -5,4 +5,4 @@ import p.A
 
 trait A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt
index 23a1da45870..47182fcb543 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     trait A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt
index ac781c1701f..7214d55b7dd 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt
@@ -5,7 +5,6 @@ package p
 fun foo() = A.B.C
 
 class A {
-
     class B {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt
index 680ac2ef8a0..6b72e6dec65 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt
@@ -6,4 +6,4 @@ fun foo() = A.B
 
 class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt
index 4633186a4bb..dd8af3c6564 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt
@@ -6,4 +6,4 @@ fun foo() = A.B
 
 enum class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt
index f2025242dcc..a4794d349b4 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt
@@ -4,7 +4,6 @@ package p
 fun foo() = X.A
 
 enum class X {
-
     A
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt
index 973c8cbbca9..73ec9d159fe 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt
@@ -5,7 +5,6 @@ package p
 fun foo() = X.A
 
 enum class X(n: Int) {
-
     A : X()
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt
index bf45c4f1739..f42b77dcc85 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt
@@ -4,7 +4,6 @@ package p
 fun foo(): E = E.A
 
 enum class E {
-
     A
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt
index d2865d49a9b..de434dee1fe 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt
@@ -6,4 +6,4 @@ fun foo() = A.B
 
 object A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt
index 2e0dd11081e..61811cb77b2 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt
@@ -5,4 +5,4 @@ fun foo() = p.A
 
 object A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt
index 1d7e0025960..1168730cbb8 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt
@@ -5,4 +5,4 @@ fun foo() = A
 
 object A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt
index 58330c54a6d..c7f64a7ddc6 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt
@@ -4,7 +4,6 @@ package p
 fun foo() = X.A
 
 class X {
-
     object A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt
index ed5bf9e66cc..9df73821295 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt
@@ -9,4 +9,4 @@ open class X {
 
 object A : X() {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt
index 33ba0cb0d4c..b5d24016c8c 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt
@@ -9,4 +9,4 @@ trait X {
 
 object A : X {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt
index 12ae81ba209..a763498f703 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt
@@ -6,4 +6,4 @@ fun foo() = A.B
 
 trait A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt
index 3b2ab778109..6e267b4581a 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt
@@ -6,4 +6,4 @@ fun test() {
 
 object Foo {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt
index 9fab24f7a42..1473c657ece 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt
@@ -3,4 +3,4 @@ package p
 
 fun foo(): A = throw Throwable("")
 
-annotation class A
\ No newline at end of file
+annotation class A
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt
index 80203223c77..37d355f566c 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt
@@ -5,4 +5,4 @@ fun foo(): p.A = throw Throwable("")
 
 class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt
index 08ae8179a46..8c625361a41 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt
@@ -5,4 +5,4 @@ fun foo(): A = throw Throwable("")
 
 class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt
index 764874dc515..f9a4c1d9ab5 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt
@@ -5,4 +5,4 @@ fun foo(): A<Int, String> = throw Throwable("")
 
 class A<T, U> {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt
index bd69888c267..eba8869f0af 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt
@@ -6,4 +6,4 @@ fun foo(): A.B = throw Throwable("")
 
 class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt
index e34666b35e7..bb42133c8af 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt
@@ -2,7 +2,6 @@
 package p
 
 class T {
-
     class A {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiverNoBody.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiverNoBody.kt
new file mode 100644
index 00000000000..f67400f5763
--- /dev/null
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiverNoBody.kt
@@ -0,0 +1,10 @@
+// "Create class 'A'" "true"
+package p
+
+class T {
+    class A {
+
+    }
+}
+
+fun foo(): T.A = throw Throwable("")
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt
index f57f10790ea..d866bb1ae70 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt
@@ -5,4 +5,4 @@ fun foo(): A = throw Throwable("")
 
 enum class A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt
index 6b29f5d681e..860f0dc772a 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt
@@ -6,4 +6,4 @@ fun foo(): A.B = throw Throwable("")
 
 object A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt
index 318ea0b6d44..5a6c191a324 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt
@@ -5,4 +5,4 @@ fun foo(): A = throw Throwable("")
 
 trait A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt
new file mode 100644
index 00000000000..3c66559a297
--- /dev/null
+++ b/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt
@@ -0,0 +1,6 @@
+// "Create class 'A'" "true"
+package p
+
+class T
+
+fun foo(): T.<caret>A = throw Throwable("")
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt
index 054e91f9986..c74928a66af 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt
@@ -8,4 +8,4 @@ fun test() {
 
 fun Int.plus(A: A<Int>): A<Int> {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt
index bfac12b06a1..f2c57e50182 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt
@@ -6,4 +6,4 @@ fun test() {
 
 fun Unit.foo(i: Int): Int {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt
index 786e9662cab..62730fc79a4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt
@@ -8,4 +8,4 @@ fun test() {
 
 fun Int.foo(A: A<Int>): A<Int> {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt
index b917cc9e278..3e79f962f09 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt
@@ -8,4 +8,4 @@ fun test() {
 
 fun foo(i: Int, s: String) {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt
index 3490f81b3b2..866cf2a002e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt
@@ -8,4 +8,4 @@ fun test() {
 
 fun foo(): Any {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt
index c35457b1767..e2ec624995e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt
@@ -6,4 +6,4 @@ fun test(): Int {
 
 fun foo(i: Int, s: String): Int {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt
index 3e759aa1db5..d3dbca10e0b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt
@@ -6,4 +6,4 @@ fun test() {
 
 fun foo(i: Int, s: String) {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt
index 85b3ae6f91a..e9f351e5688 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt
@@ -7,4 +7,4 @@ fun test(): Int {
 
 fun Any.foo(i: Int, s: String): Int {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
index 91357baaa4b..70dc56747f2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
@@ -8,4 +8,4 @@ class A<T>(val items: List<T>) {
 
 fun <E, T, U> List<E>.foo(t: T, u: U): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
index 24f7b76a18f..d6f0cab149a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
@@ -8,4 +8,4 @@ class A<T>(val items: List<T>) {
 
 fun <E, T> List<E>.foo(t: T, s: String): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
index 91357baaa4b..70dc56747f2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
@@ -8,4 +8,4 @@ class A<T>(val items: List<T>) {
 
 fun <E, T, U> List<E>.foo(t: T, u: U): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
index 90110eabec0..cba0f090454 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
@@ -6,4 +6,4 @@ fun test(): Int {
 
 fun <T, U> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
index 6ff281f9da1..372b2cd161c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
@@ -6,4 +6,4 @@ fun test(): Int {
 
 fun <T, U, V> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
index 90110eabec0..cba0f090454 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
@@ -6,4 +6,4 @@ fun test(): Int {
 
 fun <T, U> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
index f144cc865d0..41d7c2c3a74 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
@@ -6,4 +6,4 @@ fun test(): Int {
 
 fun <T> foo(t: T, s: String): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt
index bf9b8c40d18..0e7161daa75 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt
@@ -19,4 +19,4 @@ fun foo() {
 
 fun Any.component2(): Int {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt
index 298714ead53..2bb20386a6f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt
@@ -8,4 +8,4 @@ fun test(): A<String> {
 
 fun Int.invoke(i: Int, s: String): A<String> {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt
index fadcc3788a4..660475ea72d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt
@@ -6,4 +6,4 @@ fun test() {
 
 fun Boolean.minus(): Any {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt
index 3974f0e07c6..83779ca800d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt
@@ -5,7 +5,6 @@
 class A {
     val t: Int get() {
         val foo: Int
-
         return foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt
index be4b2ba9939..4e169f7b1f9 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt
@@ -5,7 +5,6 @@
 class A {
     val t: Int get()  {
         val foo: Int
-
         return foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt
index 3abed7a67a0..6fe0e99dd4a 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt
@@ -4,6 +4,5 @@
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt
index 3abed7a67a0..6fe0e99dd4a 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt
@@ -4,6 +4,5 @@
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt
index 19e96d3d4b6..5f9d567c8b8 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt
@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: () -> Int = {
         val foo: Int
-
         foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt
index bfe7386fa19..187d90d0251 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt
@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: (Int, Int) -> Int = { (a, b) ->
         val foo: Int
-
         foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt
index 19e96d3d4b6..5f9d567c8b8 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt
@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: () -> Int = {
         val foo: Int
-
         foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt
index bfe7386fa19..187d90d0251 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt
@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: (Int, Int) -> Int = { (a, b) ->
         val foo: Int
-
         foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt
index 54219c61683..bcf381c10d0 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt
@@ -5,7 +5,6 @@ fun test(n: Int): Int {
     return when (n) {
         1 -> {
             val foo: Int
-
             foo
         }
         else -> {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt
index eaad2f4871c..bb89c84262b 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt
@@ -6,6 +6,5 @@ package foo
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt
index 309dcdd7288..9880f97de41 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt
@@ -3,6 +3,5 @@
 
 fun test(): Int? {
     val foo: Int?
-
     return foo
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt
index ccd8e5be17f..bbd6607e287 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt
@@ -4,6 +4,5 @@
 
 fun test() {
     val foo: Unit
-
     val u: Unit = foo
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt
index 62ca0016411..f528aa48d3c 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt
@@ -4,7 +4,6 @@
 
 class A<T>(val n: T) {
     val foo: Any
-
 }
 
 fun test(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt
index 8b97878072d..1e8941d6c09 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt
@@ -6,6 +6,5 @@ import kotlin.properties.ReadOnlyProperty
 
 class A<T> {
     val foo: ReadOnlyProperty<A<T>, A<Int>>
-
     val x: A<Int> by foo
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt
index 6bcdb359465..920588f4507 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt
@@ -6,6 +6,5 @@ import kotlin.properties.ReadWriteProperty
 
 class A<T> {
     val foo: ReadWriteProperty<A<T>, A<Int>>
-
     var x: A<Int> by foo
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt
index 90f56d024d2..3426dcb6b2d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<Int>
-
 }
 
 fun <U> A<U>.test(): A<Int> {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt
index d8bda7c3553..a2d3b804929 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     class object {
-
         val foo: Int
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt
index 62b1fc79872..7a56e8350cd 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt
@@ -3,7 +3,6 @@
 
 object A {
     val foo: Int
-
 }
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt
index 0c9db1cdb5d..853869e2b2c 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<T>
-
 }
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt
index a0ddce230f1..6270d053070 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<T>
-
 }
 
 fun test<U>(u: U) {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt
index 2661f7d6a69..fea8c6bf72d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<T>?
-
 }
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt
index af9cf551260..fcabff6fab6 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt
@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     var foo: String
-
 }
 
 fun test() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 06b2d768bc9..26e7695ed96 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -1334,6 +1334,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                     doTest(fileName);
                 }
 
+                @TestMetadata("beforeClassUserTypeReceiverNoBody.kt")
+                public void testClassUserTypeReceiverNoBody() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("beforeEnumEntryNotQualifierNoTypeArgs.kt")
                 public void testEnumEntryNotQualifierNoTypeArgs() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumEntryNotQualifierNoTypeArgs.kt");