azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests: "Placing function type parameters after the function name" error

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-26 15:56:31 +03:00
parent 3001af56c9
commit a3ff3ffc45
435 changed files with 550 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
Vendored
+3 -3
View File
@@ -1,21 +1,21 @@
class A(val n: Int)
fun test() {
<selection>fun foo<T: A>(t: T): Int {
<selection>fun <T: A> foo(t: T): Int {
fun A.a(n: Int): Int = this.n + n
fun A.b(n: Int): Int = this.n - n
return t.n + A(1).a(2) - A(2).b(1)
}</selection>
fun foo<U: A>(u: U): Int {
fun <U: A> foo(u: U): Int {
fun A.x(m: Int): Int = n + m
fun A.y(n: Int): Int = this.n - n
return u.n + A(1).x(2) - A(2).y(1)
}
fun foo<V: A>(v: V): Int {
fun <V: A> foo(v: V): Int {
fun A.a(n: Int): Int = this.n + n
fun A.b(n: Int): Int = this.n + n
idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
fun foo<T: A>(t: T): Int {
fun <T: A> foo(t: T): Int {
fun A.a(n: Int): Int = this.n + n
fun A.b(n: Int): Int = this.n - n
return t.n + A(1).a(2) - A(2).b(1)
}
fun foo<U: A>(u: U): Int {
fun <U: A> foo(u: U): Int {
fun A.x(m: Int): Int = n + m
fun A.y(n: Int): Int = this.n - n
idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
Vendored
+4 -4
View File
@@ -1,21 +1,21 @@
class A(val n: Int)
fun test() {
<selection>fun foo<T: A>(t: T): Int {
<selection>fun <T: A> foo(t: T): Int {
fun a(p: Int): Int = p + 1
fun b(q: Int): Int = q - 1
return t.n + a(1) - b(2)
}</selection>
fun foo<U: A>(u: U): Int {
fun <U: A> foo(u: U): Int {
fun x(a: Int): Int = a + 1
fun y(a: Int): Int = a - 1
return u.n + x(1) - y(2)
}
fun foo<V: A>(v: V): Int {
fun <V: A> foo(v: V): Int {
fun a(p: Int): Int = p + 1
fun b(p: Int): Int = p + 1
@@ -25,7 +25,7 @@ fun test() {
fun a(p: Int): Int = p + 1
fun b(q: Int): Int = q - 1
fun foo<W: A>(w: W): Int {
fun <W: A> foo(w: W): Int {
return w.n + a(1) - b(2)
}
}
idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
fun foo<T: A>(t: T): Int {
fun <T: A> foo(t: T): Int {
fun a(p: Int): Int = p + 1
fun b(q: Int): Int = q - 1
return t.n + a(1) - b(2)
}
fun foo<U: A>(u: U): Int {
fun <U: A> foo(u: U): Int {
fun x(a: Int): Int = a + 1
fun y(a: Int): Int = a - 1
idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
Vendored
+7 -7
View File
@@ -1,17 +1,17 @@
fun foo() {
abstract class T
<selection>fun bar1<A, B, C>(a: A, b: B, c: C): A where B: A, C: B, C: T = c</selection>
<selection>fun <A, B, C> bar1(a: A, b: B, c: C): A where B: A, C: B, C: T = c</selection>
fun bar2<X, Y: X, Z>(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
fun <X, Y: X, Z> bar2(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
fun bar3<X, Y, Z: Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun <X, Y, Z: Y> bar3(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun bar4<X, Y: X, Z: Y>(x: X, y: Y, z: Z): X where Z: T = z
fun <X, Y: X, Z: Y> bar4(x: X, y: Y, z: Z): X where Z: T = z
fun bar5<X, Y: X, Z: T>(x: X, y: Y, z: Z): X where Z: Y = z
fun <X, Y: X, Z: T> bar5(x: X, y: Y, z: Z): X where Z: Y = z
fun bar6<X, Z: Y, Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun <X, Z: Y, Y> bar6(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun bar7<X, Y: T, Z>(x: X, y: Y, z: Z): X where Y: X, Z: Y, Z: T = z
fun <X, Y: T, Z> bar7(x: X, y: Y, z: Z): X where Y: X, Z: Y, Z: T = z
}
idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
fun bar1<A, B, C>(a: A, b: B, c: C): A where B: A, C: B, C: T = c
fun <A, B, C> bar1(a: A, b: B, c: C): A where B: A, C: B, C: T = c
fun bar2<X, Y: X, Z>(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
fun <X, Y: X, Z> bar2(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
fun bar3<X, Y, Z: Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun <X, Y, Z: Y> bar3(x: X, y: Y, z: Z): X where Y: X, Z: T = z
fun bar4<X, Y: X, Z: Y>(x: X, y: Y, z: Z): X where Z: T = z
fun <X, Y: X, Z: Y> bar4(x: X, y: Y, z: Z): X where Z: T = z
fun bar5<X, Y: X, Z: T>(x: X, y: Y, z: Z): X where Z: Y = z
fun <X, Y: X, Z: T> bar5(x: X, y: Y, z: Z): X where Z: Y = z
idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@
class A
class B
fun foo<T>(klass: Class<T>) {
fun <T> foo(klass: Class<T>) {
}
fun bar<T>(klass: Class<T>) {
fun <T> bar(klass: Class<T>) {
}