Change Signature: Do not insert new-lines between parameters (to be fixed later at the formatter level)

idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.java

@@ -125,7 +125,6 @@ public class JetChangeInfo implements ChangeInfo {
             JetParameterInfo parameterInfo = newParameters.get(i);
             if (i > 0) {
                 buffer.append(",");
-                buffer.append("\n");
                 buffer.append(indent);
             }
 

idea/testData/quickfix/changeSignature/afterAddConstructorParameter.kt

@@ -1,8 +1,7 @@
 // "Add parameter to constructor 'Base'" "true"
 // DISABLE-ERRORS
 
-open class Base(var x: Int,
+open class Base(var x: Int, d: Double) {
-                d: Double) {
     val y = Base(1, 2.5);
 
     fun f() {

idea/testData/quickfix/changeSignature/afterAddFunctionParameter.kt

@@ -1,8 +1,7 @@
 // "Add parameter to function 'foo'" "true"
 // DISABLE-ERRORS
 
-fun foo(x: Int,
+fun foo(x: Int, i: Int) {
-        i: Int) {
     foo(, 4);
     foo(1, 4);
     foo(1, 4);

idea/testData/quickfix/changeSignature/afterAddFunctionParameterAndChangeTypes.kt

@@ -1,10 +1,7 @@
 // "Change the signature of function 'foo'" "true"
 // DISABLE-ERRORS
 
-fun foo(x: Double,
+fun foo(x: Double, i: Int, i1: Int, i2: Int) {
-        i: Int,
-        i1: Int,
-        i2: Int) {
     foo(,, 5, 6);
     foo(1,, 5, 6);
     foo(1, 2.5, 5, 6);

idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt

@@ -3,8 +3,7 @@
 
 import kotlin.modules.ModuleBuilder
 
-fun foo(x: Int,
+fun foo(x: Int, moduleBuilder: ModuleBuilder) {
-        moduleBuilder: ModuleBuilder) {
     foo(, ModuleBuilder("", ""));
     foo(1, ModuleBuilder("", ""));
     foo(2, ModuleBuilder("", ""));

idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters1.kt

@@ -2,5 +2,5 @@
 // DISABLE-ERRORS
 
 fun f(x: Int, y: Int, z : () -> Int) {
-    f(1, 2, {() -> x});
+    f(1, 2, { x});
 }

idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters2.kt

@@ -2,7 +2,5 @@
 // DISABLE-ERRORS
 
 fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) {
-    f(1, 2, {(i: Int,
+    f(1, 2, {(i: Int, i1: Int?, any: Any) -> x});
-              i1: Int?,
-              any: Any) -> x});
 }

idea/testData/quickfix/changeSignature/afterComplexHierarchy.kt

@@ -1,39 +1,32 @@
 // "Add parameter to function 'f'" "true"
 trait OA {
-    fun f(a: Int,
+    fun f(a: Int, i: Int)
-          i: Int)
 }
 
 trait OB {
-    fun f(a: Int,
+    fun f(a: Int, i: Int)
-          i: Int)
 }
 
 trait O : OA, OB {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int)
-                   i: Int)
 }
 
 trait OO : O {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {
-                   i: Int) {
     }
 }
 
 trait OOO : OO {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {}
-                   i: Int) {}
 }
 
 trait OOOA : OOO {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {
-                   i: Int) {
     }
 }
 
 trait OOOB : OOO {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {
-                   i: Int) {
     }
 }
 

idea/testData/quickfix/changeSignature/afterComplexHierarchyTail.kt

@@ -1,39 +1,32 @@
 // "Add parameter to function 'f'" "true"
 trait OA {
-    fun f(a: Int,
+    fun f(a: Int, s: String)
-          s: String)
 }
 
 trait OB {
-    fun f(a: Int,
+    fun f(a: Int, s: String)
-          s: String)
 }
 
 trait O : OA, OB {
-    override fun f(a: Int,
+    override fun f(a: Int, s: String)
-                   s: String)
 }
 
 trait OO : O {
-    override fun f(a: Int,
+    override fun f(a: Int, s: String) {
-                   s: String) {
     }
 }
 
 trait OOO : OO {
-    override fun f(a: Int,
+    override fun f(a: Int, s: String) {}
-                   s: String) {}
 }
 
 trait OOOA : OOO {
-    override fun f(a: Int,
+    override fun f(a: Int, s: String) {
-                   s: String) {
     }
 }
 
 trait OOOB : OOO {
-    override fun f(a: Int,
+    override fun f(a: Int, s: String) {
-                   s: String) {
     }
 }
 

idea/testData/quickfix/changeSignature/afterLinearHierarchy.kt

@@ -1,18 +1,15 @@
 // "Add parameter to function 'f'" "true"
 trait O {
-    fun f(a: Int,
+    fun f(a: Int, i: Int)
-          i: Int)
 }
 
 trait OO : O {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {
-                   i: Int) {
     }
 }
 
 trait OOO : OO {
-    override fun f(a: Int,
+    override fun f(a: Int, i: Int) {}
-                   i: Int) {}
 }
 
 fun usage(o: O) {

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

@@ -1,6 +1,5 @@
 // "Create parameter 'foo'" "true"
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val t: Int = foo
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInClass.kt

@@ -1,8 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A {
-    fun test(n: Int,
+    fun test(n: Int, foo: Int) {
-             foo: Int) {
         val t: Int = foo
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInGenClass.kt

@@ -1,8 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A<T> {
-    fun test(n: Int,
+    fun test(n: Int, foo: T) {
-             foo: T) {
         val t: T = foo
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInClass.kt

@@ -1,8 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A {
-    fun test<T>(n: Int,
+    fun test<T>(n: Int, foo: T) {
-                foo: T) {
         val t: T = foo
     }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInGenClass.kt

@@ -1,8 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A<T> {
-    fun test<T>(n: Int,
+    fun test<T>(n: Int, foo: T) {
-                foo: T) {
         val t: T = foo
     }
 }

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

@@ -1,7 +1,6 @@
 // "Create parameter 'foo'" "true"
 // ACTION: Create local variable 'foo'
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val f: () -> Int = { foo }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithIt.kt

@@ -1,7 +1,6 @@
 // "Create parameter 'foo'" "true"
 // ACTION: Create local variable 'foo'
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val f: (Int) -> Int = { foo }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithParams.kt

@@ -1,7 +1,6 @@
 // "Create parameter 'foo'" "true"
 // ACTION: Create local variable 'foo'
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val f: (Int, Int) -> Int = { (a, b) -> foo }
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithTypedParams.kt

@@ -1,7 +1,6 @@
 // "Create parameter 'foo'" "true"
 // ACTION: Create local variable 'foo'
 
-fun test(n: Int,
+fun test(n: Int, foo: Any) {
-         foo: Any) {
     val f = { (a: Int, b: Int) -> foo }
 }

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

@@ -1,8 +1,7 @@
 // "Create parameter 'foo'" "true"
 // ACTION: Create local variable 'foo'
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val f: () -> Int = {
         foo
     }

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

@@ -1,6 +1,5 @@
 // "Create parameter 'foo'" "true"
 
-fun test(n: Int,
+fun test(n: Int, foo: Int?) {
-         foo: Int?) {
     val t: Int? = foo
 }

idea/testData/quickfix/createFromUsage/createVariable/parameter/afterWithPackageName.kt

@@ -2,7 +2,6 @@
 
 package foo
 
-fun test(n: Int,
+fun test(n: Int, foo: Int) {
-         foo: Int) {
     val t: Int = foo
 }

idea/testData/refactoring/changeSignature/ConstructorJavaUsagesAfter.kt

@@ -1,4 +1,3 @@
-open class A(n: Int,
+open class A(n: Int, s: String)
-             s: String)
 
 class B: A(1, "abc")

idea/testData/refactoring/changeSignature/ConstructorSwapArgumentsAfter.kt

@@ -1,6 +1,4 @@
-open class C1 protected (x3: ((Int) -> Int)?,
+open class C1 protected (x3: ((Int) -> Int)?, var _x2: Float, val _x1: Int = 1) {
-                         var _x2: Float,
-                         val _x1: Int = 1) {
     fun bar() {
         val y1 = _x1;
         val y2 = _x2;

idea/testData/refactoring/changeSignature/ExpressionFunctionAfter.kt

@@ -1,2 +1 @@
-fun fun1(x1: Int,
+fun fun1(x1: Int, y1: Int): Int = x1 * 2 + fun1(x1, )
-         y1: Int): Int = x1 * 2 + fun1(x1, )

idea/testData/refactoring/changeSignature/FunctionJavaUsagesAndOverridesAfter.kt

@@ -1,9 +1,7 @@
 open class A {
-    open fun foo(n: Int,
+    open fun foo(n: Int, s: String): String = ""
-                 s: String): String = ""
 }
 
 class B: A() {
-    override fun foo(n: Int,
+    override fun foo(n: Int, s: String): String = ""
-                     s: String): String = ""
 }

idea/testData/refactoring/changeSignature/FunctionLiteralAfter.kt

@@ -1,5 +1,3 @@
 fun foo() {
-    val v1 = {(z: Int,
+    val v1 = {(z: Int, y1: String, x: Any): Int -> println(z); println(y1) }
-               y1: String,
-               x: Any): Int -> println(z); println(y1) }
 }

idea/testData/refactoring/changeSignature/FunctionsAddRemoveArgumentsAfter.kt

@@ -1,6 +1,4 @@
-fun foo(x0: Any?,
+fun foo(x0: Any?, x1: Int = 1, x2: Float) {
-        x1: Int = 1,
-        x2: Float) {
     foo(null, 2, 3.5);
     val y1 = x1;
     val y2 = x2;

idea/testData/refactoring/changeSignature/NoDefaultValuesInOverridesAfter.kt

@@ -1,18 +1,15 @@
 trait T {
-    fun foo(a: Int = 1,
+    fun foo(a: Int = 1, b: String = "2")
-            b: String = "2")
 }
 
 open class A: T {
-    override fun foo(a: Int,
+    override fun foo(a: Int, b: String) {
-                     b: String) {
         throw UnsupportedOperationException()
     }
 }
 
 class B: A() {
-    override fun foo(a: Int,
+    override fun foo(a: Int, b: String) {
-                     b: String) {
         throw UnsupportedOperationException()
     }
 }

idea/testData/refactoring/changeSignature/OverridesInEnumEntriesAfter.kt

@@ -1,16 +1,13 @@
 enum class E {
-    open fun foo(n: Int,
+    open fun foo(n: Int, s: String): Int = n
-                 s: String): Int = n
 
     O
     A {
-        override fun foo(n: Int,
+        override fun foo(n: Int, s: String): Int = n + 1
-                         s: String): Int = n + 1
 
     }
     B {
-        override fun foo(n: Int,
+        override fun foo(n: Int, s: String): Int = n + 2
-                         s: String): Int = n + 2
 
     }
 }