From f16f4e5541c9b5f50083b61fc32c743c68a9e2b2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 11 Oct 2015 17:50:26 +0300 Subject: [PATCH] Disable loading parameter names from KotlinSignature, update test data --- .../TraceBasedExternalSignatureResolver.java | 6 ++---- .../kotlinSignature/constructorNamedArguments.kt | 2 +- .../kotlinSignature/parameterNames.kt | 2 +- .../kotlinSignature/parameterNames.txt | 2 +- .../kotlinSignature/ConstructorWithNewTypeParams.txt | 2 +- .../ConstructorWithParentTypeParams.txt | 2 +- .../kotlinSignature/ConstructorWithSeveralParams.txt | 2 +- .../kotlinSignature/MethodWithFunctionTypes.txt | 2 +- .../kotlinSignature/MethodWithGenerics.txt | 2 +- .../kotlinSignature/MethodWithMappedClasses.txt | 2 +- .../kotlinSignature/MethodWithTypeParameters.txt | 2 +- .../kotlinSignature/MethodWithVararg.txt | 2 +- .../error/RedundantProjectionKind.txt | 2 +- .../kotlinSignature/error/WrongProjectionKind.txt | 2 +- .../error/WrongReturnTypeStructure.txt | 2 +- .../error/WrongTypeParameterBoundStructure1.txt | 2 +- .../error/WrongTypeParameterBoundStructure2.txt | 2 +- .../error/WrongValueParameterStructure1.txt | 2 +- .../error/WrongValueParameterStructure2.txt | 2 +- .../propagation/PropagateTypeArgumentNullable.txt | 12 ++++++------ .../propagation/parameter/ChangeProjectionKind1.txt | 4 ++-- .../propagation/parameter/ChangeProjectionKind2.txt | 4 ++-- .../parameter/DeeplySubstitutedClassParameter.txt | 6 +++--- .../parameter/DeeplySubstitutedClassParameter2.txt | 6 +++--- .../propagation/parameter/InheritMutability.txt | 4 ++-- .../parameter/InheritNotVarargNotNull.txt | 4 ++-- .../propagation/parameter/InheritProjectionKind.txt | 4 ++-- .../propagation/parameter/InheritReadOnliness.txt | 4 ++-- .../propagation/parameter/InheritVarargNotNull.txt | 4 ++-- .../kotlinSignature/propagation/parameter/Kt3302.txt | 4 ++-- .../propagation/parameter/MutableToReadOnly.txt | 4 ++-- .../propagation/parameter/NotNullToNullable.txt | 2 +- .../parameter/NullableToNotNullKotlinSignature.txt | 4 ++-- .../propagation/parameter/ReadOnlyToMutable.txt | 4 ++-- .../parameter/SubclassFromGenericAndNot.txt | 4 ++-- .../parameter/SubstitutedClassParameter.txt | 4 ++-- .../parameter/SubstitutedClassParameters.txt | 6 +++--- .../propagation/typeParameter/InheritMutability.txt | 4 ++-- .../propagation/typeParameter/InheritNullability.txt | 4 ++-- .../typeParameter/InheritReadOnliness.txt | 4 ++-- .../propagation/typeParameter/TwoBounds.txt | 4 ++-- .../propagation/typeParameter/TwoSuperclasses.txt | 6 +++--- .../propagation/typeParameter/TwoTypeParameters.txt | 4 ++-- .../typeParameter/UseParameterAsUpperBound.txt | 4 ++-- .../typeParameter/UseParameterInUpperBound.txt | 4 ++-- .../UseParameterInUpperBoundWithKotlinSignature.txt | 4 ++-- .../TwoSuperclassesVarargAndNot.txt | 4 ++-- 47 files changed, 83 insertions(+), 85 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java index 20ffa11f10a..333c14dc1a5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java @@ -87,10 +87,8 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes if (data.isAnnotated() && !data.hasErrors()) { if (JvmPackage.getPLATFORM_TYPES()) { - // We only take parameter names from the @KotlinSignature - return new AlternativeMethodSignature(returnType, receiverType, - AlternativeMethodSignatureData.updateNames(valueParameters, data.getValueParameters()), - typeParameters, Collections.emptyList(), true); + return new AlternativeMethodSignature(returnType, receiverType, valueParameters, + typeParameters, Collections.emptyList(), hasStableParameterNames); } return new AlternativeMethodSignature(data.getReturnType(), receiverType, data.getValueParameters(), data.getTypeParameters(), Collections.emptyList(), true); diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt index 808d1b7b016..018c4c11b15 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt @@ -9,4 +9,4 @@ public class A { // FILE: 1.kt -val test = A(x = 1, y = "2") +val test = A(x = 1, y = "2") diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt index 58f5de7b74c..62648bc3150 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt @@ -10,7 +10,7 @@ interface A { // FILE: 1.kt class B : A { - override fun foo(kotlinName: String) {} + override fun foo(kotlinName: String) {} } class C : A { diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt index 4434cfadf1d..28cc585adac 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.txt @@ -4,7 +4,7 @@ public/*package*/ /*synthesized*/ fun A(/*0*/ function: (kotlin.String!) -> kotl public/*package*/ interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ kotlinSignatureName: kotlin.String!): kotlin.Unit + public abstract fun foo(/*0*/ javaName: kotlin.String!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt index 9d778b862ad..5ba590e8c9b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt @@ -1,5 +1,5 @@ package test public open class ConstructorWithNewTypeParams { - public constructor ConstructorWithNewTypeParams(/*0*/ first: kotlin.Any!) + public constructor ConstructorWithNewTypeParams(/*0*/ p0: kotlin.Any!) } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt index 389d0945856..87d069e7d19 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt @@ -1,5 +1,5 @@ package test public open class ConstructorWithParentTypeParams { - public constructor ConstructorWithParentTypeParams(/*0*/ first: T!) + public constructor ConstructorWithParentTypeParams(/*0*/ p0: T!) } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt index 7a2f4045dc3..7955e4a25ef 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt @@ -1,5 +1,5 @@ package test public open class ConstructorWithSeveralParams { - public constructor ConstructorWithSeveralParams(/*0*/ integer: kotlin.Int!, /*1*/ intField: kotlin.Int, /*2*/ collection: java.util.ArrayList!) + public constructor ConstructorWithSeveralParams(/*0*/ p0: kotlin.Int!, /*1*/ p1: kotlin.Int, /*2*/ p2: java.util.ArrayList!) } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt index 3e2866e6261..c28aa34d7ef 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt @@ -2,5 +2,5 @@ package test public open class MethodWithFunctionTypes { public constructor MethodWithFunctionTypes() - public open fun foo(/*0*/ f: ((kotlin.String!) -> kotlin.String!)!): (() -> kotlin.String!)! + public open fun foo(/*0*/ p0: ((kotlin.String!) -> kotlin.String!)!): (() -> kotlin.String!)! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt index aab3686817a..0a50f6aae55 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt @@ -2,5 +2,5 @@ package test public open class MethodWithGenerics { public constructor MethodWithGenerics() - public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt index c660b7bdff6..5577d3dd9cb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt @@ -2,5 +2,5 @@ package test public open class MethodWithMappedClasses { public constructor MethodWithMappedClasses() - public open fun copy(/*0*/ dest: (kotlin.MutableList..kotlin.List<*>?), /*1*/ src: kotlin.(Mutable)List!): kotlin.Unit + public open fun copy(/*0*/ p0: (kotlin.MutableList..kotlin.List<*>?), /*1*/ p1: kotlin.(Mutable)List!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt index 99cd3dd8e09..7c25351dacb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt @@ -2,5 +2,5 @@ package test public open class MethodWithTypeParameters { public constructor MethodWithTypeParameters() - public open fun foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList..kotlin.List?), /*2*/ c: (kotlin.MutableList..kotlin.List<*>?)): kotlin.Unit where B : kotlin.(Mutable)List! + public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?), /*2*/ p2: (kotlin.MutableList..kotlin.List<*>?)): kotlin.Unit where B : kotlin.(Mutable)List! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt index 2130807dcb1..82f681dcf5d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt @@ -2,5 +2,5 @@ package test public open class MethodWithVararg { public constructor MethodWithVararg() - public open fun foo(/*0*/ vararg s: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit + public open fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt index d637b5455d4..1249f47f755 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class RedundantProjectionKind { public constructor RedundantProjectionKind() - public open fun foo(/*0*/ list: kotlin.(Mutable)List!): kotlin.Unit + public open fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt index 2c9cbed6367..76b7669b797 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt @@ -2,5 +2,5 @@ package test public open class WrongProjectionKind { public constructor WrongProjectionKind() - public open fun copy(/*0*/ a: kotlin.Array<(out) kotlin.Number!>!, /*1*/ b: kotlin.Array<(out) kotlin.Number!>!): kotlin.(Mutable)List! + public open fun copy(/*0*/ p0: kotlin.Array<(out) kotlin.Number!>!, /*1*/ p1: kotlin.Array<(out) kotlin.Number!>!): kotlin.(Mutable)List! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt index c41571566df..4424bc5f450 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt @@ -2,5 +2,5 @@ package test public open class WrongReturnTypeStructure { public constructor WrongReturnTypeStructure() - public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt index bd0385deadd..19b84a949ed 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure1 { public constructor WrongTypeParameterBoundStructure1() - public open fun foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! + public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt index cecfafd6c3e..fbd5fb33303 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongTypeParameterBoundStructure2 { public constructor WrongTypeParameterBoundStructure2() - public open fun foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! + public open fun foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList..kotlin.List?)): kotlin.Unit where B : kotlin.(Mutable)List! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt index cb957849e7e..86c09012e96 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure1 { public constructor WrongValueParameterStructure1() - public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt index 3465bcf7dfe..5fc7f7df07a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt @@ -2,5 +2,5 @@ package test public open class WrongValueParameterStructure2 { public constructor WrongValueParameterStructure2() - public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List!>!): kotlin.String! + public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List!>!): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt index 1bc60744e10..a77d93cf76d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt @@ -4,19 +4,19 @@ public interface PropagateTypeArgumentNullable { public interface Sub : test.PropagateTypeArgumentNullable.Super { public abstract override /*1*/ fun invOutR(): kotlin.(Mutable)List!>! - public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.(Mutable)List!>!): kotlin.Unit + public abstract override /*1*/ fun invOutS(/*0*/ p0: kotlin.(Mutable)List!>!): kotlin.Unit public abstract override /*1*/ fun invR(): kotlin.(Mutable)List! - public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.(Mutable)List!>!): kotlin.Unit + public abstract override /*1*/ fun outOutS(/*0*/ p0: kotlin.(Mutable)List!>!): kotlin.Unit public abstract override /*1*/ fun outR(): kotlin.(Mutable)List! - public abstract override /*1*/ fun outS(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun outS(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun invOutR(): kotlin.(Mutable)List!>! - public abstract fun invOutS(/*0*/ p: kotlin.(Mutable)List!>!): kotlin.Unit + public abstract fun invOutS(/*0*/ p0: kotlin.(Mutable)List!>!): kotlin.Unit public abstract fun invR(): kotlin.(Mutable)List! - public abstract fun outOutS(/*0*/ p: kotlin.(Mutable)List!>!): kotlin.Unit + public abstract fun outOutS(/*0*/ p0: kotlin.(Mutable)List!>!): kotlin.Unit public abstract fun outR(): kotlin.(Mutable)List! - public abstract fun outS(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun outS(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt index c546f3bffec..607737f7b1e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt @@ -4,11 +4,11 @@ public interface ChangeProjectionKind1 { public interface Sub : test.ChangeProjectionKind1.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt index b6bb37ef78c..a7145d7d22d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt @@ -4,11 +4,11 @@ public interface ChangeProjectionKind2 { public interface Sub : test.ChangeProjectionKind2.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt index 246b150bbdd..89fa5580a35 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt @@ -4,16 +4,16 @@ public interface DeeplySubstitutedClassParameter { public interface Middle : test.DeeplySubstitutedClassParameter.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ t: E!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: E!): kotlin.Unit } public interface Sub : test.DeeplySubstitutedClassParameter.Middle { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ t: T!): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt index b261fdd1fcc..576db6d8247 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt @@ -4,16 +4,16 @@ public interface DeeplySubstitutedClassParameter2 { public interface Middle : test.DeeplySubstitutedClassParameter2.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E!): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: E!): kotlin.Unit } public interface Sub : test.DeeplySubstitutedClassParameter2.Middle { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ t: T!): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt index c6cadbf3fb4..14469279462 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt @@ -4,11 +4,11 @@ public interface InheritMutability { public interface Sub : test.InheritMutability.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt index aafe1541a83..1f676df77b7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt @@ -4,11 +4,11 @@ public interface InheritNotVarargNotNull { public interface Sub : test.InheritNotVarargNotNull.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<(out) kotlin.String!>?): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>?): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt index ae31c078042..4cdbc33ccaf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt @@ -4,11 +4,11 @@ public interface InheritProjectionKind { public interface Sub : test.InheritProjectionKind.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt index f06ac4d88c4..2820b39eb82 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt @@ -4,11 +4,11 @@ public interface InheritReadOnliness { public interface Sub : test.InheritReadOnliness.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt index ed8a0965ecb..e64b0bdbfaa 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt @@ -4,11 +4,11 @@ public interface InheritVarargNotNull { public interface Sub : test.InheritVarargNotNull.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>*/): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt index 0d06dd76d7a..f4fe096e027 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt @@ -9,11 +9,11 @@ public interface Kt3302 { public interface BasicBSONObject : test.Kt3302.LinkedHashMap, test.Kt3302.BSONObject { public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any! + public abstract override /*2*/ fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any! } public interface LinkedHashMap { public abstract fun dummy(): kotlin.Unit - public abstract fun put(/*0*/ key: K!, /*1*/ value: V!): V! + public abstract fun put(/*0*/ p0: K!, /*1*/ p1: V!): V! } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt index 07133902d5a..4b60cfa8258 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt @@ -4,11 +4,11 @@ public interface MutableToReadOnly { public interface Sub : test.MutableToReadOnly.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt index 6f2081c5912..6edde558ca5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt @@ -4,7 +4,7 @@ public interface NotNullToNullable { public interface Sub : test.NotNullToNullable.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } public interface Super { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt index a6da60948aa..593647c4182 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt @@ -4,11 +4,11 @@ public interface NullableToNotNullKotlinSignature { public interface Sub : test.NullableToNotNullKotlinSignature.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.String!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt index bd459ac97c0..1ce87ad53e6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt @@ -4,11 +4,11 @@ public interface ReadOnlyToMutable { public interface Sub : test.ReadOnlyToMutable.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ p: kotlin.(Mutable)List!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt index e3e21c0642c..65e8474cfd3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt @@ -4,7 +4,7 @@ public interface SubclassFromGenericAndNot { public interface Generic { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ key: T!): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } public interface NonGeneric { @@ -14,6 +14,6 @@ public interface SubclassFromGenericAndNot { public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic { public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt index 3a17e502380..29811547ade 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt @@ -4,11 +4,11 @@ public interface SubstitutedClassParameter { public interface Sub : test.SubstitutedClassParameter.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } public interface Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ t: T!): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt index cbbd1b67c75..9ca06c1dea9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt @@ -4,16 +4,16 @@ public interface SubstitutedClassParameters { public interface Sub : test.SubstitutedClassParameters.Super1, test.SubstitutedClassParameters.Super2 { public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit } public interface Super1 { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ t: T!): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } public interface Super2 { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ t: E!): kotlin.Unit + public abstract fun foo(/*0*/ p0: E!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt index 9fc5625b49e..8f15005ca18 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt @@ -3,10 +3,10 @@ package test public interface InheritMutability { public interface Sub : test.InheritMutability.Super { - public abstract override /*1*/ fun !> foo(/*0*/ a: B!): kotlin.Unit + public abstract override /*1*/ fun !> foo(/*0*/ p0: B!): kotlin.Unit } public interface Super { - public abstract fun !> foo(/*0*/ a: A!): kotlin.Unit + public abstract fun !> foo(/*0*/ p0: A!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt index 0bdd59e3df5..c395905db8e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt @@ -3,10 +3,10 @@ package test public interface InheritNullability { public interface Sub : test.InheritNullability.Super { - public abstract override /*1*/ fun foo(/*0*/ a: B!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B!): kotlin.Unit } public interface Super { - public abstract fun foo(/*0*/ a: A!): kotlin.Unit + public abstract fun foo(/*0*/ p0: A!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt index b5e92d124a1..80c8838ee99 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt @@ -3,10 +3,10 @@ package test public interface InheritReadOnliness { public interface Sub : test.InheritReadOnliness.Super { - public abstract override /*1*/ fun !> foo(/*0*/ a: B!): kotlin.Unit + public abstract override /*1*/ fun !> foo(/*0*/ p0: B!): kotlin.Unit } public interface Super { - public abstract fun !> foo(/*0*/ a: A!): kotlin.Unit + public abstract fun !> foo(/*0*/ p0: A!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt index ac20daaa483..a7da04c28fb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt @@ -3,10 +3,10 @@ package test public interface TwoBounds { public interface Sub : test.TwoBounds.Super { - public abstract override /*1*/ fun foo(/*0*/ a: B!): kotlin.Unit where B : kotlin.Cloneable! + public abstract override /*1*/ fun foo(/*0*/ p0: B!): kotlin.Unit where B : kotlin.Cloneable! } public interface Super { - public abstract fun foo(/*0*/ a: A!): kotlin.Unit where A : kotlin.Cloneable! + public abstract fun foo(/*0*/ p0: A!): kotlin.Unit where A : kotlin.Cloneable! } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt index 62347ee676a..1984eac1c41 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt @@ -3,14 +3,14 @@ package test public interface TwoSuperclasses { public interface Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 { - public abstract override /*2*/ fun foo(/*0*/ a: C!): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: C!): kotlin.Unit } public interface Super1 { - public abstract fun foo(/*0*/ a: A!): kotlin.Unit + public abstract fun foo(/*0*/ p0: A!): kotlin.Unit } public interface Super2 { - public abstract fun foo(/*0*/ a: B!): kotlin.Unit + public abstract fun foo(/*0*/ p0: B!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt index f5ad55b524c..9aa22b746bc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt @@ -3,10 +3,10 @@ package test public interface TwoTypeParameters { public interface Sub : test.TwoTypeParameters.Super { - public abstract override /*1*/ fun foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit } public interface Super { - public abstract fun foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit + public abstract fun foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt index 5c31618aff5..c22c0cc4239 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt @@ -3,10 +3,10 @@ package test public interface UseParameterAsUpperBound { public interface Sub : test.UseParameterAsUpperBound.Super { - public abstract override /*1*/ fun foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit } public interface Super { - public abstract fun foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit + public abstract fun foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt index 54629dca4fa..d1d9e33f689 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt @@ -3,10 +3,10 @@ package test public interface UseParameterInUpperBound { public interface Sub : test.UseParameterInUpperBound.Super { - public abstract override /*1*/ fun !> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit + public abstract override /*1*/ fun !> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit } public interface Super { - public abstract fun !> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit + public abstract fun !> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt index 99c799d7603..39db3171a06 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt @@ -3,10 +3,10 @@ package test public interface UseParameterInUpperBoundWithKotlinSignature { public interface Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super { - public abstract override /*1*/ fun !> foo(/*0*/ b: B!, /*1*/ a: A!): kotlin.Unit + public abstract override /*1*/ fun !> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit } public interface Super { - public abstract fun !> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit + public abstract fun !> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt index c2dfa9e170d..995a8b93651 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt @@ -4,7 +4,7 @@ public interface TwoSuperclassesVarargAndNot { public interface Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 { public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*2*/ fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit + public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit } public interface Super1 { @@ -14,6 +14,6 @@ public interface TwoSuperclassesVarargAndNot { public interface Super2 { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit + public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit } }