Create From Usage: Do not generate unnecessary/skip necessary empty lines

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)
     }

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 {
+                fun calcNecessaryEmptyLines(decl: JetDeclaration, after: Boolean): Int {
-                    val parent = elementBeforeStart.getParent()!!
+                    var lineBreaksPresent: Int = 0
-                    val anchor =
+                    var neighbor: PsiElement? = null
-                            if (!skipInitial && elementBeforeStart !is PsiWhiteSpace) {
+                    for (sibling in decl.siblings(forward = after, withItself = false)) {
-                                elementBeforeStart
+                        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) {
+                val declarationInPlace = when (containingElement) {
-                    is JetFile -> return append(declaration, containingElement.getLastChild()!!, false) as JetNamedDeclaration
+                    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()
+                            val anchor = PsiTreeUtil.skipSiblingsBackward(
-                            return (rBrace?.let { append(declaration, it, true) }
+                                    classBody!!.getRBrace() ?: classBody!!.getLastChild()!!,
-                                    ?: append(declaration, classBody!!.getLastChild()!!, false)) as JetNamedDeclaration
+                                    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
             }
         }
 

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) {
 
     }

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) {
 
     }

idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt

@@ -1,7 +1,6 @@
 // "Create class 'Foo'" "true"
 
 object A {
-
     class Foo(i: Int) {
 
     }

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) {
 
     }

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) {
 
     }

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) {
 
     }

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) {
 
     }

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) {
 
     }

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) {
 
     }

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) {
 
     }

idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt

@@ -2,7 +2,6 @@
 package p
 
 class X {
-
     open class A(i: Int, s: String) {
 
     }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     annotation class A
 
 }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     class A {
 
     }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt

@@ -4,7 +4,6 @@ package p
 import p.E.A
 
 enum class E {
-
     A
 
 }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     enum class A {
 
     }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     object A {
 
     }

idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 import p.X.A
 
 class X {
-
     trait A {
 
     }

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt

@@ -5,7 +5,6 @@ package p
 fun foo() = A.B.C
 
 class A {
-
     class B {
 
     }

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt

@@ -4,7 +4,6 @@ package p
 fun foo() = X.A
 
 enum class X {
-
     A
 
 }

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()
 
 }

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt

@@ -4,7 +4,6 @@ package p
 fun foo(): E = E.A
 
 enum class E {
-
     A
 
 }

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt

@@ -4,7 +4,6 @@ package p
 fun foo() = X.A
 
 class X {
-
     object A {
 
     }

idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt

@@ -2,7 +2,6 @@
 package p
 
 class T {
-
     class A {
 
     }

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("")

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("")

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt

@@ -5,7 +5,6 @@
 class A {
     val t: Int get() {
         val foo: Int
-
         return foo
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt

@@ -5,7 +5,6 @@
 class A {
     val t: Int get()  {
         val foo: Int
-
         return foo
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt

@@ -4,6 +4,5 @@
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt

@@ -4,6 +4,5 @@
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt

@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: () -> Int = {
         val foo: Int
-
         foo
     }
 }

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
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt

@@ -5,7 +5,6 @@
 fun test(n: Int) {
     val f: () -> Int = {
         val foo: Int
-
         foo
     }
 }

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
     }
 }

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 -> {

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt

@@ -6,6 +6,5 @@ package foo
 
 fun test(): Int {
     val foo: Int
-
     return foo
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt

@@ -3,6 +3,5 @@
 
 fun test(): Int? {
     val foo: Int?
-
     return foo
 }

idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt

@@ -4,6 +4,5 @@
 
 fun test() {
     val foo: Unit
-
     val u: Unit = foo
 }

idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt

@@ -4,7 +4,6 @@
 
 class A<T>(val n: T) {
     val foo: Any
-
 }
 
 fun test(): Int {

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
 }

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
 }

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> {

idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt

@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     class object {
-
         val foo: Int
 
     }

idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt

@@ -3,7 +3,6 @@
 
 object A {
     val foo: Int
-
 }
 
 fun test() {

idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt

@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<T>
-
 }
 
 fun test() {

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) {

idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt

@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     val foo: A<T>?
-
 }
 
 fun test() {

idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt

@@ -3,7 +3,6 @@
 
 class A<T>(val n: T) {
     var foo: String
-
 }
 
 fun test() {

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");