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

This commit is contained in:
Alexey Sedunov
2014-11-24 19:40:53 +03:00
parent 57cb125ab8
commit c6541ccc6f
30 changed files with 48 additions and 102 deletions
@@ -1,8 +1,7 @@
// "Add parameter to constructor 'Base'" "true"
// DISABLE-ERRORS
open class Base(var x: Int,
d: Double) {
open class Base(var x: Int, d: Double) {
val y = Base(1, 2.5);
fun f() {
@@ -1,8 +1,7 @@
// "Add parameter to function 'foo'" "true"
// DISABLE-ERRORS
fun foo(x: Int,
i: Int) {
fun foo(x: Int, i: Int) {
foo(, 4);
foo(1, 4);
foo(1, 4);
@@ -1,10 +1,7 @@
// "Change the signature of function 'foo'" "true"
// DISABLE-ERRORS
fun foo(x: Double,
i: Int,
i1: Int,
i2: Int) {
fun foo(x: Double, i: Int, i1: Int, i2: Int) {
foo(,, 5, 6);
foo(1,, 5, 6);
foo(1, 2.5, 5, 6);
@@ -3,8 +3,7 @@
import kotlin.modules.ModuleBuilder
fun foo(x: Int,
moduleBuilder: ModuleBuilder) {
fun foo(x: Int, moduleBuilder: ModuleBuilder) {
foo(, ModuleBuilder("", ""));
foo(1, ModuleBuilder("", ""));
foo(2, ModuleBuilder("", ""));
@@ -2,5 +2,5 @@
// DISABLE-ERRORS
fun f(x: Int, y: Int, z : () -> Int) {
f(1, 2, {() -> x});
f(1, 2, { x});
}
@@ -2,7 +2,5 @@
// DISABLE-ERRORS
fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) {
f(1, 2, {(i: Int,
i1: Int?,
any: Any) -> x});
f(1, 2, {(i: Int, i1: Int?, any: Any) -> x});
}
@@ -1,39 +1,32 @@
// "Add parameter to function 'f'" "true"
trait OA {
fun f(a: Int,
i: Int)
fun f(a: Int, i: Int)
}
trait OB {
fun f(a: Int,
i: Int)
fun f(a: Int, i: Int)
}
trait O : OA, OB {
override fun f(a: Int,
i: Int)
override fun f(a: Int, i: Int)
}
trait OO : O {
override fun f(a: Int,
i: Int) {
override fun f(a: Int, i: Int) {
}
}
trait OOO : OO {
override fun f(a: Int,
i: Int) {}
override fun f(a: Int, i: Int) {}
}
trait OOOA : OOO {
override fun f(a: Int,
i: Int) {
override fun f(a: Int, i: Int) {
}
}
trait OOOB : OOO {
override fun f(a: Int,
i: Int) {
override fun f(a: Int, i: Int) {
}
}
@@ -1,39 +1,32 @@
// "Add parameter to function 'f'" "true"
trait OA {
fun f(a: Int,
s: String)
fun f(a: Int, s: String)
}
trait OB {
fun f(a: Int,
s: String)
fun f(a: Int, s: String)
}
trait O : OA, OB {
override fun f(a: Int,
s: String)
override fun f(a: Int, s: String)
}
trait OO : O {
override fun f(a: Int,
s: String) {
override fun f(a: Int, s: String) {
}
}
trait OOO : OO {
override fun f(a: Int,
s: String) {}
override fun f(a: Int, s: String) {}
}
trait OOOA : OOO {
override fun f(a: Int,
s: String) {
override fun f(a: Int, s: String) {
}
}
trait OOOB : OOO {
override fun f(a: Int,
s: String) {
override fun f(a: Int, s: String) {
}
}
@@ -1,18 +1,15 @@
// "Add parameter to function 'f'" "true"
trait O {
fun f(a: Int,
i: Int)
fun f(a: Int, i: Int)
}
trait OO : O {
override fun f(a: Int,
i: Int) {
override fun f(a: Int, i: Int) {
}
}
trait OOO : OO {
override fun f(a: Int,
i: Int) {}
override fun f(a: Int, i: Int) {}
}
fun usage(o: O) {