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

Support hasStableParameterNames in KotlinSignature and propagation

Browse Source 
#KT-1924 In Progress
 #KT-2830 Fixed
This commit is contained in:
Alexander Udalov
2014-03-19 05:54:00 +04:00
parent 7fcd42f40c
commit 5fa1774cc1
90 changed files with 369 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
public constructor ClassDoesNotOverrideMethod()
public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): kotlin.Int
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date): kotlin.Int
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
public open class ConstructorWithNewTypeParams<T>(p0 : Any) : java.lang.Object() {
public open class ConstructorWithNewTypeParams<T>(first : Any) : java.lang.Object() {
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public open class ConstructorWithNewTypeParams</*0*/ T> : java.lang.Object {
public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ p0: kotlin.Any)
public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ first: kotlin.Any)
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
public open class ConstructorWithParentTypeParams<T>(p0 : T) : java.lang.Object() {
public open class ConstructorWithParentTypeParams<T>(first : T) : java.lang.Object() {
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public open class ConstructorWithParentTypeParams</*0*/ T> : java.lang.Object {
public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ p0: T)
public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ first: T)
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
import java.util.*
public open class ConstructorWithSeveralParams(p0: Int, p1 : Int, p2 : ArrayList<String>) : java.lang.Object() {
public open class ConstructorWithSeveralParams(integer: Int, intField : Int, collection : ArrayList<String>) : java.lang.Object() {
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public open class ConstructorWithSeveralParams : java.lang.Object {
public constructor ConstructorWithSeveralParams(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: java.util.ArrayList<kotlin.String>)
public constructor ConstructorWithSeveralParams(/*0*/ integer: kotlin.Int, /*1*/ intField: kotlin.Int, /*2*/ collection: java.util.ArrayList<kotlin.String>)
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.*
public open class MethodWithFunctionTypes : Object() {
public open fun foo(p0 : (String?) -> String) : (String.() -> String?)? {
public open fun foo(f : (String?) -> String) : (String.() -> String?)? {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class MethodWithFunctionTypes : java.lang.Object {
public constructor MethodWithFunctionTypes()
public open fun foo(/*0*/ p0: (kotlin.String?) -> kotlin.String): (kotlin.String.() -> kotlin.String?)?
public open fun foo(/*0*/ f: (kotlin.String?) -> kotlin.String): (kotlin.String.() -> kotlin.String?)?
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
import java.util.*
public open class MethodWithGenerics : Object() {
public open fun foo(p0 : String, p1 : List<Map.Entry<String?, String>?>) : String = ""
public open fun foo(a : String, b : List<Map.Entry<String?, String>?>) : String = ""
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class MethodWithGenerics : java.lang.Object {
public constructor MethodWithGenerics()
public open fun foo(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
public open fun foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.List<kotlin.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
import java.util.*
public open class MethodWithMappedClasses : Object() {
public open fun <T> copy(p0 : MutableList<in T>, p1 : List<T>) {}
public open fun <T> copy(dest : MutableList<in T>, src : List<T>) {}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class MethodWithMappedClasses : java.lang.Object {
public constructor MethodWithMappedClasses()
public open fun </*0*/ T> copy(/*0*/ p0: kotlin.MutableList<in T>, /*1*/ p1: kotlin.List<T>): kotlin.Unit
public open fun </*0*/ T> copy(/*0*/ dest: kotlin.MutableList<in T>, /*1*/ src: kotlin.List<T>): kotlin.Unit
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package test
import java.util.*
public open class MethodWithTypeParameters : Object() {
public open fun <A, B : Runnable> foo(p0 : A, p1 : List<B>, p2: MutableList<in String?>) where B : List<Cloneable> {
public open fun <A, B : Runnable> foo(a : A, b : List<B>, c: MutableList<in String?>) where B : List<Cloneable> {
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class MethodWithTypeParameters : java.lang.Object {
public constructor MethodWithTypeParameters()
public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ p0: A, /*1*/ p1: kotlin.List<B>, /*2*/ p2: kotlin.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.List<java.lang.Cloneable>
public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ a: A, /*1*/ b: kotlin.List<B>, /*2*/ c: kotlin.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.List<java.lang.Cloneable>
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.*
public open class MethodWithVararg : Object() {
public open fun foo(vararg p0 : String) {
public open fun foo(vararg s : String) {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class MethodWithVararg : java.lang.Object {
public constructor MethodWithVararg()
public open fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public open fun foo(/*0*/ vararg s: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package test
public open class RedundantProjectionKind : Object() {
public open fun foo(p0: List<Number>) {
public open fun foo(list: List<Number>) {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class RedundantProjectionKind : java.lang.Object {
public constructor RedundantProjectionKind()
public open fun foo(/*0*/ p0: kotlin.List<kotlin.Number>): kotlin.Unit
public open fun foo(/*0*/ list: kotlin.List<kotlin.Number>): kotlin.Unit
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt
+6 -6
View File
@@ -3,11 +3,11 @@ package test
public trait PropagateTypeArgumentNullable: Object {
public trait Super: Object {
public fun outS(p0: List<String?>)
public fun outS(p: List<String?>)
public fun invOutS(p0 : MutableList<List<String?>>)
public fun invOutS(p : MutableList<List<String?>>)
public fun outOutS(p0 : List<List<String?>>)
public fun outOutS(p : List<List<String?>>)
public fun outR() : List<String?>
public fun invR() : MutableList<String?>
@@ -16,11 +16,11 @@ public trait PropagateTypeArgumentNullable: Object {
}
public trait Sub: Super {
override fun outS(p0: List<String?>)
override fun outS(p: List<String?>)
override fun invOutS(p0 : MutableList<List<String?>>)
override fun invOutS(p : MutableList<List<String?>>)
override fun outOutS(p0 : List<List<String?>>)
override fun outOutS(p : List<List<String?>>)
override fun outR() : List<String?>
override fun invR() : MutableList<String?>
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+6 -6
View File
@@ -4,19 +4,19 @@ public trait PropagateTypeArgumentNullable : java.lang.Object {
public trait Sub : test.PropagateTypeArgumentNullable.Super {
public abstract override /*1*/ fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
public abstract override /*1*/ fun invOutS(/*0*/ p0: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract override /*1*/ fun invR(): kotlin.MutableList<kotlin.String?>
public abstract override /*1*/ fun outOutS(/*0*/ p0: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract override /*1*/ fun outR(): kotlin.List<kotlin.String?>
public abstract override /*1*/ fun outS(/*0*/ p0: kotlin.List<kotlin.String?>): kotlin.Unit
public abstract override /*1*/ fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
public abstract fun invOutS(/*0*/ p0: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract fun invR(): kotlin.MutableList<kotlin.String?>
public abstract fun outOutS(/*0*/ p0: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract fun outR(): kotlin.List<kotlin.String?>
public abstract fun outS(/*0*/ p0: kotlin.List<kotlin.String?>): kotlin.Unit
public abstract fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait ChangeProjectionKind1: Object {
public trait Super: Object {
public fun foo(p0: MutableList<in String>)
public fun foo(p: MutableList<in String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: MutableList<in String>)
override fun foo(p: MutableList<in String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait ChangeProjectionKind1 : java.lang.Object {
public trait Sub : test.ChangeProjectionKind1.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList<in kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.MutableList<in kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait ChangeProjectionKind2: Object {
public trait Super: Object {
public fun foo(p0: MutableList<String>)
public fun foo(p: MutableList<String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: MutableList<String>)
override fun foo(p: MutableList<String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait ChangeProjectionKind2 : java.lang.Object {
public trait Sub : test.ChangeProjectionKind2.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt
+3 -3
View File
@@ -3,16 +3,16 @@ package test
public trait DeeplySubstitutedClassParameter: Object {
public trait Super<T>: Object {
public fun foo(p0: T)
public fun foo(t: T)
public fun dummy() // to avoid loading as SAM interface
}
public trait Middle<E>: Super<E> {
override fun foo(p0: E)
override fun foo(t: E)
}
public trait Sub: Middle<String> {
override fun foo(p0: String)
override fun foo(t: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+3 -3
View File
@@ -4,16 +4,16 @@ public trait DeeplySubstitutedClassParameter : java.lang.Object {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: E): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
public trait DeeplySubstitutedClassParameter2: Object {
public trait Super<T>: Object {
public fun foo(p0: T)
public fun foo(t: T)
public fun dummy() // to avoid loading as SAM interface
}
@@ -12,6 +12,6 @@ public trait DeeplySubstitutedClassParameter2: Object {
}
public trait Sub: Middle<String> {
override fun foo(p0: String)
override fun foo(t: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+3 -3
View File
@@ -4,16 +4,16 @@ public trait DeeplySubstitutedClassParameter2 : java.lang.Object {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: E): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait InheritMutability: Object {
public trait Super: Object {
public fun foo(p0: MutableList<String>)
public fun foo(p: MutableList<String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: MutableList<String>)
override fun foo(p: MutableList<String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait InheritMutability : java.lang.Object {
public trait Sub : test.InheritMutability.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait InheritNotVarargNotNull: Object {
public trait Super: Object {
public fun foo(p0: Array<out String>)
public fun foo(p: Array<out String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: Array<out String>)
override fun foo(p: Array<out String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait InheritNotVarargNotNull : java.lang.Object {
public trait Sub : test.InheritNotVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait InheritProjectionKind: Object {
public trait Super: Object {
public fun foo(p0: MutableList<in String>)
public fun foo(p: MutableList<in String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: MutableList<in String>)
override fun foo(p: MutableList<in String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait InheritProjectionKind : java.lang.Object {
public trait Sub : test.InheritProjectionKind.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList<in kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.MutableList<in kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait InheritReadOnliness: Object {
public trait Super: Object {
public fun foo(p0: List<String>)
public fun foo(p: List<String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: List<String>)
override fun foo(p: List<String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait InheritReadOnliness : java.lang.Object {
public trait Sub : test.InheritReadOnliness.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.List<kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.List<kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait InheritVarargNotNull: Object {
public trait Super: Object {
public fun foo(vararg p0: String)
public fun foo(vararg p: String)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(vararg p0: String)
override fun foo(vararg p: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait InheritVarargNotNull : java.lang.Object {
public trait Sub : test.InheritVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt
+2 -2
View File
@@ -9,12 +9,12 @@ public trait Kt3302: Object {
}
public trait LinkedHashMap<K, V> : Object {
public fun put(p0: K, p1: V): V?
public fun put(key: K, value: V): V?
public fun dummy() // to avoid loading as SAM interface
}
public trait BasicBSONObject : LinkedHashMap<String, Any>, BSONObject {
override fun put(p0: String, p1: Any): Any?
override fun put(key: String, value: Any): Any?
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt
+2 -2
View File
@@ -9,11 +9,11 @@ public trait Kt3302 : java.lang.Object {
public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
}
public trait LinkedHashMap</*0*/ K, /*1*/ V> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ p0: K, /*1*/ p1: V): V?
public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait MutableToReadOnly: Object {
public trait Super: Object {
public fun foo(p0: MutableList<String>)
public fun foo(p: MutableList<String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: MutableList<String>)
override fun foo(p: MutableList<String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait MutableToReadOnly : java.lang.Object {
public trait Sub : test.MutableToReadOnly.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.MutableList<kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait NullableToNotNullKotlinSignature: Object {
public trait Super: Object {
public fun foo(p0: String?)
public fun foo(p: String?)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: String?)
override fun foo(p: String?)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait NullableToNotNullKotlinSignature : java.lang.Object {
public trait Sub : test.NullableToNotNullKotlinSignature.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait ReadOnlyToMutable: Object {
public trait Super: Object {
public fun foo(p0: List<String>)
public fun foo(p: List<String>)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super {
override fun foo(p0: List<String>)
override fun foo(p: List<String>)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait ReadOnlyToMutable : java.lang.Object {
public trait Sub : test.ReadOnlyToMutable.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.List<kotlin.String>): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.List<kotlin.String>): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt
+2 -2
View File
@@ -10,12 +10,12 @@ public trait SubclassFromGenericAndNot: Object {
}
public trait Generic<T> : Object {
public fun foo(p0: T)
public fun foo(key: T)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub : NonGeneric, Generic<String> {
override fun foo(p0: String)
override fun foo(key: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+2 -2
View File
@@ -4,7 +4,7 @@ public trait SubclassFromGenericAndNot : java.lang.Object {
public trait Generic</*0*/ T> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T): kotlin.Unit
public abstract fun foo(/*0*/ key: T): kotlin.Unit
}
public trait NonGeneric : java.lang.Object {
@@ -14,6 +14,6 @@ public trait SubclassFromGenericAndNot : java.lang.Object {
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt
+2 -2
View File
@@ -3,12 +3,12 @@ package test
public trait SubstitutedClassParameter: Object {
public trait Super<T>: Object {
public fun foo(p0: T)
public fun foo(t: T)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super<String> {
override fun foo(p0: String)
override fun foo(t: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+2 -2
View File
@@ -4,11 +4,11 @@ public trait SubstitutedClassParameter : java.lang.Object {
public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt
+3 -3
View File
@@ -3,18 +3,18 @@ package test
public trait SubstitutedClassParameters: Object {
public trait Super1<T>: Object {
public fun foo(p0: T)
public fun foo(t: T)
public fun dummy() // to avoid loading as SAM interface
}
public trait Super2<E>: Object {
public fun foo(p0: E)
public fun foo(t: E)
public fun dummy() // to avoid loading as SAM interface
}
public trait Sub: Super1<String>, Super2<String> {
override fun foo(p0: String)
override fun foo(t: String)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+3 -3
View File
@@ -4,16 +4,16 @@ public trait SubstitutedClassParameters : java.lang.Object {
public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super1</*0*/ T> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
public trait Super2</*0*/ E> : java.lang.Object {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: E): kotlin.Unit
public abstract fun foo(/*0*/ t: E): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.java
+1 -1
View File
@@ -3,5 +3,5 @@ package test;
import java.util.*;
public interface SubclassOfMapEntry<K, V> extends Map.Entry<K, V> {
V setValue(V v);
V setValue(V value);
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public trait SubclassOfMapEntry<K, V>: MutableMap.MutableEntry<K, V> {
override fun setValue(p0: V) : V
override fun setValue(value: V) : V
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K, V> {
public abstract override /*1*/ /*fake_override*/ fun getKey(): K
public abstract override /*1*/ /*fake_override*/ fun getValue(): V
public abstract override /*1*/ fun setValue(/*0*/ p0: V): V
public abstract override /*1*/ fun setValue(/*0*/ value: V): V
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritMutability: Object {
public trait Super: Object {
public fun <A: MutableList<String>> foo(p0: A)
public fun <A: MutableList<String>> foo(a: A)
}
public trait Sub: Super {
override fun <B: MutableList<String>> foo(p0: B)
override fun <B: MutableList<String>> foo(a: B)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritMutability : java.lang.Object {
public trait Sub : test.InheritMutability.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ p0: B): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ p0: A): kotlin.Unit
public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritNullability: Object {
public trait Super: Object {
public fun <A: CharSequence> foo(p0: A)
public fun <A: CharSequence> foo(a: A)
}
public trait Sub: Super {
override fun <B: CharSequence> foo(p0: B)
override fun <B: CharSequence> foo(a: B)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritNullability : java.lang.Object {
public trait Sub : test.InheritNullability.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ p0: B): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ p0: A): kotlin.Unit
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritReadOnliness: Object {
public trait Super: Object {
public fun <A: List<String>> foo(p0: A)
public fun <A: List<String>> foo(a: A)
}
public trait Sub: Super {
override fun <B: List<String>> foo(p0: B)
override fun <B: List<String>> foo(a: B)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait InheritReadOnliness : java.lang.Object {
public trait Sub : test.InheritReadOnliness.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ p0: B): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ p0: A): kotlin.Unit
public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait TwoBounds: Object {
public trait Super: Object {
public fun <A: CharSequence> foo(p0: A) where A: Cloneable
public fun <A: CharSequence> foo(a: A) where A: Cloneable
}
public trait Sub: Super {
override fun <B: CharSequence> foo(p0: B) where B: Cloneable
override fun <B: CharSequence> foo(a: B) where B: Cloneable
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait TwoBounds : java.lang.Object {
public trait Sub : test.TwoBounds.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ p0: B): kotlin.Unit where B : java.lang.Cloneable
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit where B : java.lang.Cloneable
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ p0: A): kotlin.Unit where A : java.lang.Cloneable
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit where A : java.lang.Cloneable
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt
+3 -3
View File
@@ -3,14 +3,14 @@ package test
public trait TwoSuperclasses: Object {
public trait Super1: Object {
public fun <A: CharSequence> foo(p0: A)
public fun <A: CharSequence> foo(a: A)
}
public trait Super2: Object {
public fun <B: CharSequence> foo(p0: B)
public fun <B: CharSequence> foo(a: B)
}
public trait Sub: Super1, Super2 {
override fun <C: CharSequence> foo(p0: C)
override fun <C: CharSequence> foo(a: C)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+3 -3
View File
@@ -3,14 +3,14 @@ package test
public trait TwoSuperclasses : java.lang.Object {
public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence> foo(/*0*/ p0: C): kotlin.Unit
public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence> foo(/*0*/ a: C): kotlin.Unit
}
public trait Super1 : java.lang.Object {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ p0: A): kotlin.Unit
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
}
public trait Super2 : java.lang.Object {
public abstract fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ p0: B): kotlin.Unit
public abstract fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait TwoTypeParameters: Object {
public trait Super: Object {
public fun <A: CharSequence, B: Cloneable> foo(p0: A, p1: B)
public fun <A: CharSequence, B: Cloneable> foo(a: A, b: B)
}
public trait Sub: Super {
override fun <B: CharSequence, A: Cloneable> foo(p0: B, p1: A)
override fun <B: CharSequence, A: Cloneable> foo(a: B, b: A)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait TwoTypeParameters : java.lang.Object {
public trait Sub : test.TwoTypeParameters.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A : kotlin.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit
public abstract fun </*0*/ A : kotlin.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterAsUpperBound: Object {
public trait Super: Object {
public fun <A, B: A> foo(p0: A, p1: B)
public fun <A, B: A> foo(a: A, b: B)
}
public trait Sub: Super {
override fun <B, A: B> foo(p0: B, p1: A)
override fun <B, A: B> foo(a: B, b: A)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterAsUpperBound : java.lang.Object {
public trait Sub : test.UseParameterAsUpperBound.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit
public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterInUpperBound: Object {
public trait Super: Object {
public fun <A, B: List<A>> foo(p0: A, p1: B)
public fun <A, B: List<A>> foo(a: A, b: B)
}
public trait Sub: Super {
override fun <B, A: List<B>> foo(p0: B, p1: A)
override fun <B, A: List<B>> foo(a: B, b: A)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterInUpperBound : java.lang.Object {
public trait Sub : test.UseParameterInUpperBound.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterInUpperBoundWithKotlinSignature: Object {
public trait Super: Object {
public fun <A, B: List<A>> foo(p0: A, p1: B)
public fun <A, B: List<A>> foo(a: A, b: B)
}
public trait Sub: Super {
override fun <B, A: List<B>> foo(p0: B, p1: A)
override fun <B, A: List<B>> foo(b: B, a: A)
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+2 -2
View File
@@ -3,10 +3,10 @@ package test
public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ p0: B, /*1*/ p1: A): kotlin.Unit
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ p0: A, /*1*/ p1: B): kotlin.Unit
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.AbstractList
public open class ModalityOfFakeOverrides : AbstractList<String>() {
override fun get(p0: Int): String {
override fun get(index: Int): String {
return ""
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt
+11 -11
View File
@@ -3,28 +3,28 @@ package test
public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String> {
public constructor ModalityOfFakeOverrides()
protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: kotlin.String): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Collection<kotlin.String>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
public open override /*1*/ fun get(/*0*/ p0: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: kotlin.Any?): kotlin.Int
public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int
public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0: kotlin.Any?): kotlin.Int
public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int
public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.String): kotlin.String
public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
public open override /*1*/ fun size(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.MutableList<kotlin.String>
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<kotlin.Any?>
public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<out T>): kotlin.Array<T>
public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a: kotlin.Array<out T>): kotlin.Array<T>
}