diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 2947d03dd3b..4ad542ba032 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -22,6 +22,20 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource +import org.jetbrains.kotlin.util.OperatorNameConventions +import org.jetbrains.kotlin.util.OperatorNameConventions.ASSIGNMENT_OPERATIONS +import org.jetbrains.kotlin.util.OperatorNameConventions.BINARY_OPERATION_NAMES +import org.jetbrains.kotlin.util.OperatorNameConventions.COMPARE_TO +import org.jetbrains.kotlin.util.OperatorNameConventions.CONTAINS +import org.jetbrains.kotlin.util.OperatorNameConventions.DELEGATED_PROPERTY_OPERATORS +import org.jetbrains.kotlin.util.OperatorNameConventions.EQUALS +import org.jetbrains.kotlin.util.OperatorNameConventions.GET +import org.jetbrains.kotlin.util.OperatorNameConventions.HAS_NEXT +import org.jetbrains.kotlin.util.OperatorNameConventions.INVOKE +import org.jetbrains.kotlin.util.OperatorNameConventions.ITERATOR +import org.jetbrains.kotlin.util.OperatorNameConventions.NEXT +import org.jetbrains.kotlin.util.OperatorNameConventions.SET +import org.jetbrains.kotlin.util.OperatorNameConventions.UNARY_OPERATION_NAMES import kotlin.properties.Delegates @UseExperimental(FirImplementationDetail::class) @@ -55,6 +69,10 @@ class FirJavaMethod @FirImplementationDetail constructor( annotations, ) +private val ALL_JAVA_OPERATION_NAMES = + UNARY_OPERATION_NAMES + BINARY_OPERATION_NAMES + ASSIGNMENT_OPERATIONS + DELEGATED_PROPERTY_OPERATORS + + EQUALS + COMPARE_TO + CONTAINS + INVOKE + ITERATOR + GET + SET + NEXT + HAS_NEXT + @FirBuilderDsl class FirJavaMethodBuilder : FirSimpleFunctionBuilder() { lateinit var visibility: Visibility @@ -69,7 +87,9 @@ class FirJavaMethodBuilder : FirSimpleFunctionBuilder() { isExpect = false isActual = false isOverride = false - isOperator = true // All Java methods with name that allows to use it in operator form are considered operators + // Approximation: all Java methods with name that allows to use it in operator form are considered operators + // We need here more detailed checks (see modifierChecks.kt) + isOperator = name in ALL_JAVA_OPERATION_NAMES || OperatorNameConventions.COMPONENT_REGEX.matches(name.asString()) isInfix = false isInline = false isTailRec = false diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt index 07d671d6c96..9f0ad7d415d 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt @@ -3,7 +3,7 @@ public open class NonNullNever : R|kotlin/Any| { @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?| - @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?| + @R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?| public constructor(): R|NonNullNever| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt index ddbba9a3d48..d0d677fb61b 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt @@ -1,9 +1,9 @@ public open class Simple : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?| - @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String?| + @R|javax/annotation/Nullable|() public open fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String?| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|Simple| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt index 08738fbd870..3d41c1703cd 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt @@ -1,9 +1,9 @@ public open class Strange : R|kotlin/Any| { @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft!| - @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?| + @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|Strange| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt index 2ad549c8ae6..e6b7b2d2710 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt @@ -3,9 +3,9 @@ @R|javax/annotation/Nonnull|() public open field nonNullField: R|kotlin/String| - public open operator fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt index c3da2077642..4b2294d3afd 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt @@ -1,7 +1,7 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any| { - public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String| + public open fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String| - @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft!|, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft!| + @R|spr/ForceFlexibility|() public open fun bar(x: R|ft!|, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft!| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt index 49bda0177fd..8b1696a6b7b 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt @@ -1,23 +1,23 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any|, R|B| { - @R|spr/ForceFlexibility|() public open operator fun foo(x: R|kotlin/String|): R|kotlin/Unit| + @R|spr/ForceFlexibility|() public open fun foo(x: R|kotlin/String|): R|kotlin/Unit| - public open operator fun bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit| + public open fun bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit| - public open operator fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit| + public open fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit| - public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft!|): R|kotlin/Unit| + public open fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft!|): R|kotlin/Unit| public constructor(): R|A| } public abstract interface B : R|kotlin/Any| { - public abstract operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| + public abstract fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| - public abstract operator fun bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| + public abstract fun bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| - public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| + public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| - public abstract operator fun foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| + public abstract fun foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit| } @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|((R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|kotlin/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt index be82736094e..7328055612e 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt @@ -1,55 +1,55 @@ @R|NonNullApi|() public open class A : R|kotlin/Any| { - public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String| + public open fun foo1(x: R|kotlin/String|): R|kotlin/String| - public open operator fun foo2(x: R|kotlin/String|): R|kotlin/String| + public open fun foo2(x: R|kotlin/String|): R|kotlin/String| - public open operator fun foo3(x: R|kotlin/String|): R|kotlin/String| + public open fun foo3(x: R|kotlin/String|): R|kotlin/String| - @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| + @R|javax/annotation/Nullable|() public open fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| - @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| + @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| - public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| + public open fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| public constructor(): R|A| } @R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| { - public abstract operator fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence| + public abstract fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence| - public abstract operator fun foo2(x: R|kotlin/String|): R|kotlin/CharSequence| + public abstract fun foo2(x: R|kotlin/String|): R|kotlin/CharSequence| - public abstract operator fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence| + public abstract fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence| - @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?| + @R|javax/annotation/Nullable|() public abstract fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?| - @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?| + @R|javax/annotation/Nullable|() public abstract fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?| - public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence| + public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence| } @R|NullableApi|() public open class B : R|A|, R|AInt| { - public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String| + public open fun foo1(x: R|kotlin/String|): R|kotlin/String| - @R|javax/annotation/Nonnull|() public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| - public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?| + public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?| - public open operator fun baz(x: R|kotlin/String|): R|kotlin/String| + public open fun baz(x: R|kotlin/String|): R|kotlin/String| public constructor(): R|B| } @R|NonNullApi|() public open class C : R|A|, R|AInt| { - public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String| + public open fun foo1(x: R|kotlin/String|): R|kotlin/String| - public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| + public open fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String| - public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?| + public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?| - @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| + @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?| - public open operator fun baz(x: R|kotlin/String|): R|kotlin/String| + public open fun baz(x: R|kotlin/String|): R|kotlin/String| public constructor(): R|C| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt index 632390fcad7..c09146a27e7 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt @@ -1,13 +1,13 @@ @R|NonNullApi|() public open class A : R|kotlin/Any| { public open field field: R|kotlin/String| - public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String| + public open fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String| - @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String?|, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String?| + @R|NullableApi|() public open fun foobar(x: R|kotlin/String?|, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String?| - public open operator fun bar(): R|kotlin/String| + public open fun bar(): R|kotlin/String| - @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft!>?, kotlin/collections/List!>?>?| + @R|javax/annotation/Nullable|() public open fun baz(): R|ft!>?, kotlin/collections/List!>?>?| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt index 68e4c58b76f..5c8964984e6 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt @@ -1,9 +1,9 @@ @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?| - public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt index fd9502c71c9..69e4ed575dc 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt @@ -1,9 +1,9 @@ public open class A : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?| - public open operator fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|test/A| @@ -11,9 +11,9 @@ public open class A : R|kotlin/Any| { public open class A2 : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?| - public open operator fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft!| - @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open fun bar(): R|kotlin/String| public constructor(): R|test2/A2| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt index 631560e9785..ef5979ee8bc 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt @@ -1,11 +1,11 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any| { public open field field: R|ft!| - public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String| + public open fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String| - public open operator fun bar(): R|kotlin/String| + public open fun bar(): R|kotlin/String| - @R|spr/Nullable|() public open operator fun baz(): R|ft!>?, kotlin/collections/List!>?>?| + @R|spr/Nullable|() public open fun baz(): R|ft!>?, kotlin/collections/List!>?>?| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt index f08b20fb5d2..8c4945a227c 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt @@ -1,11 +1,11 @@ public open class A : R|kotlin/Any| { public open field field: R|ft!| - public open operator fun foo(x: R|ft!|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|ft!| + public open fun foo(x: R|ft!|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|ft!| - public open operator fun bar(): R|ft!| + public open fun bar(): R|ft!| - @R|spr/Nullable|() public open operator fun baz(): R|ft!>?, kotlin/collections/List!>?>?| + @R|spr/Nullable|() public open fun baz(): R|ft!>?, kotlin/collections/List!>?>?| public constructor(): R|test/A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt index 623bb613cc5..657cc039ace 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt @@ -1,11 +1,11 @@ public/*package*/ open class A : R|kotlin/Any| { - public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft!| = R|/Signs.HELLO|): R|ft!| + public open fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft!| = R|/Signs.HELLO|): R|ft!| - public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft!| = R|/Signs.X|): R|ft!| + public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft!| = R|/Signs.X|): R|ft!| - public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft!|): R|ft!| + public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft!|): R|ft!| - public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft!| + public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft!| public/*package*/ constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt index 1dc001ea5d5..dc92ec4082f 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt @@ -1,23 +1,23 @@ public open class A : R|kotlin/Any| { - public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft!| = Long(31)): R|kotlin/Unit| + public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft!| = Long(31)): R|kotlin/Unit| - public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft!| = Long(31)): R|kotlin/Unit| + public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft!| = Long(31)): R|kotlin/Unit| - public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft!| = Long(10)): R|kotlin/Unit| + public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft!| = Long(10)): R|kotlin/Unit| - public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft!| = Long(10)): R|kotlin/Unit| + public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft!| = Long(10)): R|kotlin/Unit| public constructor(): R|A| } public open class B : R|kotlin/Any| { - public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft!|): R|kotlin/Unit| + public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft!|): R|kotlin/Unit| - public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft!|): R|kotlin/Unit| + public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft!|): R|kotlin/Unit| - public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft!|): R|kotlin/Unit| + public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft!|): R|kotlin/Unit| - public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft!|): R|kotlin/Unit| + public open fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft!|): R|kotlin/Unit| public constructor(): R|B| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt index 1266af14ecd..7e9eb58f7de 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt @@ -1,13 +1,13 @@ public open class A : R|kotlin/Any| { - public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft!| = Null(null)): R|kotlin/Unit| + public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft!| = Null(null)): R|kotlin/Unit| - public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit| + public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit| public constructor(): R|A| } public open class B : R|kotlin/Any| { - public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft!| = Null(null)): R|kotlin/Unit| + public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft!| = Null(null)): R|kotlin/Unit| public constructor(): R|B| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt index af6a7d6c470..1bf73e44a09 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt @@ -1,27 +1,27 @@ public open class A : R|kotlin/Any| { - public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft!| = Null(null)): R|kotlin/Unit| + public open fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft!| = Null(null)): R|kotlin/Unit| - public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| + public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| - public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| + public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| - public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| + public open fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| public constructor(): R|A| } public abstract interface AInt : R|kotlin/Any| { - public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft!| = Int(42)): R|kotlin/Unit| + public abstract fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft!| = Int(42)): R|kotlin/Unit| - public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| + public abstract fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft!| = Null(null)): R|kotlin/Unit| } public open class B : R|A| { - public open operator fun foo(i: R|ft!|): R|kotlin/Unit| + public open fun foo(i: R|ft!|): R|kotlin/Unit| - public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| + public open fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| - public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| + public open fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft!| = Int(42)): R|kotlin/Unit| public constructor(): R|B| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt index ad9eb462d8e..b06d35c2685 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt @@ -1,13 +1,13 @@ public/*package*/ open class A : R|kotlin/Any| { - public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft!| = String(hello)): R|kotlin/Unit| + public open fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft!| = String(hello)): R|kotlin/Unit| - public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft!| = String(second)): R|kotlin/Unit| + public open fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft!| = String(second)): R|kotlin/Unit| - public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft!| = String(first), b: R|ft!|): R|kotlin/Unit| + public open fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft!| = String(first), b: R|ft!|): R|kotlin/Unit| - public open operator fun fourth(first: R|ft!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft!| = String(second)): R|kotlin/Unit| + public open fun fourth(first: R|ft!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft!| = String(second)): R|kotlin/Unit| - public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft!|): R|kotlin/Unit| + public open fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft!|): R|kotlin/Unit| public/*package*/ constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt index 9f7e2df6c14..df83a692002 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt @@ -1,9 +1,9 @@ public/*package*/ open class A : R|kotlin/Any| { - public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit| + public open fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit| - public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft!|): R|kotlin/Unit| + public open fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft!|): R|kotlin/Unit| - public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft!|): R|kotlin/Unit| + public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft!|): R|kotlin/Unit| public/*package*/ constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt index 75e1734a516..06ce0ed7930 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt @@ -1,5 +1,5 @@ public open class A : R|kotlin/Any| { - public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit| + public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt index 73d6f566143..e56ddaf0148 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt @@ -1,5 +1,5 @@ public open class A : R|kotlin/Any| { - public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft!|): R|kotlin/Unit| + public open fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft!|): R|kotlin/Unit| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt index c276fd97847..c71fc3e0e10 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt @@ -1,7 +1,7 @@ public open class A : R|kotlin/Any| { - public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft!|): R|kotlin/Unit| + public open fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft!|): R|kotlin/Unit| - public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft!|): R|kotlin/Unit| + public open fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft!|): R|kotlin/Unit| public constructor(): R|A| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt index 1a219ed2ff7..d35168c69a1 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt @@ -1,5 +1,5 @@ public/*package*/ open class A : R|kotlin/Any| { - public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft!| = String(OK)): R|ft!| + public open static fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft!| = String(OK)): R|ft!| public/*package*/ constructor(): R|A| diff --git a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.txt b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.txt index 46fc8391d5f..2580ffc0f4b 100644 --- a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.txt @@ -5,21 +5,21 @@ FILE fqName: fileName:/fakeOverridesForJavaStaticMembers.kt BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in a.Base' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[a.Base]' - FUN FAKE_OVERRIDE name:publicStaticMethod visibility:public modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override,operator] + FUN FAKE_OVERRIDE name:publicStaticMethod visibility:public modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override] overridden: - public open fun publicStaticMethod (): kotlin.Unit [operator] declared in a.Base + public open fun publicStaticMethod (): kotlin.Unit declared in a.Base $this: VALUE_PARAMETER name: type:a.Base - FUN FAKE_OVERRIDE name:protectedStaticMethod visibility:protected/*protected static*/ modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override,operator] + FUN FAKE_OVERRIDE name:protectedStaticMethod visibility:protected/*protected static*/ modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override] overridden: - protected/*protected static*/ open fun protectedStaticMethod (): kotlin.Unit [operator] declared in a.Base + protected/*protected static*/ open fun protectedStaticMethod (): kotlin.Unit declared in a.Base $this: VALUE_PARAMETER name: type:a.Base - FUN FAKE_OVERRIDE name:packagePrivateStaticMethod visibility:public/*package*/ modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override,operator] + FUN FAKE_OVERRIDE name:packagePrivateStaticMethod visibility:public/*package*/ modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override] overridden: - public/*package*/ open fun packagePrivateStaticMethod (): kotlin.Unit [operator] declared in a.Base + public/*package*/ open fun packagePrivateStaticMethod (): kotlin.Unit declared in a.Base $this: VALUE_PARAMETER name: type:a.Base - FUN FAKE_OVERRIDE name:privateStaticMethod visibility:private modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override,operator] + FUN FAKE_OVERRIDE name:privateStaticMethod visibility:private modality:OPEN <> ($this:a.Base) returnType:kotlin.Unit [fake_override] overridden: - private open fun privateStaticMethod (): kotlin.Unit [operator] declared in a.Base + private open fun privateStaticMethod (): kotlin.Unit declared in a.Base $this: VALUE_PARAMETER name: type:a.Base FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt index ae022cecf03..ddeaeb39bd3 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt @@ -22,9 +22,9 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .JFoo' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[.JFoo]' - FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:.JFoo) returnType:kotlin.String [fake_override,operator] + FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:.JFoo) returnType:kotlin.String [fake_override] overridden: - public open fun foo (): kotlin.String [operator] declared in .JFoo + public open fun foo (): kotlin.String declared in .JFoo $this: VALUE_PARAMETER name: type:.JFoo FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -49,7 +49,7 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt $this: VALUE_PARAMETER name: type:.K2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in .K2' - CALL 'public open fun foo (): kotlin.String [operator] declared in .JFoo' type=kotlin.String origin=null + CALL 'public open fun foo (): kotlin.String declared in .JFoo' type=kotlin.String origin=null $this: GET_VAR ': .K2 declared in .K2.foo' type=.K2 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -97,7 +97,7 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt $this: VALUE_PARAMETER name: type:.K4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String? declared in .K4' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .JUnrelatedFoo' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .JUnrelatedFoo' type=kotlin.String? origin=null $this: ERROR_CALL 'Unresolved reference: super' type=IrErrorType FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt index 6425e6e3286..c55ea704885 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt @@ -20,9 +20,9 @@ FILE fqName: fileName:/coercionToUnit.kt element: CONST String type=kotlin.String value="" FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit? origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="Hello," - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit? origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="world!" diff --git a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt index a55b0587cc6..f7841f19a32 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.fir.txt @@ -2,5 +2,5 @@ FILE fqName: fileName:/implicitCastOnPlatformType.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String declared in ' - CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? [operator] declared in java.lang.System' type=kotlin.String? origin=null + CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null p0: CONST String type=kotlin.String value="test" diff --git a/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.fir.txt b/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.fir.txt index d3d3f94f450..2d59e98bfae 100644 --- a/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.fir.txt +++ b/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.fir.txt @@ -12,7 +12,7 @@ FILE fqName: fileName:/implicitNotNullInDestructuringAssignment.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.J? [val] - CALL 'public open fun j (): .J? [operator] declared in .J' type=.J? origin=null + CALL 'public open fun j (): .J? declared in .J' type=.J? origin=null VAR name:a type:kotlin.Int [val] CALL 'public final fun component1 (): kotlin.Int [operator] declared in ' type=kotlin.Int origin=null $receiver: GET_VAR 'val tmp_0: .J? [val] declared in .test' type=.J? origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt index 3959cac1690..c69ba673c96 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt @@ -1,14 +1,14 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' @@ -17,7 +17,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Any BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -33,7 +33,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Int origin=null - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 @@ -46,7 +46,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt receiver: GET_VAR ': .TestClass declared in .TestClass.' type=.TestClass origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit [operator] declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt index dd2c16be486..ad825322fa2 100644 --- a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt +++ b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.fir.txt @@ -40,7 +40,7 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test1' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.String declared in ' @@ -50,7 +50,7 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .test2' - CALL 'public open fun nnFoo (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun nnFoo (): kotlin.String declared in .J' type=kotlin.String origin=null FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.String? declared in ' @@ -60,7 +60,7 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test3' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.String declared in ' @@ -70,4 +70,4 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .test4' - CALL 'public open fun nnFoo (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun nnFoo (): kotlin.String declared in .J' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt index 990e50594a1..3cea7705876 100644 --- a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt +++ b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.fir.txt @@ -25,7 +25,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Any declared in .test1' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY @@ -33,7 +33,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test2' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY @@ -47,7 +47,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test3' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY @@ -62,7 +62,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test4' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY @@ -76,7 +76,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Any? declared in .test5' - CALL 'public open fun foo (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test6 (): kotlin.Any? declared in ' @@ -85,4 +85,4 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Any? declared in .test6' - CALL 'public open fun nnFoo (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun nnFoo (): kotlin.String declared in .J' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt index ec304bdbf29..f6ec6db2aa3 100644 --- a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt +++ b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt @@ -10,7 +10,7 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt BLOCK_BODY GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? [operator] declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null r: FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -21,24 +21,24 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt ERROR_CALL 'Unresolved reference: #' type=IrErrorType GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? [operator] declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null r: GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? [operator] declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null r: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? CONST String type=kotlin.String value="" ERROR_CALL 'Unresolved reference: #' type=IrErrorType GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? [operator] declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null r: GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? [operator] declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null r: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? SPREAD_ELEMENT diff --git a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.fir.txt b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.fir.txt index f0359da56f0..4eb93931cff 100644 --- a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.fir.txt +++ b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.fir.txt @@ -2,7 +2,7 @@ FILE fqName: fileName:/genericSamProjectedOut.kt FUN name:test visibility:public modality:FINAL <> (a:example.SomeJavaClass) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:example.SomeJavaClass BLOCK_BODY - CALL 'public open fun someFunction (hello: example.Hello?): kotlin.Unit [operator] declared in example.SomeJavaClass' type=kotlin.Unit origin=null + CALL 'public open fun someFunction (hello: example.Hello?): kotlin.Unit declared in example.SomeJavaClass' type=kotlin.Unit origin=null $this: GET_VAR 'a: example.SomeJavaClass declared in .test' type=example.SomeJavaClass origin=null hello: FUN_EXPR type=kotlin.Function1 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.String?) returnType:kotlin.Unit diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.txt index 63b0c01f090..38d505d14cb 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.Unit declared in ' - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : kotlin.String? j: FUN_EXPR type=kotlin.Function1 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String @@ -37,7 +37,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt BLOCK_BODY TYPE_OP type=.J origin=CAST typeOperand=.J GET_VAR 'a: kotlin.Any declared in .test4' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : kotlin.String? j: TYPE_OP type=.J origin=IMPLICIT_CAST typeOperand=.J GET_VAR 'a: kotlin.Any declared in .test4' type=kotlin.Any origin=null @@ -46,7 +46,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt BLOCK_BODY TYPE_OP type=kotlin.Function1 origin=CAST typeOperand=kotlin.Function1 GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : kotlin.String? j: TYPE_OP type=kotlin.Function1 origin=IMPLICIT_CAST typeOperand=kotlin.Function1 GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null @@ -54,7 +54,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:a index:0 type:kotlin.Function1.test6, T of .test6> BLOCK_BODY - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : T of .test6? j: GET_VAR 'a: kotlin.Function1.test6, T of .test6> declared in .test6' type=kotlin.Function1.test6, T of .test6> origin=null FUN name:test7 visibility:public modality:FINAL (a:kotlin.Any) returnType:kotlin.Unit @@ -63,7 +63,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt BLOCK_BODY TYPE_OP type=kotlin.Function1.test7, T of .test7> origin=CAST typeOperand=kotlin.Function1.test7, T of .test7> GET_VAR 'a: kotlin.Any declared in .test7' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : T of .test7? j: TYPE_OP type=kotlin.Function1.test7, T of .test7> origin=IMPLICIT_CAST typeOperand=kotlin.Function1.test7, T of .test7> GET_VAR 'a: kotlin.Any declared in .test7' type=kotlin.Any origin=null @@ -77,12 +77,12 @@ FILE fqName: fileName:/samConversionToGeneric.kt FUN name:test9 visibility:public modality:FINAL <> (efn:kotlin.Function1) returnType:kotlin.Unit VALUE_PARAMETER name:efn index:0 type:kotlin.Function1 BLOCK_BODY - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : kotlin.String? j: GET_VAR 'efn: kotlin.Function1 declared in .test9' type=kotlin.Function1 origin=null FUN name:test10 visibility:public modality:FINAL <> (fn:kotlin.Function1) returnType:kotlin.Unit VALUE_PARAMETER name:fn index:0 type:kotlin.Function1 BLOCK_BODY - CALL 'public open fun bar2x (j2x: .J2X.H.bar2x?>?): kotlin.Unit [operator] declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar2x (j2x: .J2X.H.bar2x?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : kotlin.Int? j2x: GET_VAR 'fn: kotlin.Function1 declared in .test10' type=kotlin.Function1 origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt index b7963ca81b1..5b549a8beb5 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt @@ -3,14 +3,14 @@ FILE fqName: fileName:/samConversions.kt $receiver: VALUE_PARAMETER name: type:.J VALUE_PARAMETER name:a index:0 type:java.lang.Runnable BLOCK_BODY - CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test0' type=.J origin=null r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null r: FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -18,7 +18,7 @@ FILE fqName: fileName:/samConversions.kt FUN name:test2 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J BLOCK_BODY - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test2' type=.J origin=null r: FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -28,7 +28,7 @@ FILE fqName: fileName:/samConversions.kt $receiver: VALUE_PARAMETER name: type:.J VALUE_PARAMETER name:a index:0 type:kotlin.Function0 BLOCK_BODY - CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test3' type=.J origin=null r1: GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null r2: GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null @@ -38,7 +38,7 @@ FILE fqName: fileName:/samConversions.kt VALUE_PARAMETER name:b index:1 type:kotlin.Function0 VALUE_PARAMETER name:flag index:2 type:kotlin.Boolean BLOCK_BODY - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test4' type=.J origin=null r: WHEN type=kotlin.Function0 origin=IF BRANCH diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt index 430a3caf407..fc87d8703c3 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test1' type=kotlin.Function0 origin=null - then: CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + then: CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test1' type=kotlin.Function0 origin=null FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit @@ -16,7 +16,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test2' type=kotlin.Function0 origin=null - then: CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + then: CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test2' type=kotlin.Function0 origin=null @@ -27,7 +27,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null - then: CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + then: CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r1: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null @@ -41,7 +41,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null - then: CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + then: CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r1: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null @@ -53,7 +53,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null - then: CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + then: CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null @@ -68,7 +68,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5x' type=kotlin.Any origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5x' type=kotlin.Any origin=null @@ -77,7 +77,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt BLOCK_BODY TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Any declared in .test6' type=kotlin.Any origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=kotlin.Function0 origin=IMPLICIT_CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Any declared in .test6' type=kotlin.Any origin=null @@ -92,11 +92,11 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt VALUE_PARAMETER name:a index:0 type:kotlin.Function0 BLOCK_BODY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public open fun id (x: T of .J.id?): T of .J.id? [operator] declared in .J' type=kotlin.Function0? origin=null + CALL 'public open fun id (x: T of .J.id?): T of .J.id? declared in .J' type=kotlin.Function0? origin=null : kotlin.Function0? x: GET_VAR 'a: kotlin.Function0 declared in .test8' type=kotlin.Function0 origin=null FUN name:test9 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: FUNCTION_REFERENCE 'public final fun test9 (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= diff --git a/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt b/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt index 11b019cda2c..94d80f6f9d8 100644 --- a/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt +++ b/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt @@ -8,5 +8,5 @@ FILE fqName: fileName:/samAdapter.kt BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="Hello, world!" - CALL 'public abstract fun run (): kotlin.Unit [operator] declared in java.lang.Runnable' type=kotlin.Unit origin=null + CALL 'public abstract fun run (): kotlin.Unit declared in java.lang.Runnable' type=kotlin.Unit origin=null $this: GET_VAR 'val hello: java.lang.Runnable [val] declared in .test1' type=java.lang.Runnable origin=null diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt index cad2915612e..2953a6952aa 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt @@ -27,7 +27,7 @@ FILE fqName: fileName:/builtinMap.kt $receiver: VALUE_PARAMETER name: type:java.util.LinkedHashMap.plus?, V1 of .plus?> BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .plus' - CALL 'public open fun put (p0: K1 of .plus?, p1: V1 of .plus?): V1 of .plus? [operator] declared in java.util.HashMap' type=V1 of .plus? origin=null + CALL 'public open fun put (p0: K1 of .plus?, p1: V1 of .plus?): V1 of .plus? declared in java.util.HashMap' type=V1 of .plus? origin=null $this: GET_VAR ': java.util.LinkedHashMap.plus?, V1 of .plus?> declared in special.' type=java.util.LinkedHashMap.plus?, V1 of .plus?> origin=null p0: CALL 'public final fun (): K1 of .plus declared in kotlin.Pair' type=K1 of .plus origin=null $this: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt index 9422bfd0a1c..08b0aa6a63c 100644 --- a/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt +++ b/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt @@ -16,9 +16,9 @@ FILE fqName: fileName:/javaInnerClass.kt RETURN type=kotlin.Nothing from='public final fun (): .J.JInner declared in .Test1' GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.J.JInner visibility:private [final]' type=.J.JInner origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null - FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:.J) returnType:kotlin.Unit [fake_override,operator] + FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:.J) returnType:kotlin.Unit [fake_override] overridden: - public open fun bar (): kotlin.Unit [operator] declared in .J + public open fun bar (): kotlin.Unit declared in .J $this: VALUE_PARAMETER name: type:.J FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/stubs/javaMethod.fir.txt b/compiler/testData/ir/irText/stubs/javaMethod.fir.txt deleted file mode 100644 index 40b571bfa44..00000000000 --- a/compiler/testData/ir/irText/stubs/javaMethod.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -FILE fqName: fileName:/javaMethod.kt - FUN name:test visibility:public modality:FINAL <> (j:.J) returnType:kotlin.Unit - VALUE_PARAMETER name:j index:0 type:.J - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (j: .J): kotlin.Unit declared in ' - CALL 'public open fun bar (): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null - $this: GET_VAR 'j: .J declared in .test' type=.J origin=null diff --git a/compiler/testData/ir/irText/stubs/javaMethod.kt b/compiler/testData/ir/irText/stubs/javaMethod.kt index a5d3a251dd0..647d84862f7 100644 --- a/compiler/testData/ir/irText/stubs/javaMethod.kt +++ b/compiler/testData/ir/irText/stubs/javaMethod.kt @@ -6,5 +6,6 @@ public class J { } // FILE: javaMethod.kt +// FIR_IDENTICAL fun test(j: J) = j.bar() \ No newline at end of file diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt b/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt deleted file mode 100644 index eb9beed0aea..00000000000 --- a/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -FILE fqName: fileName:/javaNestedClass.kt - FUN name:test visibility:public modality:FINAL <> (jj:.J.JJ) returnType:kotlin.Unit - VALUE_PARAMETER name:jj index:0 type:.J.JJ - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (jj: .J.JJ): kotlin.Unit declared in ' - CALL 'public open fun foo (): kotlin.Unit [operator] declared in .J.JJ' type=kotlin.Unit origin=null - $this: GET_VAR 'jj: .J.JJ declared in .test' type=.J.JJ origin=null diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.kt b/compiler/testData/ir/irText/stubs/javaNestedClass.kt index 9b41e6116e4..69fc05a853f 100644 --- a/compiler/testData/ir/irText/stubs/javaNestedClass.kt +++ b/compiler/testData/ir/irText/stubs/javaNestedClass.kt @@ -10,4 +10,5 @@ public class J { // FILE: javaNestedClass.kt +// FIR_IDENTICAL fun test(jj: J.JJ) = jj.foo() \ No newline at end of file diff --git a/compiler/testData/ir/irText/stubs/javaStaticMethod.fir.txt b/compiler/testData/ir/irText/stubs/javaStaticMethod.fir.txt deleted file mode 100644 index 31ac901e63e..00000000000 --- a/compiler/testData/ir/irText/stubs/javaStaticMethod.fir.txt +++ /dev/null @@ -1,5 +0,0 @@ -FILE fqName: fileName:/javaStaticMethod.kt - FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (): kotlin.Unit declared in ' - CALL 'public open fun bar (): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/stubs/javaStaticMethod.kt b/compiler/testData/ir/irText/stubs/javaStaticMethod.kt index 408fc42df6a..72f4af43050 100644 --- a/compiler/testData/ir/irText/stubs/javaStaticMethod.kt +++ b/compiler/testData/ir/irText/stubs/javaStaticMethod.kt @@ -6,5 +6,6 @@ public class J { } // FILE: javaStaticMethod.kt +// FIR_IDENTICAL fun test() = J.bar() \ No newline at end of file diff --git a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt index 18b5907391d..f876d435f15 100644 --- a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt +++ b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt @@ -2,9 +2,9 @@ FILE fqName: fileName:/asOnPlatformType.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:nullStr type:kotlin.String? [val] - CALL 'public open fun nullString (): kotlin.String? [operator] declared in .JavaClass' type=kotlin.String? origin=null + CALL 'public open fun nullString (): kotlin.String? declared in .JavaClass' type=kotlin.String? origin=null VAR name:nonnullStr type:kotlin.String? [val] - CALL 'public open fun nonnullString (): kotlin.String? [operator] declared in .JavaClass' type=kotlin.String? origin=null + CALL 'public open fun nonnullString (): kotlin.String? declared in .JavaClass' type=kotlin.String? origin=null CALL 'public final fun foo (): T of .foo [inline] declared in ' type=kotlin.String? origin=null : kotlin.String? $receiver: GET_VAR 'val nullStr: kotlin.String? [val] declared in .test' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt index d02262b210a..f67c6a94465 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.fir.txt @@ -5,19 +5,19 @@ FILE fqName: fileName:/enhancedNullability.kt FUN name:testUse visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun use (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null - s: CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + s: CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null FUN name:testLocalVal visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:local type:kotlin.String [val] - CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null FUN name:testReturnValue visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testReturnValue (): kotlin.String declared in ' - CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null PROPERTY name:testGlobalVal visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testGlobalVal type:kotlin.String visibility:private [final,static] EXPRESSION_BODY - CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testGlobalVal visibility:public modality:FINAL [val] BLOCK_BODY @@ -28,20 +28,20 @@ FILE fqName: fileName:/enhancedNullability.kt correspondingProperty: PROPERTY name:testGlobalValGetter visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null FUN name:testJUse visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun use (s: kotlin.String): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null - s: CALL 'public open fun nullString (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null - CALL 'public open fun use (s: kotlin.String): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null - s: CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null + CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + s: CALL 'public open fun nullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + s: CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null FUN name:testLocalVarUse visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:ns type:kotlin.String? [val] - CALL 'public open fun nullString (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null - CALL 'public open fun use (s: kotlin.String): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun nullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in .J' type=kotlin.Unit origin=null s: GET_VAR 'val ns: kotlin.String? [val] declared in .testLocalVarUse' type=kotlin.String? origin=null VAR name:nns type:kotlin.String [val] - CALL 'public open fun notNullString (): kotlin.String [operator] declared in .J' type=kotlin.String origin=null - CALL 'public open fun use (s: kotlin.String): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun notNullString (): kotlin.String declared in .J' type=kotlin.String origin=null + CALL 'public open fun use (s: kotlin.String): kotlin.Unit declared in .J' type=kotlin.Unit origin=null s: GET_VAR 'val nns: kotlin.String [val] declared in .testLocalVarUse' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt index a7e0fc5fc77..469543c0766 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt @@ -118,7 +118,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.P [val] - CALL 'public open fun notNullP (): .P [operator] declared in .J' type=.P origin=null + CALL 'public open fun notNullP (): .P declared in .J' type=.P origin=null VAR name:x type:kotlin.Int [val] CALL 'public final fun component1 (): kotlin.Int [operator] declared in .P' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_0: .P [val] declared in .test1' type=.P origin=null @@ -131,7 +131,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:.Q? [val] - CALL 'public open fun notNullComponents (): .Q? [operator] declared in .J' type=.Q? origin=null + CALL 'public open fun notNullComponents (): .Q? declared in .J' type=.Q? origin=null VAR name:x type:kotlin.String [val] CALL 'public final fun component1 (): kotlin.String [operator] declared in .Q' type=kotlin.String origin=null $this: GET_VAR 'val tmp_1: .Q? [val] declared in .test2' type=.Q? origin=null @@ -144,7 +144,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt FUN name:test2Desugared visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:tmp type:.Q? [val] - CALL 'public open fun notNullComponents (): .Q? [operator] declared in .J' type=.Q? origin=null + CALL 'public open fun notNullComponents (): .Q? declared in .J' type=.Q? origin=null VAR name:x type:kotlin.String [val] CALL 'public final fun component1 (): kotlin.String [operator] declared in .Q' type=kotlin.String origin=null $this: GET_VAR 'val tmp: .Q? [val] declared in .test2Desugared' type=.Q? origin=null @@ -157,7 +157,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:.Q [val] - CALL 'public open fun notNullQAndComponents (): .Q [operator] declared in .J' type=.Q origin=null + CALL 'public open fun notNullQAndComponents (): .Q declared in .J' type=.Q origin=null VAR name:x type:kotlin.String [val] CALL 'public final fun component1 (): kotlin.String [operator] declared in .Q' type=kotlin.String origin=null $this: GET_VAR 'val tmp_2: .Q [val] declared in .test3' type=.Q origin=null @@ -174,7 +174,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt : kotlin.collections.IndexedValue<.P?> $receiver: CALL 'public final fun withIndex (): kotlin.collections.Iterable> declared in kotlin.collections' type=kotlin.collections.Iterable.P?>> origin=null : .P? - $receiver: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? [operator] declared in .J' type=kotlin.collections.List<.P?>? origin=null + $receiver: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? declared in .J' type=kotlin.collections.List<.P?>? origin=null VAR name:x type:kotlin.Int [val] CALL 'public final fun component1 (): kotlin.Int [operator] declared in kotlin.collections.IndexedValue' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_3: kotlin.collections.IndexedValue<.P?> [val] declared in .test4' type=kotlin.collections.IndexedValue<.P?> origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt index 7fb4282ed0d..26591d89e40 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_0 type:kotlin.collections.MutableIterator<.P?> [val] CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<.P?> [operator] declared in kotlin.collections.MutableCollection' type=kotlin.collections.MutableIterator<.P?> origin=FOR_LOOP_ITERATOR - $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? [operator] declared in .J' type=kotlin.collections.List<.P?>? origin=null + $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? declared in .J' type=kotlin.collections.List<.P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_0: kotlin.collections.MutableIterator<.P?> [val] declared in .testForInListUnused' type=kotlin.collections.MutableIterator<.P?> origin=null @@ -20,7 +20,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_1 type:kotlin.collections.MutableIterator<.P?> [val] CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<.P?> [operator] declared in kotlin.collections.MutableCollection' type=kotlin.collections.MutableIterator<.P?> origin=FOR_LOOP_ITERATOR - $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? [operator] declared in .J' type=kotlin.collections.List<.P?>? origin=null + $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? declared in .J' type=kotlin.collections.List<.P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_1: kotlin.collections.MutableIterator<.P?> [val] declared in .testForInListDestructured' type=kotlin.collections.MutableIterator<.P?> origin=null @@ -38,7 +38,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK_BODY VAR name:iterator type:kotlin.collections.MutableIterator<.P?> [val] CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<.P?> [operator] declared in kotlin.collections.MutableCollection' type=kotlin.collections.MutableIterator<.P?> origin=null - $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? [operator] declared in .J' type=kotlin.collections.List<.P?>? origin=null + $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? declared in .J' type=kotlin.collections.List<.P?>? origin=null WHILE label=null origin=WHILE_LOOP condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null $this: GET_VAR 'val iterator: kotlin.collections.MutableIterator<.P?> [val] declared in .testDesugaredForInList' type=kotlin.collections.MutableIterator<.P?> origin=null @@ -52,7 +52,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<.P?> [val] CALL 'public final fun iterator (): kotlin.collections.Iterator<.P?> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<.P?> origin=null - $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array.P?> [operator] declared in .J' type=kotlin.Array.P?> origin=null + $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array.P?> declared in .J' type=kotlin.Array.P?> origin=null $this: GET_VAR 'j: .J declared in .testForInArrayUnused' type=.J origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT @@ -66,7 +66,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_3 type:kotlin.collections.MutableIterator<.P?> [val] CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<.P?> [operator] declared in kotlin.collections.MutableCollection' type=kotlin.collections.MutableIterator<.P?> origin=FOR_LOOP_ITERATOR - $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? [operator] declared in .J' type=kotlin.collections.List<.P?>? origin=null + $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<.P?>? declared in .J' type=kotlin.collections.List<.P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_3: kotlin.collections.MutableIterator<.P?> [val] declared in .testForInListUse' type=kotlin.collections.MutableIterator<.P?> origin=null @@ -76,7 +76,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt $this: GET_VAR 'val tmp_3: kotlin.collections.MutableIterator<.P?> [val] declared in .testForInListUse' type=kotlin.collections.MutableIterator<.P?> origin=null CALL 'public final fun use (s: .P): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: GET_VAR 'val x: .P? [val] declared in .testForInListUse' type=.P? origin=null - CALL 'public open fun use (s: .P): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun use (s: .P): kotlin.Unit declared in .J' type=kotlin.Unit origin=null s: GET_VAR 'val x: .P? [val] declared in .testForInListUse' type=.P? origin=null FUN name:testForInArrayUse visibility:public modality:FINAL <> (j:.J) returnType:kotlin.Unit VALUE_PARAMETER name:j index:0 type:.J @@ -84,7 +84,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_4 type:kotlin.collections.Iterator<.P?> [val] CALL 'public final fun iterator (): kotlin.collections.Iterator<.P?> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<.P?> origin=null - $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array.P?> [operator] declared in .J' type=kotlin.Array.P?> origin=null + $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array.P?> declared in .J' type=kotlin.Array.P?> origin=null $this: GET_VAR 'j: .J declared in .testForInArrayUse' type=.J origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT @@ -95,7 +95,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt $this: GET_VAR 'val tmp_4: kotlin.collections.Iterator<.P?> [val] declared in .testForInArrayUse' type=kotlin.collections.Iterator<.P?> origin=null CALL 'public final fun use (s: .P): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: GET_VAR 'val x: .P? [val] declared in .testForInArrayUse' type=.P? origin=null - CALL 'public open fun use (s: .P): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun use (s: .P): kotlin.Unit declared in .J' type=kotlin.Unit origin=null s: GET_VAR 'val x: .P? [val] declared in .testForInArrayUse' type=.P? origin=null CLASS INTERFACE name:K modality:ABSTRACT visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.K diff --git a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt index 34750664f7d..354a07332a1 100644 --- a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.fir.txt @@ -4,16 +4,16 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testPlatformEqualsPlatform (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null - $this: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + $this: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsPlatform' type=.JavaClass origin=null - other: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsPlatform' type=.JavaClass origin=null FUN name:testPlatformEqualsKotlin visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Boolean $receiver: VALUE_PARAMETER name: type:.JavaClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testPlatformEqualsKotlin (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null - $this: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + $this: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsKotlin' type=.JavaClass origin=null other: CONST Double type=kotlin.Double value=0.0 FUN name:testKotlinEqualsPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Boolean @@ -22,23 +22,23 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testKotlinEqualsPlatform (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null $this: CONST Double type=kotlin.Double value=0.0 - other: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testKotlinEqualsPlatform' type=.JavaClass origin=null FUN name:testPlatformCompareToPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int $receiver: VALUE_PARAMETER name: type:.JavaClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testPlatformCompareToPlatform (): kotlin.Int declared in ' CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null - $this: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + $this: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToPlatform' type=.JavaClass origin=null - other: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToPlatform' type=.JavaClass origin=null FUN name:testPlatformCompareToKotlin visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int $receiver: VALUE_PARAMETER name: type:.JavaClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testPlatformCompareToKotlin (): kotlin.Int declared in ' CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null - $this: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + $this: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToKotlin' type=.JavaClass origin=null other: CONST Double type=kotlin.Double value=0.0 FUN name:testKotlinCompareToPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int @@ -47,5 +47,5 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testKotlinCompareToPlatform (): kotlin.Int declared in ' CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null $this: CONST Double type=kotlin.Double value=0.0 - other: CALL 'public open fun null0 (): kotlin.Double? [operator] declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testKotlinCompareToPlatform' type=.JavaClass origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt index d55cf0898d6..d8a5b8c0f56 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt @@ -53,7 +53,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null - s: CALL 'public open fun s (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + s: CALL 'public open fun s (): kotlin.String? declared in .J' type=kotlin.String? origin=null CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY FUN name:testContains visibility:public modality:FINAL <> (m:.MySet) returnType:kotlin.Unit diff --git a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.fir.txt b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.fir.txt index c6eb5d17c3b..d159176e8a0 100644 --- a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.fir.txt @@ -28,7 +28,7 @@ FILE fqName: fileName:/nullabilityAssertionOnExtensionReceiver.kt FUN name:testExt visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun extension (): kotlin.Unit declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public open fun s (): kotlin.String? [operator] declared in .J' type=kotlin.String? origin=null + $receiver: CALL 'public open fun s (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN name:testMemberExt visibility:public modality:FINAL <> ($receiver:.C) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.C BLOCK_BODY diff --git a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.txt b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.txt index a1f5a62b857..54a0a35dedb 100644 --- a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.txt @@ -9,5 +9,5 @@ FILE fqName: fileName:/platformTypeReceiver.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null - $this: CALL 'public open fun boolNull (): kotlin.Boolean? [operator] declared in .J' type=kotlin.Boolean? origin=null + $this: CALL 'public open fun boolNull (): kotlin.Boolean? declared in .J' type=kotlin.Boolean? origin=null other: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt index 7c8d0a59c91..7aaf6f43345 100644 --- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt @@ -1,5 +1,5 @@ public final class ArrayTypeVariance : R|kotlin/Any| { - public final operator fun toArray(p0: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/Array!>?>!| + public final fun toArray(p0: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/Array!>?>!| public constructor(): R|test/ArrayTypeVariance| diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt index fc109a567d5..b293bd0aaa1 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt @@ -1,5 +1,5 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| { - public open operator fun staticType(): R|ft!, ft!, ft!>, test/InnerClassTypeMultipleGeneric.Outer.Inner!, ft!, ft!>?>!| + public open fun staticType(): R|ft!, ft!, ft!>, test/InnerClassTypeMultipleGeneric.Outer.Inner!, ft!, ft!>?>!| public constructor(): R|test/InnerClassTypeMultipleGeneric| diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt index a764753f27b..aa254173084 100644 --- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt +++ b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt @@ -1,12 +1,12 @@ public abstract interface IntrinsicCompanionObject : R|kotlin/Any| { - public abstract operator fun testInt(i: R|ft!|): R|kotlin/Unit| + public abstract fun testInt(i: R|ft!|): R|kotlin/Unit| - public abstract operator fun testChar(c: R|ft!|): R|kotlin/Unit| + public abstract fun testChar(c: R|ft!|): R|kotlin/Unit| - public abstract operator fun testString(s: R|ft!|): R|kotlin/Unit| + public abstract fun testString(s: R|ft!|): R|kotlin/Unit| - public abstract operator fun testBoolean(b: R|ft!|): R|kotlin/Unit| + public abstract fun testBoolean(b: R|ft!|): R|kotlin/Unit| - public abstract operator fun testEnum(e: R|ft!|): R|kotlin/Unit| + public abstract fun testEnum(e: R|ft!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt index 3f2a0b61a96..7172f1d7804 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt @@ -1,5 +1,5 @@ public open class MethodTypePOneUpperBound : R|kotlin/Any| { - public open operator fun !|> bar(): R|kotlin/Unit| + public open fun !|> bar(): R|kotlin/Unit| public constructor(): R|test/MethodTypePOneUpperBound| diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt index 03b4674ba2c..bc1714d64ba 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt @@ -1,5 +1,5 @@ public open class MethodTypePTwoUpperBounds : R|kotlin/Any| { - public open operator fun !|, R|ft!|> foo(): R|kotlin/Unit| + public open fun !|, R|ft!|> foo(): R|kotlin/Unit| public constructor(): R|test/MethodTypePTwoUpperBounds| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt index 09fc15632dd..92da7df8d29 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt @@ -1,5 +1,5 @@ public final class MethodWithTypeP : R|kotlin/Any| { - public final operator fun

f(): R|kotlin/Unit| + public final fun

f(): R|kotlin/Unit| public constructor(): R|test/MethodWithTypeP| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt index 224a8b960c3..8f3262a2adf 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt @@ -1,5 +1,5 @@ public final class MethodWithTypePP : R|kotlin/Any| { - public final operator fun !|> f(): R|kotlin/Unit| + public final fun !|> f(): R|kotlin/Unit| public constructor(): R|test/MethodWithTypePP| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt index 8ace9ba6fe4..a8e64b40a8f 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithTypePRefClassP

: R|kotlin/Any| { - public final operator fun !|> f(): R|kotlin/Unit| + public final fun !|> f(): R|kotlin/Unit| public constructor

(): R|test/MethodWithTypePRefClassP

| diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt index 8a2be680ef3..e336c8b1e4b 100644 --- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt @@ -1,5 +1,5 @@ public final class MethosWithPRefTP : R|kotlin/Any| { - public final operator fun

f(p: R|ft!|): R|kotlin/Unit| + public final fun

f(p: R|ft!|): R|kotlin/Unit| public constructor(): R|test/MethosWithPRefTP| diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt index d13762cf15c..cdcdc1974bc 100644 --- a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt @@ -3,9 +3,9 @@ public open class PrivateMembers : R|kotlin/Any| { private open static field staticField: R|kotlin/Int| - private open operator fun method(): R|kotlin/Unit| + private open fun method(): R|kotlin/Unit| - private open static operator fun staticMethod(): R|kotlin/Unit| + private open static fun staticMethod(): R|kotlin/Unit| private constructor(): R|test/PrivateMembers| diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt index a4202ae9e70..286e71ec700 100644 --- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt @@ -1,6 +1,6 @@ public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| { - public abstract operator fun f(collection: R|ft!>, kotlin/collections/Collection!>?>!|): R|kotlin/Unit| + public abstract fun f(collection: R|ft!>, kotlin/collections/Collection!>?>!|): R|kotlin/Unit| - public abstract operator fun f(comparator: R|ft!>, kotlin/Comparable!>?>!|): R|kotlin/Unit| + public abstract fun f(comparator: R|ft!>, kotlin/Comparable!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt index 230ff6560ce..a0bbe00d88e 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt +++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt @@ -1,5 +1,5 @@ public open class TopLevel$Class : R|kotlin/Any| { - public open operator fun foo(other: R|ft!|): R|kotlin/Unit| + public open fun foo(other: R|ft!|): R|kotlin/Unit| public constructor(): R|test/TopLevel$Class| diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt index 454ccab223e..2007a47d6de 100644 --- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt +++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt @@ -1,7 +1,7 @@ public final class UnboundWildcard : R|kotlin/Any| { - public final operator fun foo(): R|ft, test/UnboundWildcard.MyClass<*>?>!| + public final fun foo(): R|ft, test/UnboundWildcard.MyClass<*>?>!| - public final operator fun collection(): R|ft, kotlin/collections/Collection<*>?>!| + public final fun collection(): R|ft, kotlin/collections/Collection<*>?>!| public constructor(): R|test/UnboundWildcard| diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt index 954eeb1d56a..2dd00af5101 100644 --- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt @@ -1,5 +1,5 @@ public open class WildcardBounds : R|kotlin/Any| { - public/*package*/ open operator fun foo(x: R|ft!>, test/WildcardBounds.A!>?>!|, y: R|ft!>, test/WildcardBounds.A!>?>!|): R|kotlin/Unit| + public/*package*/ open fun foo(x: R|ft!>, test/WildcardBounds.A!>?>!|, y: R|ft!>, test/WildcardBounds.A!>?>!|): R|kotlin/Unit| public constructor(): R|test/WildcardBounds| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt index 2ab69ded03f..2caa6b7218f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt @@ -1,5 +1,5 @@ public open class AnnotatedMethod : R|kotlin/Any| { - @R|test/AnnotatedMethod.Anno|(Int(42)) public open operator fun f(): R|kotlin/Unit| + @R|test/AnnotatedMethod.Anno|(Int(42)) public open fun f(): R|kotlin/Unit| public constructor(): R|test/AnnotatedMethod| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt index d4879490847..7302d1a8925 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt @@ -1,5 +1,5 @@ public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| { - public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft!|): R|kotlin/Unit| + public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft!|): R|kotlin/Unit| public/*package*/ constructor(): R|test/AnnotatedTypeInFun| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt index 53039c6221b..a5daeeac779 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt @@ -1,5 +1,5 @@ public open class AnnotatedValueParameter : R|kotlin/Any| { - public open operator fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| public constructor(): R|test/AnnotatedValueParameter| diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt index 6e096e827fd..54fc9a7c894 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt @@ -1,5 +1,5 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| { - @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|((R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit| + @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|((R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open fun annotated(): R|kotlin/Unit| public constructor(): R|test/EnumArgumentWithCustomToString| diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt index 3d8f9338a60..9d77acf371f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt @@ -1,5 +1,5 @@ public open class JavaDocDeprecated : R|kotlin/Any| { - public open operator fun getFoo(text: R|ft!|): R|ft!| + public open fun getFoo(text: R|ft!|): R|ft!| public constructor(): R|test/JavaDocDeprecated| diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt index dd893a798ec..7c6a3ab455a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt @@ -1,5 +1,5 @@ public open class NestedEnumArgument : R|kotlin/Any| { - @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator fun foo(): R|kotlin/Unit| + @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open fun foo(): R|kotlin/Unit| public constructor(): R|test/NestedEnumArgument| diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt index 8b8f5dbde8c..1d630211fca 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt @@ -5,7 +5,7 @@ public final enum class EnumMembers : R|kotlin/Enum!|): R|kotlin/Unit| + public open fun setSomething(color: R|ft!|): R|kotlin/Unit| - public open operator fun getSomething(): R|kotlin/Int| + public open fun getSomething(): R|kotlin/Int| public constructor(): R|test/DifferentGetterAndSetter| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt index ce13236ee1d..4e0efc2813a 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt @@ -1,6 +1,6 @@ public abstract interface JavaBeanAbstractGetter : R|kotlin/Any| { - public abstract operator fun getRed(): R|kotlin/Int| + public abstract fun getRed(): R|kotlin/Int| - public abstract operator fun getBlue(): R|kotlin/Int| + public abstract fun getBlue(): R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt index 6f21a769907..699f7f70a7e 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt @@ -1,5 +1,5 @@ public open class JavaBeanVal : R|kotlin/Any| { - public open operator fun getColor(): R|ft!| + public open fun getColor(): R|ft!| public constructor(): R|test/JavaBeanVal| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt index c1c99595c45..5ccda953b37 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt @@ -1,7 +1,7 @@ public open class JavaBeanVar : R|kotlin/Any| { - public open operator fun getColor(): R|ft!| + public open fun getColor(): R|ft!| - public open operator fun setColor(string: R|ft!|): R|kotlin/Unit| + public open fun setColor(string: R|ft!|): R|kotlin/Unit| public constructor(): R|test/JavaBeanVar| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt index bb17f973632..dbcd5cc485a 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt @@ -1,7 +1,7 @@ public open class JavaBeanVarOfGenericType

: R|kotlin/Any| { - public open operator fun getCharacters(): R|ft!>, java/util/ArrayList!>?>!| + public open fun getCharacters(): R|ft!>, java/util/ArrayList!>?>!| - public open operator fun setCharacters(characters: R|ft!>, java/util/ArrayList!>?>!|): R|kotlin/Unit| + public open fun setCharacters(characters: R|ft!>, java/util/ArrayList!>?>!|): R|kotlin/Unit| public constructor

(): R|test/JavaBeanVarOfGenericType

| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt index 3fa7758b76f..63b1f2b7d4d 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt @@ -1,7 +1,7 @@ public open class TwoSetters : R|kotlin/Any| { - public open operator fun setSize(size: R|ft!|): R|kotlin/Unit| + public open fun setSize(size: R|ft!|): R|kotlin/Unit| - public open operator fun setSize(size: R|kotlin/Int|): R|kotlin/Unit| + public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit| public constructor(): R|test/TwoSetters| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt index 522ea5f2817..631151624b6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt @@ -1,5 +1,5 @@ public open class AllBoundsInWhen : R|kotlin/Any| { - public open operator fun !|> foo(): R|kotlin/Unit| + public open fun !|> foo(): R|kotlin/Unit| public constructor(): R|test/AllBoundsInWhen| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt index f04c8dc30e5..11722833a1f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt @@ -1,5 +1,5 @@ public open class ArrayType : R|kotlin/Any| { - public open operator fun foo(): R|ft!>, kotlin/Array!>?>!| + public open fun foo(): R|ft!>, kotlin/Array!>?>!| public constructor(): R|test/ArrayType| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt index e529029229d..0111e55d7a1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt @@ -1,5 +1,5 @@ public open class CustomProjectionKind : R|kotlin/Any| { - public open operator fun foo(): R|ft!>, kotlin/collections/List!>?>!| + public open fun foo(): R|ft!>, kotlin/collections/List!>?>!| public constructor(): R|test/CustomProjectionKind| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt index f35ab9e3320..847b28570af 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithFunctionTypes : R|kotlin/Any| { - public open operator fun foo(f: R|ft!, ft!>, kotlin/Function1!, ft!>?>!|): R|ft!>, kotlin/Function0!>?>!| + public open fun foo(f: R|ft!, ft!>, kotlin/Function1!, ft!>?>!|): R|ft!>, kotlin/Function0!>?>!| public constructor(): R|test/MethodWithFunctionTypes| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt index 8731fbcd808..7aec26e74cd 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithGenerics : R|kotlin/Any| { - public open operator fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| public constructor(): R|test/MethodWithGenerics| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index f5c6f5224d8..20ae8fef5bc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt @@ -1,7 +1,7 @@ public open class MethodWithMappedClasses : R|kotlin/Any| { - public open operator fun copy(dest: R|ft!>, kotlin/collections/List!>?>!|, src: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun copy(dest: R|ft!>, kotlin/collections/List!>?>!|, src: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| - public open operator fun copyMap(dest: R|ft!, in ft!>, kotlin/collections/Map!, in ft!>?>!|, src: R|ft!, ft!>, kotlin/collections/Map!, ft!>?>!|): R|kotlin/Unit| + public open fun copyMap(dest: R|ft!, in ft!>, kotlin/collections/Map!, in ft!>?>!|, src: R|ft!, ft!>, kotlin/collections/Map!, ft!>?>!|): R|kotlin/Unit| public constructor(): R|test/MethodWithMappedClasses| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt index 0e1bf41bbe7..b438105e8af 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithTypeParameters : R|kotlin/Any| { - public open operator fun !|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|, list: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun !|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|, list: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| public constructor(): R|test/MethodWithTypeParameters| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt index 3cc0bf1e521..65663efc015 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithVararg : R|kotlin/Any| { - public open operator fun foo(vararg s: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public open fun foo(vararg s: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| public constructor(): R|test/MethodWithVararg| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt index 8e80131a7ce..efb97842d04 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt @@ -1,5 +1,5 @@ public final class StarProjection : R|kotlin/Any| { - public final operator fun foo(): R|ft, test/StarProjection.MyClass<*>?>!| + public final fun foo(): R|ft, test/StarProjection.MyClass<*>?>!| public constructor(): R|test/StarProjection| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt index 46dd0c4cc8d..66c8a8f42fc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt @@ -1,5 +1,5 @@ public open class WrongProjectionKind : R|kotlin/Any| { - public open operator fun copy(from: R|ft!>, kotlin/Array!>?>!|, to: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/collections/List!>?>!| + public open fun copy(from: R|ft!>, kotlin/Array!>?>!|, to: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/collections/List!>?>!| public constructor(): R|test/WrongProjectionKind| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt index 086cfbebdfa..f1ffdab8340 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt @@ -1,5 +1,5 @@ public open class WrongReturnTypeStructure : R|kotlin/Any| { - public open operator fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| public constructor(): R|test/WrongReturnTypeStructure| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt index b2ca818e7bb..f8522b8b57f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt @@ -1,5 +1,5 @@ public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| { - public open operator fun !|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun !|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| public constructor(): R|test/WrongTypeParameterBoundStructure1| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt index 09aa2535a1c..528219f1f73 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt @@ -1,5 +1,5 @@ public open class WrongValueParameterStructure1 : R|kotlin/Any| { - public open operator fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| public constructor(): R|test/WrongValueParameterStructure1| diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index e5ae89560bb..0f2374604a4 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterable : R|kotlin/Any| { - public abstract operator fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| + public abstract fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| - public abstract operator fun setIterable(Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun setIterable(Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt index e81fd294422..4043aa54e79 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterator : R|kotlin/Any| { - public abstract operator fun getIterator(): R|ft!>, kotlin/collections/Iterator!>?>!| + public abstract fun getIterator(): R|ft!>, kotlin/collections/Iterator!>?>!| - public abstract operator fun setIterator(iterator: R|ft!>, kotlin/collections/Iterator!>?>!|): R|kotlin/Unit| + public abstract fun setIterator(iterator: R|ft!>, kotlin/collections/Iterator!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt index ff87bb6a815..399c1d08a4f 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt @@ -1,5 +1,5 @@ public open class Max : R|kotlin/Any| { - public open operator fun !|, R|ft!>, kotlin/Comparable!>?>!|> max(coll: R|ft!>, kotlin/collections/Collection!>?>!|): R|ft!| + public open fun !|, R|ft!>, kotlin/Comparable!>?>!|> max(coll: R|ft!>, kotlin/collections/Collection!>?>!|): R|ft!| public constructor(): R|test/Max| diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt index 39a0fd869ca..109c4a8262b 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt @@ -1,7 +1,7 @@ public open class ModalityOfFakeOverrides : R|java/util/AbstractList!>| { @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|kotlin/String| - @R|java/lang/Override|() public open operator fun size(): R|kotlin/Int| + @R|java/lang/Override|() public open fun size(): R|kotlin/Int| public constructor(): R|test/ModalityOfFakeOverrides| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 36fe8d7d420..24f696b48a9 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterable : R|kotlin/Any| { - @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft!>, kotlin/collections/MutableIterable!>?>!| + @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft!>, kotlin/collections/MutableIterable!>?>!| - public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/MutableIterable!>?>!|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/MutableIterable!>?>!|): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| + @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| - public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt index 77f9b48ba42..fb4296785de 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterableWithConflict : R|kotlin/Any| { - @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| + @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| - public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt index 2226391c69d..0b7e0241930 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterableWithNullability : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|kotlin/collections/MutableIterable!>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|kotlin/collections/MutableIterable!>| - public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/MutableIterable!>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/MutableIterable!>|): R|kotlin/Unit| - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|kotlin/collections/Iterable!>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|kotlin/collections/Iterable!>| - public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable!>|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable!>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt index 34d2f3850e3..7832455a929 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt @@ -1,6 +1,6 @@ public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| { - public abstract operator fun bar(): R|kotlin/Unit| + public abstract fun bar(): R|kotlin/Unit| - public abstract operator fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft!>, kotlin/collections/List!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable!>|): R|kotlin/Unit| + public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft!>, kotlin/collections/List!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable!>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt index c2f8d6feb27..a9a0ce59f06 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt @@ -1,5 +1,5 @@ public open class NotNullIntArray : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/IntArray| + @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|kotlin/IntArray| public constructor(): R|test/NotNullIntArray| diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt index 48a860c7464..7bae887cea3 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt @@ -1,5 +1,5 @@ public open class NotNullMethod : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/String| + @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|kotlin/String| public constructor(): R|test/NotNullMethod| diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt index 505b6d0cc28..75ef24f2374 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt @@ -1,5 +1,5 @@ public open class NotNullObjectArray : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|ft!>, kotlin/Array!>>| + @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft!>, kotlin/Array!>>| public constructor(): R|test/NotNullObjectArray| diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt index 149bd7017d7..6e47f648cc7 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt @@ -1,5 +1,5 @@ public open class NotNullParameter : R|kotlin/Any| { - public open operator fun hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit| + public open fun hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit| public constructor(): R|test/NotNullParameter| diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt index e3a8d2dc7c3..08aa0b0e57a 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt @@ -1,5 +1,5 @@ public open class ProtectedPackageFun : R|kotlin/Any| { - protected/*protected and package*/ open operator fun foo(): R|kotlin/Unit| + protected/*protected and package*/ open fun foo(): R|kotlin/Unit| public constructor(): R|test/ProtectedPackageFun| diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt index a670f6713ec..ac9849146fa 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt @@ -1,5 +1,5 @@ public abstract interface Comparator : R|kotlin/Any| { - public abstract operator fun compare(o1: R|ft!|, o2: R|ft!|): R|kotlin/Int| + public abstract fun compare(o1: R|ft!|, o2: R|ft!|): R|kotlin/Int| public abstract operator fun equals(obj: R|kotlin/Any?|): R|kotlin/Boolean| diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt index 86c66f156c3..f5438fd128c 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt @@ -1,4 +1,4 @@ public abstract interface FilenameFilter : R|kotlin/Any| { - public abstract operator fun accept(dir: R|ft!|, name: R|ft!|): R|kotlin/Boolean| + public abstract fun accept(dir: R|ft!|, name: R|ft!|): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt index a648ded85e0..16cbfb10b49 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericInterfaceParameterWithSelfBound!>, test/GenericInterfaceParameterWithSelfBound!>?>!|> : R|kotlin/Any| { - public abstract operator fun method(t: R|ft!|): R|ft!| + public abstract fun method(t: R|ft!|): R|ft!| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt index 81b758a2322..4671d98a5e1 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericInterfaceParametersWithBounds!>, kotlin/Comparable!>?>!|, R|ft!|, B : R|ft!>, kotlin/collections/List!>?>!|> : R|kotlin/Any| { - public abstract operator fun method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| + public abstract fun method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt index 657edbfaf2d..118e9a19adb 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericMethodParameters : R|kotlin/Any| { - public abstract operator fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| + public abstract fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt index 599609185d2..dd20589d471 100644 --- a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt @@ -1,4 +1,4 @@ public abstract interface InterfaceWithObjectMethod : R|kotlin/Any| { - public abstract operator fun toString(): R|kotlin/String| + public abstract fun toString(): R|kotlin/String| } diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt index 153e97e33b7..3a20853b59e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt @@ -1,4 +1,4 @@ public abstract interface Runnable : R|kotlin/Any| { - public abstract operator fun run(): R|kotlin/Unit| + public abstract fun run(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt index ecfb0f810ef..9ba1078f0e8 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt @@ -1,4 +1,4 @@ public abstract interface SamSubinterfaceOverridding : R|java/lang/Runnable| { - public abstract operator fun run(): R|kotlin/Unit| + public abstract fun run(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt index 48e18ac79a1..798d49e7413 100644 --- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt @@ -1,4 +1,4 @@ public abstract interface VarargParameter : R|kotlin/Any| { - public abstract operator fun f(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public abstract fun f(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt index b5e374cd54d..4abcef59143 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt @@ -1,7 +1,7 @@ public open class AmbiguousAdapters : R|kotlin/Any| { - public open operator fun foo(r: R|ft!|): R|kotlin/Unit| + public open fun foo(r: R|ft!|): R|kotlin/Unit| - public open operator fun foo(c: R|ft!|): R|kotlin/Unit| + public open fun foo(c: R|ft!|): R|kotlin/Unit| public constructor(): R|test/AmbiguousAdapters| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt index 8c7cff1966e..853920ef860 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt @@ -1,7 +1,7 @@ public open class Basic : R|kotlin/Any| { - public open operator fun foo(r: R|ft!|): R|kotlin/Unit| + public open fun foo(r: R|ft!|): R|kotlin/Unit| - public open static operator fun bar(r: R|ft!|): R|kotlin/Unit| + public open static fun bar(r: R|ft!|): R|kotlin/Unit| public constructor(): R|test/Basic| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt index 7bfb33d66ed..7fc2e592f23 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt @@ -1,11 +1,11 @@ public open class NonTrivialFunctionType : R|kotlin/Any| { - public open operator fun foo(filenameFilter: R|ft!|): R|kotlin/Unit| + public open fun foo(filenameFilter: R|ft!|): R|kotlin/Unit| - public open operator fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| + public open fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| - public open operator fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>!|): R|kotlin/Unit| + public open fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>!|): R|kotlin/Unit| - public open operator fun wildcardBound(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| + public open fun wildcardBound(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| public constructor(): R|test/NonTrivialFunctionType| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt index 2e99102f70b..3cbb73d130e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt @@ -1,5 +1,5 @@ public open class PrivateSamAdapter : R|kotlin/Any| { - private open operator fun samAdapter(r: R|ft!|): R|kotlin/Unit| + private open fun samAdapter(r: R|ft!|): R|kotlin/Unit| public constructor(): R|test/PrivateSamAdapter| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt index ec3e03d4702..82a757164e4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt @@ -1,4 +1,4 @@ public abstract interface SelfAsParameter : R|kotlin/Any| { - public abstract operator fun foo(p: R|ft!|): R|kotlin/Unit| + public abstract fun foo(p: R|ft!|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt index 80534c787e3..23c87c839df 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt @@ -1,5 +1,5 @@ public open class SeveralSamParameters : R|kotlin/Any| { - public open static operator fun findMaxAndInvokeCallback(comparator: R|ft!>, java/util/Comparator!>?>!|, a: R|ft!|, b: R|ft!|, afterRunnable: R|ft!|): R|ft!| + public open static fun findMaxAndInvokeCallback(comparator: R|ft!>, java/util/Comparator!>?>!|, a: R|ft!|, b: R|ft!|, afterRunnable: R|ft!|): R|ft!| public constructor(): R|test/SeveralSamParameters| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt index fc8a44932fe..c4aab76e228 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt @@ -1,5 +1,5 @@ public open class TypeParameterOfClass : R|kotlin/Any| { - public open operator fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| + public open fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| public constructor(): R|test/TypeParameterOfClass| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt index ae77d4b9651..ed699daf0f6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt @@ -1,9 +1,9 @@ public open class TypeParameterOfMethod : R|kotlin/Any| { - public open static operator fun max(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| + public open static fun max(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| - public open static operator fun !|> max2(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| + public open static fun !|> max2(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| - public open static operator fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, java/util/Comparator!>?>!|, b: R|ft!|): R|kotlin/Unit| + public open static fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, java/util/Comparator!>?>!|, b: R|ft!|): R|kotlin/Unit| public constructor(): R|test/TypeParameterOfMethod| diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt index ccc15584cfc..eab3b224253 100644 --- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt @@ -1,5 +1,5 @@ public open class StableName : R|kotlin/Any| { - public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft!|): R|kotlin/Unit| + public open fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft!|): R|kotlin/Unit| public constructor(): R|test/StableName| diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt index 90a3811838a..e063f7e7921 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt @@ -1,6 +1,6 @@ public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| { - public abstract operator fun foo(): R|ft!>, kotlin/collections/List!>?>!| + public abstract fun foo(): R|ft!>, kotlin/collections/List!>?>!| - public abstract operator fun dummy(): R|kotlin/Unit| + public abstract fun dummy(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt index 169de0a6581..b114b003515 100644 --- a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt @@ -1,7 +1,7 @@ public open class Simple : R|kotlin/Any| { - public open static operator fun bar(): R|kotlin/Unit| + public open static fun bar(): R|kotlin/Unit| - public open operator fun foo(): R|kotlin/Unit| + public open fun foo(): R|kotlin/Unit| public constructor(): R|test/Simple| diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt index b29e5dacd99..d3a626aba55 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt @@ -5,14 +5,14 @@ public final enum class StaticMembersInEnum : R|kotlin/Enum!| - public open static operator fun foo(): R|kotlin/Unit| + public open static fun foo(): R|kotlin/Unit| - public open static operator fun values(x: R|kotlin/Int|): R|kotlin/Unit| + public open static fun values(x: R|kotlin/Int|): R|kotlin/Unit| public final static fun values(): R|kotlin/Array| { } - public open static operator fun valueOf(x: R|kotlin/Int|): R|kotlin/Unit| + public open static fun valueOf(x: R|kotlin/Int|): R|kotlin/Unit| public final static fun valueOf(value: R|kotlin/String|): R|test/StaticMembersInEnum| { } diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt index ee0a67e5ff8..22229732a63 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt @@ -1,5 +1,5 @@ public open class VarargInt : R|kotlin/Any| { - public open operator fun vararg(vararg p: R|ft!|): R|kotlin/Unit| + public open fun vararg(vararg p: R|ft!|): R|kotlin/Unit| public constructor(): R|test/VarargInt| diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt index 6d52cdf219f..02bd3f033d4 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt @@ -1,5 +1,5 @@ public open class VarargString : R|kotlin/Any| { - public open operator fun vararg(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public open fun vararg(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| public constructor(): R|test/VarargString| diff --git a/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt b/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt index e257951db31..0f83814eed7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt @@ -72,7 +72,7 @@ object OperatorNameConventions { val BINARY_OPERATION_NAMES = setOf(TIMES, PLUS, MINUS, DIV, MOD, REM, RANGE_TO) @JvmField - internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, REM_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN) + val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, REM_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN) @JvmField val DELEGATED_PROPERTY_OPERATORS = setOf(GET_VALUE, SET_VALUE, PROVIDE_DELEGATE) diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt index 15a697bebe9..e7ecc4843e5 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt @@ -1,5 +1,5 @@ public open class Annotated : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| + @R|org/jetbrains/annotations/NotNull|() public open fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| public constructor(): R|Annotated| diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt index 4ff3debebc5..edda149c574 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt @@ -1,11 +1,11 @@ public open class Annotated : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| + @R|org/jetbrains/annotations/NotNull|() public open fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| public constructor(): R|Annotated| } public open class AnnotatedDerived : R|Annotated| { - public open operator fun foo(param: R|kotlin/String?|): R|kotlin/String| + public open fun foo(param: R|kotlin/String?|): R|kotlin/String| public constructor(): R|AnnotatedDerived| diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt index 926f3c060be..a5910a4ed2d 100644 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt @@ -1,5 +1,5 @@ public open class A : R|kotlin/Any| { - public open operator fun foo(t: R|ft!|): R|ft!| + public open fun foo(t: R|ft!|): R|ft!| public constructor(): R|A| diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt index 12948ceb6ae..443691153d3 100644 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt @@ -1,7 +1,7 @@ public open class Some : R|kotlin/Any| { - public open operator fun foo(param: R|kotlin/Int|): R|kotlin/Boolean| + public open fun foo(param: R|kotlin/Int|): R|kotlin/Boolean| - public open operator fun bar(arr: R|ft!|): R|ft!>, kotlin/Array!>?>!| + public open fun bar(arr: R|ft!|): R|ft!>, kotlin/Array!>?>!| public constructor(): R|Some| diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt b/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt index b17033b49a4..253ba1510bf 100644 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt +++ b/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt @@ -1,12 +1,12 @@ public abstract interface Diagnostic : R|kotlin/Any| { } public abstract interface DiagnosticWithParameters1 : R|jvm/Diagnostic| { - public abstract operator fun getA(): R|ft!| + public abstract fun getA(): R|ft!| } public abstract interface DiagnosticWithParameters2 : R|jvm/Diagnostic| { - public abstract operator fun getA(): R|ft!| + public abstract fun getA(): R|ft!| - public abstract operator fun getB(): R|ft!| + public abstract fun getB(): R|ft!| } diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt index e4bce56b1bd..40b8e0740d8 100644 --- a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt @@ -1,7 +1,7 @@ public open class JavaClass : R|kotlin/Any| { - public open operator fun getText(): R|ft!| + public open fun getText(): R|ft!| - public open operator fun getText(param: R|ft!|): R|ft!| + public open fun getText(param: R|ft!|): R|ft!| public constructor(): R|JavaClass| diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt index 404646a3242..475f975d2fe 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt @@ -1,5 +1,5 @@ public open class Inheritor : R|Second| { - public open operator fun R|First|.foo(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit| + public open fun R|First|.foo(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit| public constructor(): R|Inheritor| diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt index a383c8091eb..e8952ebaed0 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt @@ -1,5 +1,5 @@ public open class Inheritor : R|kotlin/Any|, R|Base| { - public open operator fun getX(): R|kotlin/Int| + public open fun getX(): R|kotlin/Int| public constructor(): R|Inheritor| diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt index 18c9a072fa5..3390067b68b 100644 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt @@ -1,5 +1,5 @@ public open class Some : R|kotlin/Any|, R|Strange| { - public open operator fun foo(): R|kotlin/Any?| + public open fun foo(): R|kotlin/Any?| public constructor(): R|Some| diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt index 7f467703940..3a454e77ecc 100644 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt @@ -1,5 +1,5 @@ public/*package*/ open class JavaClass : R|kotlin/Any| { - public open operator fun getFoo(): R|ft!| + public open fun getFoo(): R|ft!| public/*package*/ constructor(): R|JavaClass| diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt index 153477f16ea..40301ec5d17 100644 --- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt @@ -1,7 +1,7 @@ public open class A : R|kotlin/Any| { - public open operator fun foo(): R|ft!| + public open fun foo(): R|ft!| - public open operator fun bar(): R|ft!| + public open fun bar(): R|ft!| public constructor(): R|A|