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

Move SAM adapters from static scope to synthetic one

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-05-02 14:25:48 +03:00
parent 2ff28ebced
commit 95ede7fb67
37 changed files with 281 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.txt
Vendored
-1
View File
@@ -13,6 +13,5 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun invokeLater(/*0*/ doRun: (() -> kotlin.Unit)!): kotlin.Unit
public open fun invokeLater(/*0*/ doRun: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.txt
Vendored
-2
View File
@@ -9,8 +9,6 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun foo(/*0*/ c: (() -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open fun foo(/*0*/ c: java.io.Closeable!): kotlin.Unit
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/sam/inheritedStaticSam.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// FILE: Statics.java
public class Statics {
public static void foo(Runnable r) {}
}
// FILE: test.kt
class A : Statics() {
fun test() {
foo {}
}
}
compiler/testData/diagnostics/tests/j+k/sam/inheritedStaticSam.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
package
public final class A : Statics {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Statics {
public constructor Statics()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/sam/staticSamFromImportWithStar.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// FILE: a/Statics.java
package a;
public class Statics {
public static void foo(Runnable r) {}
}
// FILE: test.kt
package b
import a.Statics.*
fun test() {
foo {}
}
compiler/testData/diagnostics/tests/j+k/sam/staticSamFromImportWithStar.txt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package
package b {
public fun test(): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/sam/staticSamWithExplicitImport.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// FILE: a/Statics.java
package a;
public class Statics {
public static void foo(Runnable r) {}
}
// FILE: test.kt
package b;
import a.Statics.foo
fun test() {
foo {}
}
compiler/testData/diagnostics/tests/j+k/sam/staticSamWithExplicitImport.txt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package
package b {
public fun test(): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt
Vendored
-2
View File
@@ -11,9 +11,7 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((x: kotlin.String!) -> kotlin.Any!)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((x: kotlin.String!) -> kotlin.CharSequence!)!): kotlin.Unit
public open fun baz(/*0*/ l: EventListener<out kotlin.CharSequence!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt
Vendored
-2
View File
@@ -11,9 +11,7 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((e: kotlin.CharSequence!) -> kotlin.Unit)!): kotlin.Unit
public open fun baz(/*0*/ l: EventListener<out kotlin.CharSequence!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt
Vendored
-1
View File
@@ -11,7 +11,6 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.String!) -> kotlin.Unit)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<in kotlin.String!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt
Vendored
-1
View File
@@ -11,7 +11,6 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.Int!>!) -> kotlin.CharSequence!)!): kotlin.Unit
public open fun bar(/*0*/ l: Function<*, *>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.txt
Vendored
-1
View File
@@ -10,7 +10,6 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun foo(/*0*/ s: kotlin.String!, /*1*/ r: (() -> kotlin.Unit)!, /*2*/ z: kotlin.Boolean!): kotlin.Unit
public open fun foo(/*0*/ s: kotlin.String!, /*1*/ r: java.lang.Runnable!, /*2*/ z: kotlin.Boolean!): kotlin.Unit
}
}
compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
Vendored
-1
View File
@@ -17,6 +17,5 @@ public open class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ y: ((y: kotlin.String?) -> kotlin.Boolean)!): kotlin.Unit
public open fun bar(/*0*/ y: A<kotlin.String!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/platformTypes/rawSamOverrides.txt
Vendored
-3
View File
@@ -33,13 +33,10 @@ public abstract class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> aStaticMethod(/*0*/ x: T!, /*1*/ y: ((x: T!) -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun aStaticMethod(/*0*/ x: kotlin.Any!, /*1*/ y: ((x: kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit
public open fun aStaticMethod(/*0*/ x: kotlin.Any!, /*1*/ y: Fun<(raw) kotlin.Any!>!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun </*0*/ T : kotlin.Any!> aStaticMethod(/*0*/ x: T!, /*1*/ y: ((x: T!) -> kotlin.Unit)!): kotlin.Unit
public open fun </*0*/ T : kotlin.Any!> aStaticMethod(/*0*/ x: T!, /*1*/ y: Fun<T!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.txt
Vendored
-2
View File
@@ -10,10 +10,8 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun bar(/*0*/ r: kotlin.CharSequence!): kotlin.String!
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun foo(/*0*/ r: kotlin.Any!): kotlin.String!
}
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.txt
Vendored
-2
View File
@@ -10,10 +10,8 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun bar(/*0*/ r: kotlin.CharSequence!): kotlin.String!
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun foo(/*0*/ r: kotlin.Any!): kotlin.String!
}