diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedEnumEntry.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedEnumEntry.txt index 0aa53ae8aeb..e82d6293441 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedEnumEntry.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedEnumEntry.txt @@ -2,7 +2,6 @@ public final class AnnotatedEnumEntryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class E { public final static @First field E1: E public final static @Second field E2: E diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/funExpression.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/funExpression.txt index 35be590e1a2..97dbdc8b0e3 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/funExpression.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/funExpression.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method x(): java.lang.String } - public final class FunExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo0(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Class diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/lambda.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/lambda.txt index cb155acbace..00d0405412f 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/lambda.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/lambda.txt @@ -6,7 +6,6 @@ public annotation class Ann { public abstract method x(): java.lang.String } - public final class LambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo0(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Class diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samFunExpression.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samFunExpression.txt index 834f9d99ebf..1949aa92de9 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samFunExpression.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samFunExpression.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method x(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method testClass(@org.jetbrains.annotations.NotNull p0: java.lang.Class, @org.jetbrains.annotations.NotNull p1: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samLambda.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samLambda.txt index 6207c9d1bdd..db8f3237563 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samLambda.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedLambda/samLambda.txt @@ -6,7 +6,6 @@ public annotation class Ann { public abstract method x(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method testClass(@org.jetbrains.annotations.NotNull p0: java.lang.Class, @org.jetbrains.annotations.NotNull p1: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/annotations/annotatedObjectLiteral.txt b/compiler/testData/codegen/light-analysis/annotations/annotatedObjectLiteral.txt index 62d7911e74a..1d66f0229a9 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotatedObjectLiteral.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotatedObjectLiteral.txt @@ -3,7 +3,6 @@ public annotation class Ann { public abstract method v(): java.lang.String } - public final class AnnotatedObjectLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinProperty.txt b/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinProperty.txt index c38a6fa324d..98eb25d4752 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinProperty.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinProperty.txt @@ -6,13 +6,11 @@ public final class KotlinClass { public method (): void } - public final static class KotlinClass/Companion { inner class KotlinClass/Companion private method (): void } - public final class KotlinClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.txt b/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.txt index e64e3d8e162..9258f03ece6 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.txt @@ -5,7 +5,6 @@ public interface KotlinInterface { inner class KotlinInterface/Companion } - public final static class KotlinInterface/Companion { public final static field FOO_INT: int public final static @org.jetbrains.annotations.NotNull field FOO_STRING: java.lang.String @@ -13,7 +12,6 @@ public final static class KotlinInterface/Companion { private method (): void } - public final class KotlinInterfaceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/annotationsOnDefault.txt b/compiler/testData/codegen/light-analysis/annotations/annotationsOnDefault.txt index d71e9cfc394..028c0795981 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotationsOnDefault.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotationsOnDefault.txt @@ -11,13 +11,11 @@ public annotation class Ann { public abstract method x(): int } - public final class AnnotationsOnDefaultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.annotation.Annotation[]): void } - public final class B { public @Ann method (p0: int, p1: int, p2: int): void public synthetic method (p0: int, p1: int, p2: int, p3: int, p4: kotlin.jvm.internal.DefaultConstructorMarker): void diff --git a/compiler/testData/codegen/light-analysis/annotations/annotationsOnTypeAliases.txt b/compiler/testData/codegen/light-analysis/annotations/annotationsOnTypeAliases.txt index ed91dcf210a..f4d08ee154d 100644 --- a/compiler/testData/codegen/light-analysis/annotations/annotationsOnTypeAliases.txt +++ b/compiler/testData/codegen/light-analysis/annotations/annotationsOnTypeAliases.txt @@ -6,7 +6,6 @@ public annotation class Ann { public abstract method x(): int } - public final class AnnotationsOnTypeAliasesKt { public final static method assertHasDeclaredMethodWithAnn(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/annotations/defaultParameterValues.txt b/compiler/testData/codegen/light-analysis/annotations/defaultParameterValues.txt index 5bde6ae9a3b..20897e31cbc 100644 --- a/compiler/testData/codegen/light-analysis/annotations/defaultParameterValues.txt +++ b/compiler/testData/codegen/light-analysis/annotations/defaultParameterValues.txt @@ -17,7 +17,6 @@ public annotation class Ann { @java.lang.annotation.Retention public annotation class Ann2 - public final class DefaultParameterValuesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } @@ -27,7 +26,6 @@ public final class MyClass { public method (): void } - public enum class MyEnum { public final static field A: MyEnum protected method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt b/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt index f1a25c4d86f..dcfe2d0d9ab 100644 --- a/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt @@ -4,7 +4,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String): void } - public final class DelegatedPropertySetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } @@ -13,7 +12,6 @@ public final class DelegatedPropertySetterKt { @java.lang.annotation.Retention public annotation class First - public final class MyClass { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt b/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt index 0d36533e575..c872dbb7228 100644 --- a/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt +++ b/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt @@ -12,13 +12,11 @@ public final class C { public final @kotlin.jvm.Synchronized method sync(): void } - public final class CustomDelegate { public method (): void public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String } - public final class JvmAnnotationFlagsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/kotlinPropertyFromClassObjectAsParameter.txt b/compiler/testData/codegen/light-analysis/annotations/kotlinPropertyFromClassObjectAsParameter.txt index 29d05623a14..7b8ba259213 100644 --- a/compiler/testData/codegen/light-analysis/annotations/kotlinPropertyFromClassObjectAsParameter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/kotlinPropertyFromClassObjectAsParameter.txt @@ -12,7 +12,6 @@ public annotation class Ann { public abstract method str(): java.lang.String } - public final class Foo { public final static field Companion: Foo.Companion public final static field b: byte @@ -28,13 +27,11 @@ public final class Foo { public method (): void } - public final static class Foo/Companion { inner class Foo/Companion private method (): void } - public final class KotlinPropertyFromClassObjectAsParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/kotlinTopLevelPropertyAsParameter.txt b/compiler/testData/codegen/light-analysis/annotations/kotlinTopLevelPropertyAsParameter.txt index c006fb4b431..ef7f3abd997 100644 --- a/compiler/testData/codegen/light-analysis/annotations/kotlinTopLevelPropertyAsParameter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/kotlinTopLevelPropertyAsParameter.txt @@ -12,7 +12,6 @@ public annotation class Ann { public abstract method str(): java.lang.String } - public final class KotlinTopLevelPropertyAsParameterKt { public final static field b: byte public final static field bool: boolean diff --git a/compiler/testData/codegen/light-analysis/annotations/kt10136.txt b/compiler/testData/codegen/light-analysis/annotations/kt10136.txt index bac7b209355..68843f2652c 100644 --- a/compiler/testData/codegen/light-analysis/annotations/kt10136.txt +++ b/compiler/testData/codegen/light-analysis/annotations/kt10136.txt @@ -14,7 +14,6 @@ public final class C { public method (): void } - public final class Kt10136Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/nestedClassPropertyAsParameter.txt b/compiler/testData/codegen/light-analysis/annotations/nestedClassPropertyAsParameter.txt index 662ae0ccb35..71fd660cd7c 100644 --- a/compiler/testData/codegen/light-analysis/annotations/nestedClassPropertyAsParameter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/nestedClassPropertyAsParameter.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final static class A/B { public final static field Companion: A.B.Companion public final static field i: int @@ -12,7 +11,6 @@ public final static class A/B { public method (): void } - public final static class A/B/Companion { inner class A/B inner class A/B/Companion @@ -30,7 +28,6 @@ public final class MyClass { public method (): void } - public final class NestedClassPropertyAsParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/parameterWithPrimitiveType.txt b/compiler/testData/codegen/light-analysis/annotations/parameterWithPrimitiveType.txt index e821a0a79ed..49f48aef28a 100644 --- a/compiler/testData/codegen/light-analysis/annotations/parameterWithPrimitiveType.txt +++ b/compiler/testData/codegen/light-analysis/annotations/parameterWithPrimitiveType.txt @@ -16,7 +16,6 @@ public final class MyClass { public method (): void } - public final class ParameterWithPrimitiveTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/annotations/propertyWithPropertyInInitializerAsParameter.txt b/compiler/testData/codegen/light-analysis/annotations/propertyWithPropertyInInitializerAsParameter.txt index 159e22fde8c..93248e2b9dd 100644 --- a/compiler/testData/codegen/light-analysis/annotations/propertyWithPropertyInInitializerAsParameter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/propertyWithPropertyInInitializerAsParameter.txt @@ -9,7 +9,6 @@ public final class MyClass { public method (): void } - public final class PropertyWithPropertyInInitializerAsParameterKt { public final static field i2: int public final static field i: int diff --git a/compiler/testData/codegen/light-analysis/annotations/varargInAnnotationParameter.txt b/compiler/testData/codegen/light-analysis/annotations/varargInAnnotationParameter.txt index edda88bdb5b..870ed4313c8 100644 --- a/compiler/testData/codegen/light-analysis/annotations/varargInAnnotationParameter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/varargInAnnotationParameter.txt @@ -54,7 +54,6 @@ public final class MyClass9 { public method (): void } - public final class VarargInAnnotationParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: java.lang.Class, @org.jetbrains.annotations.NotNull p1: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/argumentOrder/extensionInClass.txt b/compiler/testData/codegen/light-analysis/argumentOrder/extensionInClass.txt index b8f3dce7a4d..92987b14103 100644 --- a/compiler/testData/codegen/light-analysis/argumentOrder/extensionInClass.txt +++ b/compiler/testData/codegen/light-analysis/argumentOrder/extensionInClass.txt @@ -2,7 +2,6 @@ public final class ExtensionInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/argumentOrder/lambdaMigrationInClass.txt b/compiler/testData/codegen/light-analysis/argumentOrder/lambdaMigrationInClass.txt index 1740d533984..619833a7ef3 100644 --- a/compiler/testData/codegen/light-analysis/argumentOrder/lambdaMigrationInClass.txt +++ b/compiler/testData/codegen/light-analysis/argumentOrder/lambdaMigrationInClass.txt @@ -2,7 +2,6 @@ public final class LambdaMigrationInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field p: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/argumentOrder/simpleInClass.txt b/compiler/testData/codegen/light-analysis/argumentOrder/simpleInClass.txt index 4a3a97f7016..f6549713a8f 100644 --- a/compiler/testData/codegen/light-analysis/argumentOrder/simpleInClass.txt +++ b/compiler/testData/codegen/light-analysis/argumentOrder/simpleInClass.txt @@ -2,7 +2,6 @@ public final class SimpleInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field p: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/arrays/kt1291.txt b/compiler/testData/codegen/light-analysis/arrays/kt1291.txt index 2e648d54a7f..547fbb354d0 100644 --- a/compiler/testData/codegen/light-analysis/arrays/kt1291.txt +++ b/compiler/testData/codegen/light-analysis/arrays/kt1291.txt @@ -7,7 +7,6 @@ public final class Kt1291Kt { public final static method setResult(p0: int): void } - public final class Selector { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function1 private final @org.jetbrains.annotations.NotNull field source: java.util.Iterator diff --git a/compiler/testData/codegen/light-analysis/arrays/kt238.txt b/compiler/testData/codegen/light-analysis/arrays/kt238.txt index 8339cd3f4b4..219a44539e6 100644 --- a/compiler/testData/codegen/light-analysis/arrays/kt238.txt +++ b/compiler/testData/codegen/light-analysis/arrays/kt238.txt @@ -8,7 +8,6 @@ public final class Kt238Kt { public final static method t6(): void } - public final class StrangeArray { private field defaultValue: java.lang.Object public method (p0: int, p1: java.lang.Object): void @@ -16,7 +15,6 @@ public final class StrangeArray { public final method set(p0: int, p1: java.lang.Object): void } - public final class StrangeIntArray { private field defaultValue: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclFor.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclFor.txt index 8c314f25a58..9cbc1e844bc 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclFor.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclFor.txt @@ -6,7 +6,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: C[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentExtensions.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentExtensions.txt index 7241eb2ca7c..4f2cacbd86a 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentExtensions.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentExtensions.txt @@ -4,7 +4,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: C): int diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensions.txt index 0b40f0e5b4d..c5588445012 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensions.txt @@ -4,7 +4,6 @@ public final class C { public final method getI(): int } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -12,7 +11,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: C[]): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index a630271811f..e24b9444d3a 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,14 +4,12 @@ public final class C { public final method getI(): int } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int public final method component2(@org.jetbrains.annotations.NotNull p0: C): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M, @org.jetbrains.annotations.NotNull p1: C[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForValCaptured.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForValCaptured.txt index b2d79ece175..fa2c783d005 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForValCaptured.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/MultiDeclForValCaptured.txt @@ -6,7 +6,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForValCapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: C[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.txt index 39e35aed3cd..00ce5f14728 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.lang.Integer[]): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 8b700afbdb7..ce35d78344e 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: int): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M, @org.jetbrains.annotations.NotNull p1: java.lang.Integer[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.txt index 6496d66996b..c30698d4d42 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.lang.Long[]): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index ebce290ef3f..584f83a7aa6 100644 --- a/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/arrays/multiDecl/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: long): long } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M, @org.jetbrains.annotations.NotNull p1: java.lang.Long[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/arrays/nonNullArray.txt b/compiler/testData/codegen/light-analysis/arrays/nonNullArray.txt index a666f0400a3..73b3c0d98ed 100644 --- a/compiler/testData/codegen/light-analysis/arrays/nonNullArray.txt +++ b/compiler/testData/codegen/light-analysis/arrays/nonNullArray.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): A.B[] } - public final static class A/B { private final field i: int inner class A/B @@ -12,7 +11,6 @@ public final static class A/B { public final method getI(): int } - public final class NonNullArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/arrays/stdlib.txt b/compiler/testData/codegen/light-analysis/arrays/stdlib.txt index a26fc80103f..b5328808d4e 100644 --- a/compiler/testData/codegen/light-analysis/arrays/stdlib.txt +++ b/compiler/testData/codegen/light-analysis/arrays/stdlib.txt @@ -2,7 +2,6 @@ public interface ISized { public abstract method getSize(): int } - public final class MutableArray { private final field array: java.lang.Object[] public method (p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void @@ -13,7 +12,6 @@ public final class MutableArray { public method set(p0: int, p1: java.lang.Object): void } - public final class MyIterator { private final @org.jetbrains.annotations.NotNull field array: ReadOnlyArray private field index: int @@ -24,44 +22,37 @@ public final class MyIterator { public method remove(): void } - public interface ReadOnlyArray { inner class ReadOnlyArray/DefaultImpls public abstract method get(p0: int): java.lang.Object public abstract @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class ReadOnlyArray/DefaultImpls { inner class ReadOnlyArray/DefaultImpls public static @org.jetbrains.annotations.NotNull method iterator(p0: ReadOnlyArray): java.util.Iterator } - public final class StdlibKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface WriteOnlyArray { inner class WriteOnlyArray/DefaultImpls public abstract method set(p0: int, p1: int, p2: java.lang.Object): void public abstract method set(p0: int, p1: java.lang.Object): void } - public final class WriteOnlyArray/DefaultImpls { inner class WriteOnlyArray/DefaultImpls public static method set(p0: WriteOnlyArray, p1: int, p2: int, p3: java.lang.Object): void } - public interface javaUtilIterator { inner class javaUtilIterator/DefaultImpls public abstract method remove(): void } - public final class javaUtilIterator/DefaultImpls { inner class javaUtilIterator/DefaultImpls public static method remove(p0: javaUtilIterator): void diff --git a/compiler/testData/codegen/light-analysis/binaryOp/kt6747_identityEquals.txt b/compiler/testData/codegen/light-analysis/binaryOp/kt6747_identityEquals.txt index 2d2b5c737d0..e98fe87e3c2 100644 --- a/compiler/testData/codegen/light-analysis/binaryOp/kt6747_identityEquals.txt +++ b/compiler/testData/codegen/light-analysis/binaryOp/kt6747_identityEquals.txt @@ -2,7 +2,6 @@ public final class Kt6747_identityEqualsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final @org.jetbrains.annotations.NotNull method check(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/boxingOptimization/safeCallWithElvis.txt b/compiler/testData/codegen/light-analysis/boxingOptimization/safeCallWithElvis.txt index a91f4d8a50b..b28b2b2fbc9 100644 --- a/compiler/testData/codegen/light-analysis/boxingOptimization/safeCallWithElvis.txt +++ b/compiler/testData/codegen/light-analysis/boxingOptimization/safeCallWithElvis.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.Nullable method getY(): A } - public final class SafeCallWithElvisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.Nullable p0: A): int diff --git a/compiler/testData/codegen/light-analysis/boxingOptimization/unsafeRemoving.txt b/compiler/testData/codegen/light-analysis/boxingOptimization/unsafeRemoving.txt index 1f553cbdff5..33dbc800e10 100644 --- a/compiler/testData/codegen/light-analysis/boxingOptimization/unsafeRemoving.txt +++ b/compiler/testData/codegen/light-analysis/boxingOptimization/unsafeRemoving.txt @@ -7,7 +7,6 @@ public final class A { public final method setX(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): void } - public final class UnsafeRemovingKt { public final static @org.jetbrains.annotations.Nullable method acceptingBoxed(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): java.lang.Integer public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/complexMultiInheritance.txt b/compiler/testData/codegen/light-analysis/bridges/complexMultiInheritance.txt index e3e1bd8740a..a527f9c0a07 100644 --- a/compiler/testData/codegen/light-analysis/bridges/complexMultiInheritance.txt +++ b/compiler/testData/codegen/light-analysis/bridges/complexMultiInheritance.txt @@ -3,24 +3,20 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.Integer public synthetic method foo(): java.lang.Object } - public final class ComplexMultiInheritanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface D { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Number } - public final class E { public method (): void public synthetic method foo(): java.lang.Number diff --git a/compiler/testData/codegen/light-analysis/bridges/complexTraitImpl.txt b/compiler/testData/codegen/light-analysis/bridges/complexTraitImpl.txt index 795dd2968f7..24837c2d99f 100644 --- a/compiler/testData/codegen/light-analysis/bridges/complexTraitImpl.txt +++ b/compiler/testData/codegen/light-analysis/bridges/complexTraitImpl.txt @@ -3,36 +3,30 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.List } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.ArrayList } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.util.ArrayList } - public class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.util.ArrayList public synthetic method foo(): java.util.List } - public final class ComplexTraitImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface D { public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.Collection } - public final class E { public method (): void public synthetic method foo(): java.util.Collection diff --git a/compiler/testData/codegen/light-analysis/bridges/delegation.txt b/compiler/testData/codegen/light-analysis/bridges/delegation.txt index 48d6d409f8d..94944d60b51 100644 --- a/compiler/testData/codegen/light-analysis/bridges/delegation.txt +++ b/compiler/testData/codegen/light-analysis/bridges/delegation.txt @@ -2,14 +2,12 @@ public interface A { public abstract method foo(): java.lang.Object } - public final class B { public method (): void public synthetic method foo(): java.lang.Object public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class C { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void @@ -17,7 +15,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class DelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/delegationComplex.txt b/compiler/testData/codegen/light-analysis/bridges/delegationComplex.txt index d133dde49ee..3a61141cec6 100644 --- a/compiler/testData/codegen/light-analysis/bridges/delegationComplex.txt +++ b/compiler/testData/codegen/light-analysis/bridges/delegationComplex.txt @@ -2,16 +2,13 @@ public interface Box { public abstract method get(): java.lang.Object } - public class Content { public method (): void public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public interface ContentBox - public final class ContentBoxDelegate { private synthetic final field $$delegate_0: ContentBox public method (): void @@ -19,12 +16,10 @@ public final class ContentBoxDelegate { public synthetic method get(): java.lang.Object } - public final class DelegationComplexKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Impl { public final static field INSTANCE: Impl private method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/delegationComplexWithList.txt b/compiler/testData/codegen/light-analysis/bridges/delegationComplexWithList.txt index ca40e6ed849..f1cb2c73250 100644 --- a/compiler/testData/codegen/light-analysis/bridges/delegationComplexWithList.txt +++ b/compiler/testData/codegen/light-analysis/bridges/delegationComplexWithList.txt @@ -3,10 +3,8 @@ public class Content { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public interface ContentBox - public final class ContentBoxDelegate { private synthetic final field $$delegate_0: ContentBox public method (): void @@ -44,12 +42,10 @@ public final class ContentBoxDelegate { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class DelegationComplexWithListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Impl { public final static field INSTANCE: Impl private method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/delegationProperty.txt b/compiler/testData/codegen/light-analysis/bridges/delegationProperty.txt index 84f547134fa..623619cef86 100644 --- a/compiler/testData/codegen/light-analysis/bridges/delegationProperty.txt +++ b/compiler/testData/codegen/light-analysis/bridges/delegationProperty.txt @@ -3,7 +3,6 @@ public interface A { public abstract method setResult(p0: java.lang.Object): void } - public final class B { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void @@ -13,7 +12,6 @@ public final class B { public synthetic method setResult(p0: java.lang.Object): void } - public final class DelegationPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/diamond.txt b/compiler/testData/codegen/light-analysis/bridges/diamond.txt index 050f1663e0a..4ec3c95b274 100644 --- a/compiler/testData/codegen/light-analysis/bridges/diamond.txt +++ b/compiler/testData/codegen/light-analysis/bridges/diamond.txt @@ -3,40 +3,33 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: B, p1: java.lang.String, p2: java.lang.Object): java.lang.String } - public interface C { inner class C/DefaultImpls } - public final class C/DefaultImpls { inner class C/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: C, p1: java.lang.Object, p2: int): java.lang.String } - public final class DiamondKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeCovariantOverride.txt b/compiler/testData/codegen/light-analysis/bridges/fakeCovariantOverride.txt index 5f45c2a48c3..df792c0b540 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeCovariantOverride.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeCovariantOverride.txt @@ -2,19 +2,16 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public class B { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class C { public method (): void public synthetic method foo(): java.lang.Object } - public final class FakeCovariantOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverride.txt b/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverride.txt index d7a6040f2e2..256ed750e96 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverride.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverride.txt @@ -3,18 +3,15 @@ public class Class { public final @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class FakeGenericCovariantOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { public method (): void public synthetic method f(): java.lang.Object } - public interface Trait { public abstract method f(): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverrideWithDelegation.txt b/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverrideWithDelegation.txt index 68f58d9e65c..37c4c19532e 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverrideWithDelegation.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeGenericCovariantOverrideWithDelegation.txt @@ -2,30 +2,25 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(p0: int): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B, p1: int): java.lang.String } - public final class FakeGenericCovariantOverrideWithDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: int): java.lang.String } - public final class Z1 { private synthetic final field $$delegate_0: Z public method (): void @@ -33,7 +28,6 @@ public final class Z1 { public synthetic method foo(p0: java.lang.Object): java.lang.String } - public final class Z2 { private synthetic final field $$delegate_0: Z public method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideOfTraitImpl.txt b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideOfTraitImpl.txt index 18037793e43..212865c7083 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideOfTraitImpl.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideOfTraitImpl.txt @@ -3,43 +3,36 @@ public interface D1 { public abstract @org.jetbrains.annotations.NotNull method foo(): D1 } - public final class D1/DefaultImpls { inner class D1/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: D1): D1 } - public interface D3 { inner class D3/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): D3 } - public final class D3/DefaultImpls { inner class D3/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: D3): D3 } - public final class D4 { public method (): void public synthetic method foo(): D1 public @org.jetbrains.annotations.NotNull method foo(): D3 } - public interface F2 { inner class F2/DefaultImpls } - public final class F2/DefaultImpls { inner class F2/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: F2): D1 } - public final class FakeOverrideOfTraitImplKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSeveralSuperDeclarations.txt b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSeveralSuperDeclarations.txt index 45bef114e33..a4022ba092d 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSeveralSuperDeclarations.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSeveralSuperDeclarations.txt @@ -2,28 +2,23 @@ public interface D1 { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public interface D2 { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Number } - public class D4 { public method (): void public final method foo(): int } - public interface F3 - public final class F5 { public method (): void public synthetic method foo(): java.lang.Number public synthetic method foo(): java.lang.Object } - public final class FakeOverrideWithSeveralSuperDeclarationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSynthesizedImplementation.txt b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSynthesizedImplementation.txt index efc84506c54..5efda65a561 100644 --- a/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSynthesizedImplementation.txt +++ b/compiler/testData/codegen/light-analysis/bridges/fakeOverrideWithSynthesizedImplementation.txt @@ -5,18 +5,15 @@ public class A { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public interface B { public abstract @org.jetbrains.annotations.NotNull method component1(): java.lang.Object } - public final class C { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public synthetic method component1(): java.lang.Object } - public final class FakeOverrideWithSynthesizedImplementationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/genericProperty.txt b/compiler/testData/codegen/light-analysis/bridges/genericProperty.txt index 3ee01e2a66c..a9b456d8da6 100644 --- a/compiler/testData/codegen/light-analysis/bridges/genericProperty.txt +++ b/compiler/testData/codegen/light-analysis/bridges/genericProperty.txt @@ -5,20 +5,17 @@ public class A { public final method setSize(p0: java.lang.Object): void } - public final class B { public method (): void public synthetic method getSize(): int public synthetic method setSize(p0: int): void } - public interface C { public abstract method getSize(): int public abstract method setSize(p0: int): void } - public final class GenericPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/kt12416.txt b/compiler/testData/codegen/light-analysis/bridges/kt12416.txt index 21e7a0f43ec..1a76dc28841 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt12416.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt12416.txt @@ -3,42 +3,35 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: int): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: int): java.lang.String } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public final class Kt12416Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z1 { inner class Z1/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String } - public final class Z1/DefaultImpls { inner class Z1/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Z1, p1: java.lang.String, p2: int): java.lang.String } - public final class Z1C { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String @@ -46,19 +39,16 @@ public final class Z1C { public synthetic method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public interface Z2 { inner class Z2/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String } - public final class Z2/DefaultImpls { inner class Z2/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Z2, p1: java.lang.String, p2: int): java.lang.String } - public final class Z2C { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/kt1939.txt b/compiler/testData/codegen/light-analysis/bridges/kt1939.txt index 86999412188..41e8a82be3f 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt1939.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt1939.txt @@ -3,18 +3,15 @@ public final class Bar { public synthetic method hello(p0: java.lang.String): java.lang.String } - public abstract class Foo { public method (): void public final @org.jetbrains.annotations.NotNull method hello(p0: java.lang.Object): java.lang.String } - public final class Kt1939Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Tr { public abstract @org.jetbrains.annotations.NotNull method hello(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/kt1959.txt b/compiler/testData/codegen/light-analysis/bridges/kt1959.txt index 6ee00d1cebd..437e48d2b4d 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt1959.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt1959.txt @@ -3,14 +3,12 @@ public class A { public method f(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): void } - public final class B { public method (): void public method f(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void public synthetic method f(p0: java.lang.Object[]): void } - public final class Kt1959Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void diff --git a/compiler/testData/codegen/light-analysis/bridges/kt2498.txt b/compiler/testData/codegen/light-analysis/bridges/kt2498.txt index e5046922260..6255247139b 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt2498.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt2498.txt @@ -14,12 +14,10 @@ public class BaseStringList { public final method size(): int } - public final class Kt2498Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class StringList { public method (): void public synthetic method get(p0: int): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/bridges/kt2702.txt b/compiler/testData/codegen/light-analysis/bridges/kt2702.txt index 80b989d4daf..5a6c72ec93e 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt2702.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt2702.txt @@ -3,19 +3,16 @@ public class A { public method foo(p0: java.lang.Object): java.lang.Object } - public class B { public method (): void } - public class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method foo(p0: java.lang.Object): java.lang.Object } - public final class Kt2702Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/kt2833.txt b/compiler/testData/codegen/light-analysis/bridges/kt2833.txt index 578e9d8c31c..28fbe8495c5 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt2833.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt2833.txt @@ -2,7 +2,6 @@ public interface test/FunDependencyEdge { public abstract @org.jetbrains.annotations.NotNull method getFrom(): test.FunctionNode } - public final class test/FunDependencyEdgeImpl { private final @org.jetbrains.annotations.NotNull field from: test.FunctionNodeImpl public method (@org.jetbrains.annotations.NotNull p0: test.FunctionNodeImpl): void @@ -10,15 +9,12 @@ public final class test/FunDependencyEdgeImpl { public @org.jetbrains.annotations.NotNull method getFrom(): test.FunctionNodeImpl } - public interface test/FunctionNode - public final class test/FunctionNodeImpl { public method (): void } - public final class test/Kt2833Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/kt2920.txt b/compiler/testData/codegen/light-analysis/bridges/kt2920.txt index 4b93584be14..216857799e2 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt2920.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt2920.txt @@ -5,12 +5,10 @@ public final class C { public @org.jetbrains.annotations.NotNull method getV(): java.lang.String } - public final class Kt2920Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Tr { public abstract method getV(): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/bridges/kt318.txt b/compiler/testData/codegen/light-analysis/bridges/kt318.txt index ce6c4239f61..7cd78e48e85 100644 --- a/compiler/testData/codegen/light-analysis/bridges/kt318.txt +++ b/compiler/testData/codegen/light-analysis/bridges/kt318.txt @@ -3,28 +3,23 @@ public interface A { public abstract method foo(@org.jetbrains.annotations.NotNull p0: Base): void } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method foo(@org.jetbrains.annotations.NotNull p0: A, p1: Base): void } - public final class B { public method (): void public method foo(@org.jetbrains.annotations.NotNull p0: Child): void public synthetic method foo(p0: Base): void } - public interface Base - public class Child { public method (): void } - public final class Kt318Kt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/longChainOneBridge.txt b/compiler/testData/codegen/light-analysis/bridges/longChainOneBridge.txt index 3fd9e3c9c68..dac4417bed4 100644 --- a/compiler/testData/codegen/light-analysis/bridges/longChainOneBridge.txt +++ b/compiler/testData/codegen/light-analysis/bridges/longChainOneBridge.txt @@ -3,29 +3,24 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public class B { public method (): void } - public class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method foo(p0: java.lang.Object): java.lang.String } - public class D { public method (): void } - public final class LongChainOneBridgeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/manyTypeArgumentsSubstitutedSuccessively.txt b/compiler/testData/codegen/light-analysis/bridges/manyTypeArgumentsSubstitutedSuccessively.txt index bba161f2cd6..b29902e07d8 100644 --- a/compiler/testData/codegen/light-analysis/bridges/manyTypeArgumentsSubstitutedSuccessively.txt +++ b/compiler/testData/codegen/light-analysis/bridges/manyTypeArgumentsSubstitutedSuccessively.txt @@ -3,22 +3,18 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public class B { public method (): void } - public class C { public method (): void } - public final class ManyTypeArgumentsSubstitutedSuccessivelyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, p2: double): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/methodFromTrait.txt b/compiler/testData/codegen/light-analysis/bridges/methodFromTrait.txt index 06c142b5932..8f0c6dd8627 100644 --- a/compiler/testData/codegen/light-analysis/bridges/methodFromTrait.txt +++ b/compiler/testData/codegen/light-analysis/bridges/methodFromTrait.txt @@ -3,18 +3,15 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public final class MethodFromTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/noBridgeOnMutableCollectionInheritance.txt b/compiler/testData/codegen/light-analysis/bridges/noBridgeOnMutableCollectionInheritance.txt index 76a04b92d4d..eb78979afbe 100644 --- a/compiler/testData/codegen/light-analysis/bridges/noBridgeOnMutableCollectionInheritance.txt +++ b/compiler/testData/codegen/light-analysis/bridges/noBridgeOnMutableCollectionInheritance.txt @@ -2,19 +2,16 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.Collection } - public interface B { public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.Collection } - public final class C { public method (): void public synthetic method foo(): java.util.Collection public @org.jetbrains.annotations.NotNull method foo(): java.util.List } - public final class NoBridgeOnMutableCollectionInheritanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/objectClone.txt b/compiler/testData/codegen/light-analysis/bridges/objectClone.txt index 5f44441d65b..47af392148f 100644 --- a/compiler/testData/codegen/light-analysis/bridges/objectClone.txt +++ b/compiler/testData/codegen/light-analysis/bridges/objectClone.txt @@ -1,6 +1,5 @@ public interface A - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method clone(): B @@ -13,7 +12,6 @@ public final class B { public final method size(): int } - public final class ObjectCloneKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/overrideAbstractProperty.txt b/compiler/testData/codegen/light-analysis/bridges/overrideAbstractProperty.txt index 783202b97f5..a8b190d42d5 100644 --- a/compiler/testData/codegen/light-analysis/bridges/overrideAbstractProperty.txt +++ b/compiler/testData/codegen/light-analysis/bridges/overrideAbstractProperty.txt @@ -3,14 +3,12 @@ public abstract class AbstractClass { public abstract method getSome(): java.lang.Object } - public final class Class { public method (): void public synthetic method getSome(): java.lang.Object public @org.jetbrains.annotations.NotNull method getSome(): java.lang.String } - public final class OverrideAbstractPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/overrideReturnType.txt b/compiler/testData/codegen/light-analysis/bridges/overrideReturnType.txt index b041c4728ef..ef3466835de 100644 --- a/compiler/testData/codegen/light-analysis/bridges/overrideReturnType.txt +++ b/compiler/testData/codegen/light-analysis/bridges/overrideReturnType.txt @@ -3,14 +3,12 @@ public class C { public @org.jetbrains.annotations.NotNull method f(): java.lang.Object } - public final class D { public method (): void public synthetic method f(): java.lang.Object public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class OverrideReturnTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/propertyAccessorsWithoutBody.txt b/compiler/testData/codegen/light-analysis/bridges/propertyAccessorsWithoutBody.txt index ecf6edd9315..f684ed0ced1 100644 --- a/compiler/testData/codegen/light-analysis/bridges/propertyAccessorsWithoutBody.txt +++ b/compiler/testData/codegen/light-analysis/bridges/propertyAccessorsWithoutBody.txt @@ -5,7 +5,6 @@ public class A { public method setX(p0: java.lang.Object): void } - public final class B { private @org.jetbrains.annotations.NotNull field x: java.lang.String public method (): void @@ -15,7 +14,6 @@ public final class B { public synthetic method setX(p0: java.lang.Object): void } - public final class PropertyAccessorsWithoutBodyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/propertyDiamond.txt b/compiler/testData/codegen/light-analysis/bridges/propertyDiamond.txt index e185d42295c..d1d5f336206 100644 --- a/compiler/testData/codegen/light-analysis/bridges/propertyDiamond.txt +++ b/compiler/testData/codegen/light-analysis/bridges/propertyDiamond.txt @@ -3,13 +3,10 @@ public interface A { public abstract method getO(): java.lang.Object } - public interface B - public interface C - public final class D { private final @org.jetbrains.annotations.NotNull field k: java.lang.String private final @org.jetbrains.annotations.NotNull field o: java.lang.String @@ -20,7 +17,6 @@ public final class D { public @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - public final class PropertyDiamondKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/propertyInConstructor.txt b/compiler/testData/codegen/light-analysis/bridges/propertyInConstructor.txt index 747a04f155e..d12f7e4a228 100644 --- a/compiler/testData/codegen/light-analysis/bridges/propertyInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/bridges/propertyInConstructor.txt @@ -3,7 +3,6 @@ public interface A { public abstract method setX(p0: java.lang.Object): void } - public final class B { private @org.jetbrains.annotations.NotNull field x: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -13,7 +12,6 @@ public final class B { public synthetic method setX(p0: java.lang.Object): void } - public final class PropertyInConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/propertySetter.txt b/compiler/testData/codegen/light-analysis/bridges/propertySetter.txt index f734526a20a..97653762dcf 100644 --- a/compiler/testData/codegen/light-analysis/bridges/propertySetter.txt +++ b/compiler/testData/codegen/light-analysis/bridges/propertySetter.txt @@ -3,7 +3,6 @@ public interface A { public abstract method setV(p0: java.lang.Object): void } - public final class B { private @org.jetbrains.annotations.NotNull field v: java.lang.String public method (): void @@ -13,7 +12,6 @@ public final class B { public synthetic method setV(p0: java.lang.Object): void } - public final class PropertySetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/simple.txt b/compiler/testData/codegen/light-analysis/bridges/simple.txt index a8231084710..660bd9bd3ca 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simple.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simple.txt @@ -3,12 +3,10 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleEnum.txt b/compiler/testData/codegen/light-analysis/bridges/simpleEnum.txt index 4c613691abf..0bdbf0ace95 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleEnum.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleEnum.txt @@ -3,18 +3,15 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object): java.lang.String } - public final class SimpleEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Z { public final static field Z1: Z public final static field Z2: Z diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleGenericMethod.txt b/compiler/testData/codegen/light-analysis/bridges/simpleGenericMethod.txt index d3dbd018929..f8237872f7a 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleGenericMethod.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleGenericMethod.txt @@ -3,12 +3,10 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class SimpleGenericMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleObject.txt b/compiler/testData/codegen/light-analysis/bridges/simpleObject.txt index 12847fe695c..3f04233a36f 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleObject.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleObject.txt @@ -3,12 +3,10 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class SimpleObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public final static field INSTANCE: Z private method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleReturnType.txt b/compiler/testData/codegen/light-analysis/bridges/simpleReturnType.txt index 81ed1b84899..5bd0f9091dc 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleReturnType.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleReturnType.txt @@ -5,12 +5,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method getT(): java.lang.Number } - public final class SimpleReturnTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.Integer diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleTraitImpl.txt b/compiler/testData/codegen/light-analysis/bridges/simpleTraitImpl.txt index aa3ee0eb3e0..12fc72add18 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleTraitImpl.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleTraitImpl.txt @@ -3,18 +3,15 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object): java.lang.String } - public final class SimpleTraitImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/simpleUpperBound.txt b/compiler/testData/codegen/light-analysis/bridges/simpleUpperBound.txt index b4b09df3772..e5ad087fbae 100644 --- a/compiler/testData/codegen/light-analysis/bridges/simpleUpperBound.txt +++ b/compiler/testData/codegen/light-analysis/bridges/simpleUpperBound.txt @@ -3,12 +3,10 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Number): java.lang.String } - public final class SimpleUpperBoundKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/strListContains.txt b/compiler/testData/codegen/light-analysis/bridges/strListContains.txt index b3815e8f7af..a719fd1f667 100644 --- a/compiler/testData/codegen/light-analysis/bridges/strListContains.txt +++ b/compiler/testData/codegen/light-analysis/bridges/strListContains.txt @@ -34,7 +34,6 @@ public final class StrList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class StrListContainsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method forceContains(@org.jetbrains.annotations.NotNull p0: java.util.Collection, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/abstractFun.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/abstractFun.txt index 0974ad42f4f..f6abe915d0b 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/abstractFun.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/abstractFun.txt @@ -3,17 +3,14 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class AbstractFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class B { public method (): void } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/boundedTypeArguments.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/boundedTypeArguments.txt index f1314ac19ed..358d8b8f54d 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/boundedTypeArguments.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/boundedTypeArguments.txt @@ -3,17 +3,14 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public class B { public method (): void } - public final class BoundedTypeArgumentsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.Number): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/delegation.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/delegation.txt index 3af1163a493..f9618f0fb3c 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/delegation.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/delegation.txt @@ -2,19 +2,16 @@ public interface A { public abstract method id(p0: java.lang.Object): java.lang.Object } - public class B { public method (): void public @org.jetbrains.annotations.NotNull method id(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method id(p0: java.lang.Object): java.lang.Object } - public final class C { public method (): void } - public final class D { private synthetic final field $$delegate_0: C public method (): void @@ -22,7 +19,6 @@ public final class D { public synthetic method id(p0: java.lang.Object): java.lang.Object } - public final class DelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClass.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClass.txt index 9e7dc88d777..556fbbc6085 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClass.txt @@ -4,12 +4,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class B { public method (): void } - public final class DifferentErasureInSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.txt index f8d9c2c0544..baf982936db 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.txt @@ -4,23 +4,19 @@ public class A { public final @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class B { public method (): void } - public interface C { public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A): java.lang.String public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public interface D { public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A): java.lang.String } - public final class DifferentErasureInSuperClassComplexKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/enum.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/enum.txt index e81ca51b3d9..46962ca1635 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/enum.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/enum.txt @@ -3,29 +3,24 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: B, p1: java.lang.String): java.lang.String } - public final class EnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Z { public final static field Z1: Z public final static field Z2: Z diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/genericMethod.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/genericMethod.txt index 0b76a4ce152..a59569d112b 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/genericMethod.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/genericMethod.txt @@ -3,17 +3,14 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public class B { public method (): void } - public final class GenericMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/object.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/object.txt index 197eec468d5..7906f6d32b0 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/object.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/object.txt @@ -3,17 +3,14 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public class B { public method (): void } - public final class ObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public final static field INSTANCE: Z private method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/property.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/property.txt index 0546d949294..be62ed88865 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/property.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/property.txt @@ -6,17 +6,14 @@ public class A { public final method getT(): java.lang.Object } - public class B { public method (): void } - public final class PropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/simple.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/simple.txt index 7110727f6bc..a4f5c682a63 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/simple.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/simple.txt @@ -3,17 +3,14 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public class B { public method (): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/upperBound.txt b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/upperBound.txt index 7c740a7227b..5c2cb7a4abb 100644 --- a/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/upperBound.txt +++ b/compiler/testData/codegen/light-analysis/bridges/substitutionInSuperClass/upperBound.txt @@ -3,17 +3,14 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Number): java.lang.String } - public class B { public method (): void } - public final class UpperBoundKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/traitImplInheritsTraitImpl.txt b/compiler/testData/codegen/light-analysis/bridges/traitImplInheritsTraitImpl.txt index 2ff0d5f5ebe..7a015b2b3ab 100644 --- a/compiler/testData/codegen/light-analysis/bridges/traitImplInheritsTraitImpl.txt +++ b/compiler/testData/codegen/light-analysis/bridges/traitImplInheritsTraitImpl.txt @@ -3,32 +3,27 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A): java.lang.Object } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.lang.String } - public final class C { public method (): void public synthetic method foo(): java.lang.Object public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class TraitImplInheritsTraitImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges.txt b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges.txt index 206dc74cde1..874f2e86247 100644 --- a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges.txt +++ b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges.txt @@ -3,30 +3,25 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: int): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: int): java.lang.String } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public final class TwoParentsWithDifferentMethodsTwoBridgesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z1 { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String @@ -34,7 +29,6 @@ public final class Z1 { public synthetic method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class Z2 { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges2.txt b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges2.txt index 2134179161a..c3803df1a80 100644 --- a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges2.txt +++ b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithDifferentMethodsTwoBridges2.txt @@ -3,42 +3,35 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: int): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: int): java.lang.String } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public final class TwoParentsWithDifferentMethodsTwoBridges2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z1 { inner class Z1/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String } - public final class Z1/DefaultImpls { inner class Z1/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Z1, p1: java.lang.String, p2: int): java.lang.String } - public final class Z1Class { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String @@ -46,19 +39,16 @@ public final class Z1Class { public synthetic method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public interface Z2 { inner class Z2/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String } - public final class Z2/DefaultImpls { inner class Z2/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Z2, p1: java.lang.String, p2: int): java.lang.String } - public final class Z2Class { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithTheSameMethodOneBridge.txt b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithTheSameMethodOneBridge.txt index 14c5d6d6254..29bf6341a99 100644 --- a/compiler/testData/codegen/light-analysis/bridges/twoParentsWithTheSameMethodOneBridge.txt +++ b/compiler/testData/codegen/light-analysis/bridges/twoParentsWithTheSameMethodOneBridge.txt @@ -3,30 +3,25 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object): java.lang.String } - public interface B { inner class B/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B, p1: java.lang.Object): java.lang.String } - public final class TwoParentsWithTheSameMethodOneBridgeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/Collection.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/Collection.txt index 160d2bb7398..1ccb5ab7ccc 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/Collection.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/Collection.txt @@ -3,7 +3,6 @@ public final class CollectionKt { public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class MyCollection { public method (): void public method add(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/Iterator.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/Iterator.txt index 2d686da148e..23a6ce0af4b 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/Iterator.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/Iterator.txt @@ -2,7 +2,6 @@ public final class IteratorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyIterator { private final field v: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/IteratorWithRemove.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/IteratorWithRemove.txt index 0a714a7cc04..261f5c2afb1 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/IteratorWithRemove.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/IteratorWithRemove.txt @@ -2,7 +2,6 @@ public final class IteratorWithRemoveKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyIterator { private final field v: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/List.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/List.txt index f60e1479b77..ea71f7af1d6 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/List.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/List.txt @@ -3,7 +3,6 @@ public final class ListKt { public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class MyList { public method (): void public method add(p0: int, p1: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListIterator.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListIterator.txt index be057f05705..b1543203639 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListIterator.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListIterator.txt @@ -3,7 +3,6 @@ public final class ListIteratorKt { public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class MyListIterator { public method (): void public method add(p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllImplementations.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllImplementations.txt index 43d28d3246d..a8d6d7ffbd8 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllImplementations.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllImplementations.txt @@ -2,7 +2,6 @@ public final class ListWithAllImplementationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyList { private final field v: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllInheritedImplementations.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllInheritedImplementations.txt index 3a1ff46ee45..bb6911eca44 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllInheritedImplementations.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/ListWithAllInheritedImplementations.txt @@ -2,7 +2,6 @@ public final class ListWithAllInheritedImplementationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyList { public method (p0: java.lang.Object): void public method contains(p0: java.lang.Object): boolean @@ -24,7 +23,6 @@ public final class MyList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public class Super { private final field v: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/Map.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/Map.txt index 1d11d93a49f..5c14997974e 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/Map.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/Map.txt @@ -3,7 +3,6 @@ public final class MapKt { public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class MyMap { public method (): void public method clear(): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntry.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntry.txt index 888ecc48cdd..b7b5e841c43 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntry.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntry.txt @@ -2,7 +2,6 @@ public final class MapEntryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyMapEntry { public method (): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntryWithSetValue.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntryWithSetValue.txt index e3cccbf4f9b..3d5473f137f 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntryWithSetValue.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapEntryWithSetValue.txt @@ -2,7 +2,6 @@ public final class MapEntryWithSetValueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyMapEntry { public method (): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapWithAllImplementations.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapWithAllImplementations.txt index 2c221dba43b..ebb4beb6f29 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/MapWithAllImplementations.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/MapWithAllImplementations.txt @@ -2,7 +2,6 @@ public final class MapWithAllImplementationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyMap { public method (): void public final method clear(): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/SubstitutedList.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/SubstitutedList.txt index c3f575ad437..5a1ed4f4a51 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/SubstitutedList.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/SubstitutedList.txt @@ -36,7 +36,6 @@ public final class MyList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class SubstitutedListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/abstractMember.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/abstractMember.txt index d611599a1a9..499a3ddd87e 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/abstractMember.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/abstractMember.txt @@ -3,12 +3,10 @@ public abstract class A { public abstract method remove(): void } - public final class AbstractMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/customReadOnlyIterator.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/customReadOnlyIterator.txt index 27e23ae5b33..e8a6d9795b8 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/customReadOnlyIterator.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/customReadOnlyIterator.txt @@ -19,12 +19,10 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class CustomReadOnlyIteratorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyIterator { public final static field INSTANCE: MyIterator private method (): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/delegationToArrayList.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/delegationToArrayList.txt index 2067155eae8..c62c57418d3 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/delegationToArrayList.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/delegationToArrayList.txt @@ -27,7 +27,6 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class B { private synthetic final field $$delegate_0: A public method (): void @@ -65,7 +64,6 @@ public final class B { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class DelegationToArrayListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractList.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractList.txt index e81d97dbb2e..3a912918509 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractList.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractList.txt @@ -16,7 +16,6 @@ public final class A { public final method size(): int } - public final class AbstractListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractMap.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractMap.txt index 3be2b797c3e..c518c46e93e 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractMap.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractMap.txt @@ -18,7 +18,6 @@ public final class A { public final method values(): java.util.Collection } - public final class AbstractMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractSet.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractSet.txt index 608eaee917c..1af12300c12 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractSet.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/abstractSet.txt @@ -8,7 +8,6 @@ public final class A { public final method size(): int } - public final class AbstractSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/arrayList.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/arrayList.txt index ae47810d8cf..9efc16e7242 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/arrayList.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/arrayList.txt @@ -14,7 +14,6 @@ public final class A { public final method size(): int } - public final class ArrayListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashMap.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashMap.txt index 038897b6b18..ffd6d444dcf 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashMap.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashMap.txt @@ -18,7 +18,6 @@ public final class A { public final method values(): java.util.Collection } - public final class HashMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashSet.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashSet.txt index 50f0a9bfec5..fe0361325ad 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashSet.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/hashSet.txt @@ -8,7 +8,6 @@ public final class A { public final method size(): int } - public final class HashSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/mapEntry.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/mapEntry.txt index 8e23feb00a2..c12f408c60a 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/mapEntry.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/extendJavaCollections/mapEntry.txt @@ -2,7 +2,6 @@ public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyMapEntry { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/immutableRemove.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/immutableRemove.txt index abb0d180d65..c0ea82ba160 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/immutableRemove.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/immutableRemove.txt @@ -4,7 +4,6 @@ public interface ImmutableCollection { public abstract @org.jetbrains.annotations.NotNull method remove(p0: java.lang.Object): ImmutableCollection } - public final class ImmutableCollectionmpl { public method (): void public @org.jetbrains.annotations.NotNull method add(p0: java.lang.Object): ImmutableCollection @@ -26,7 +25,6 @@ public final class ImmutableCollectionmpl { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ImmutableRemoveKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/implementationInTrait.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/implementationInTrait.txt index f5231bd7213..cc1f7a0c082 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/implementationInTrait.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/implementationInTrait.txt @@ -3,13 +3,11 @@ public interface Addable { public abstract method add(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean } - public final class Addable/DefaultImpls { inner class Addable/DefaultImpls public static method add(@org.jetbrains.annotations.NotNull p0: Addable, p1: java.lang.String): boolean } - public final class C { public method (): void public method add(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean @@ -46,7 +44,6 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ImplementationInTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/inheritedImplementations.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/inheritedImplementations.txt index 3806eee7045..dfd105a613b 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/inheritedImplementations.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/inheritedImplementations.txt @@ -2,7 +2,6 @@ public final class InheritedImplementationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class S { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -21,7 +20,6 @@ public final class S { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public class SetStringImpl { public method (): void public final method add(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/manyTypeParametersWithUpperBounds.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/manyTypeParametersWithUpperBounds.txt index b9c5ecd8e64..41af8dafce0 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/manyTypeParametersWithUpperBounds.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/manyTypeParametersWithUpperBounds.txt @@ -18,7 +18,6 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ManyTypeParametersWithUpperBoundsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method expectUoe(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialSubstitution.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialSubstitution.txt index 56dd780849a..fe6032a1185 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialSubstitution.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialSubstitution.txt @@ -19,7 +19,6 @@ public final class MyCollection { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class NonTrivialSubstitutionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialUpperBound.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialUpperBound.txt index 882eae9f075..8d145e418d8 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialUpperBound.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/nonTrivialUpperBound.txt @@ -7,7 +7,6 @@ public final class MyIterator { public method remove(): void } - public final class NonTrivialUpperBoundKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedIterable.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedIterable.txt index da4a7fef724..f79b9fd9a6d 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedIterable.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedIterable.txt @@ -2,10 +2,8 @@ public final class E { public method (): void } - public interface MyIterable - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): MyIterable diff --git a/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedListWithExtraSuperInterface.txt b/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedListWithExtraSuperInterface.txt index 98dc1bf2dc7..ac67d577fc3 100644 --- a/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedListWithExtraSuperInterface.txt +++ b/compiler/testData/codegen/light-analysis/builtinStubMethods/substitutedListWithExtraSuperInterface.txt @@ -34,7 +34,6 @@ public abstract class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/companionObjectReceiver.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/companionObjectReceiver.txt index 91dc17738f5..97c0bc2883e 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/companionObjectReceiver.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/companionObjectReceiver.txt @@ -4,14 +4,12 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - public final class CompanionObjectReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/enumEntryMember.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/enumEntryMember.txt index fa5a187efd5..7e452fdf84a 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/enumEntryMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/enumEntryMember.txt @@ -7,7 +7,6 @@ public enum class E { public static method values(): E[] } - public final class EnumEntryMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/nullableReceiverInEquals.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/nullableReceiverInEquals.txt index a95e0319723..01107051e7c 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/nullableReceiverInEquals.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/nullableReceiverInEquals.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class NullableReceiverInEqualsKt { private final static @org.jetbrains.annotations.NotNull field A_bar: kotlin.reflect.KMutableProperty1 private final static @org.jetbrains.annotations.NotNull field A_foo: kotlin.reflect.KFunction diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/propertyAccessors.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/propertyAccessors.txt index b765d8f0a8a..0d0cc28c5a0 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/propertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/propertyAccessors.txt @@ -5,7 +5,6 @@ public final class C { public final method setProp(p0: int): void } - public final class PropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field C_prop: kotlin.reflect.KMutableProperty1 private final static @org.jetbrains.annotations.NotNull field C_propReflect: kotlin.reflect.KMutableProperty1 diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/receiverInEquals.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/receiverInEquals.txt index 55a139c578e..e6a69679ce3 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/receiverInEquals.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/receiverInEquals.txt @@ -4,7 +4,6 @@ public final class test/A { public final method foo(): void } - public final class test/ReceiverInEqualsKt { private final static @org.jetbrains.annotations.NotNull field A_foo: kotlin.reflect.KFunction private final static @org.jetbrains.annotations.NotNull field a: test.A diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/reflectionReference.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/reflectionReference.txt index 4ae33e06e95..48e9806867e 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/equals/reflectionReference.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/equals/reflectionReference.txt @@ -5,7 +5,6 @@ public final class C { public final method getBar(): int } - public final class ReflectionReferenceKt { private final static @org.jetbrains.annotations.NotNull field C_bar: kotlin.reflect.KProperty1 private final static @org.jetbrains.annotations.NotNull field C_barReflect: kotlin.reflect.KProperty1 diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/multiCase.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/multiCase.txt index 14cd2d495fb..85bafd3e4f8 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/multiCase.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/multiCase.txt @@ -6,7 +6,6 @@ public final class A { public final method setV(p0: int): void } - public final class F { public final static field INSTANCE: F private static field u: int @@ -15,7 +14,6 @@ public final class F { public final method setU(p0: int): void } - public final class MultiCaseKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method g(@org.jetbrains.annotations.NotNull p0: A, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/callableReference/bound/objectReceiver.txt b/compiler/testData/codegen/light-analysis/callableReference/bound/objectReceiver.txt index 1ef8163087e..89f0926e42c 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/bound/objectReceiver.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/bound/objectReceiver.txt @@ -2,7 +2,6 @@ public final class ObjectReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Singleton { public final static field INSTANCE: Singleton private method (): void diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/abstractClassMember.txt b/compiler/testData/codegen/light-analysis/callableReference/function/abstractClassMember.txt index aed6f2e7a25..027d0451adb 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/abstractClassMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/abstractClassMember.txt @@ -3,12 +3,10 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class AbstractClassMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromClass.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromClass.txt index dce169ae69d..593133f6593 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromClass.txt @@ -4,7 +4,6 @@ public final class A { public final method result(): int } - public final class ClassMemberFromClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromExtension.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromExtension.txt index 19b609e14ab..4bf1cc6fc52 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromExtension.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromExtension.txt @@ -4,7 +4,6 @@ public final class A { public final method o(): int } - public final class ClassMemberFromExtensionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringNoArgs.txt index cd176ecb044..edaa623f5e3 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringNoArgs.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class ClassMemberFromTopLevelStringNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringOneStringArg.txt index 682901cc451..6cd916a91b6 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelStringOneStringArg.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class ClassMemberFromTopLevelStringOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitNoArgs.txt index 584b7f07f52..1ea9529284d 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitNoArgs.txt @@ -6,7 +6,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ClassMemberFromTopLevelUnitNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitOneStringArg.txt index bbaa888e9f1..3eda7360ab7 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/classMemberFromTopLevelUnitOneStringArg.txt @@ -6,7 +6,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ClassMemberFromTopLevelUnitOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelNoArgs.txt index eafdd20c167..21485b1e7eb 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelNoArgs.txt @@ -5,7 +5,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ConstructorFromTopLevelNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelOneStringArg.txt index 6c396d9219e..03112dda691 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/constructorFromTopLevelOneStringArg.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class ConstructorFromTopLevelOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/enumValueOfMethod.txt b/compiler/testData/codegen/light-analysis/callableReference/function/enumValueOfMethod.txt index 572b22cd625..3c44f7ced98 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/enumValueOfMethod.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/enumValueOfMethod.txt @@ -5,7 +5,6 @@ public enum class E { public static method values(): E[] } - public final class EnumValueOfMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/equalsIntrinsic.txt b/compiler/testData/codegen/light-analysis/callableReference/function/equalsIntrinsic.txt index 3a0a8383f4c..9b14b2b4bcb 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/equalsIntrinsic.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/equalsIntrinsic.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class EqualsIntrinsicKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromClass.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromClass.txt index c120a7e2657..1e8254edd5b 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromClass.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method result(): java.lang.String } - public final class ExtensionFromClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromExtension.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromExtension.txt index 0b14d8b2ea7..91ea390bb53 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromExtension.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromExtension.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ExtensionFromExtensionKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringNoArgs.txt index 7f2cab1d124..ee38163ab36 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringNoArgs.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ExtensionFromTopLevelStringNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringOneStringArg.txt index c689ee62772..65c72ed8766 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelStringOneStringArg.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ExtensionFromTopLevelStringOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitNoArgs.txt index 4401c0d48f4..93c363426fd 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitNoArgs.txt @@ -5,7 +5,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ExtensionFromTopLevelUnitNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitOneStringArg.txt index 1edbc877327..c85e562f2f2 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/extensionFromTopLevelUnitOneStringArg.txt @@ -5,7 +5,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ExtensionFromTopLevelUnitOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/genericMember.txt b/compiler/testData/codegen/light-analysis/callableReference/function/genericMember.txt index 541dc5fd7be..594fcfb6e69 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/genericMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/genericMember.txt @@ -5,7 +5,6 @@ public final class A { public final method getT(): java.lang.Object } - public final class GenericMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/getArityViaFunctionImpl.txt b/compiler/testData/codegen/light-analysis/callableReference/function/getArityViaFunctionImpl.txt index 54f90aadbfa..262d38c76a8 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/getArityViaFunctionImpl.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/getArityViaFunctionImpl.txt @@ -3,7 +3,6 @@ public final class A { public final method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void } - public final class GetArityViaFunctionImplKt { public final static method baz(p0: double, @org.jetbrains.annotations.NotNull p1: java.lang.String, p2: int): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromClass.txt b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromClass.txt index 12e5ebb25d0..c01098d5a51 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromClass.txt @@ -4,7 +4,6 @@ public final class A { public final method result(): int } - public final class A/Inner { private final field k: int private final field o: int @@ -15,7 +14,6 @@ public final class A/Inner { public final method getO(): int } - public final class InnerConstructorFromClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromExtension.txt b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromExtension.txt index e6af6d5cbbd..8bd4f8059e2 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromExtension.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromExtension.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/Inner { private final field k: int private final field o: int @@ -14,7 +13,6 @@ public final class A/Inner { public final method getO(): int } - public final class InnerConstructorFromExtensionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelNoArgs.txt index 818d9695f1a..e24859649b1 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelNoArgs.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/Inner { private final field k: int private final field o: int @@ -14,7 +13,6 @@ public final class A/Inner { public final method getO(): int } - public final class InnerConstructorFromTopLevelNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelOneStringArg.txt index 9cae6af1954..7a29f93f534 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/innerConstructorFromTopLevelOneStringArg.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/Inner { private final field result: int synthetic final field this$0: A @@ -12,7 +11,6 @@ public final class A/Inner { public final method getResult(): int } - public final class InnerConstructorFromTopLevelOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/local/captureOuter.txt b/compiler/testData/codegen/light-analysis/callableReference/function/local/captureOuter.txt index 65cd2afc05a..1b7fb44780e 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/local/captureOuter.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/local/captureOuter.txt @@ -2,7 +2,6 @@ public final class CaptureOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field result: java.lang.String inner class Outer/Inner @@ -10,7 +9,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/local/enumExtendsTrait.txt b/compiler/testData/codegen/light-analysis/callableReference/function/local/enumExtendsTrait.txt index 70a3ffa6332..2ab4ce6eb19 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/local/enumExtendsTrait.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/local/enumExtendsTrait.txt @@ -6,12 +6,10 @@ public enum class E { public static method values(): E[] } - public final class EnumExtendsTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Named { public abstract @org.jetbrains.annotations.NotNull method getName(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/local/extension.txt b/compiler/testData/codegen/light-analysis/callableReference/function/local/extension.txt index e52359869b0..6c9f0cb2e52 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/local/extension.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/local/extension.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ExtensionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/local/extensionWithClosure.txt b/compiler/testData/codegen/light-analysis/callableReference/function/local/extensionWithClosure.txt index 4717e2af7af..9706acb3d09 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/local/extensionWithClosure.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/local/extensionWithClosure.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ExtensionWithClosureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromClass.txt b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromClass.txt index 99741c61d1e..3e05e01f35e 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromClass.txt @@ -4,7 +4,6 @@ public final class A { public final method result(): int } - public final static class A/Nested { private final field k: int private final field o: int @@ -14,7 +13,6 @@ public final static class A/Nested { public final method getO(): int } - public final class NestedConstructorFromClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelNoArgs.txt b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelNoArgs.txt index b54d3249a62..b50005d60ee 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelNoArgs.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelNoArgs.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final static class A/Nested { private final @org.jetbrains.annotations.NotNull field result: java.lang.String inner class A/Nested @@ -11,7 +10,6 @@ public final static class A/Nested { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class NestedConstructorFromTopLevelNoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelOneStringArg.txt b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelOneStringArg.txt index ce380160d7d..d6e39b42fd2 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelOneStringArg.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/nestedConstructorFromTopLevelOneStringArg.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final static class A/Nested { private final @org.jetbrains.annotations.NotNull field result: java.lang.String inner class A/Nested @@ -11,7 +10,6 @@ public final static class A/Nested { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class NestedConstructorFromTopLevelOneStringArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/overloadedFunVsVal.txt b/compiler/testData/codegen/light-analysis/callableReference/function/overloadedFunVsVal.txt index 9b1c2892f5f..2de4e5cf8ac 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/overloadedFunVsVal.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/overloadedFunVsVal.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method x(): java.lang.String } - public final class OverloadedFunVsValKt { private final static @org.jetbrains.annotations.NotNull field f1: kotlin.reflect.KProperty1 private final static @org.jetbrains.annotations.NotNull field f2: kotlin.jvm.functions.Function1 diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/privateClassMember.txt b/compiler/testData/codegen/light-analysis/callableReference/function/privateClassMember.txt index 383165ac7f3..5afaa09dafa 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/privateClassMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/privateClassMember.txt @@ -4,7 +4,6 @@ public final class A { private final method foo(): java.lang.String } - public final class PrivateClassMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromClass.txt b/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromClass.txt index ee7d1d35187..54fb6937199 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromClass.txt @@ -3,7 +3,6 @@ public final class A { public final method bar(): int } - public final class TopLevelFromClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(p0: int, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromExtension.txt b/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromExtension.txt index 154f124ff36..ed376543cdf 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromExtension.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/topLevelFromExtension.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class TopLevelFromExtensionKt { public final static method bar(@org.jetbrains.annotations.NotNull p0: A): int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/traitImplMethodWithClassReceiver.txt b/compiler/testData/codegen/light-analysis/callableReference/function/traitImplMethodWithClassReceiver.txt index d7b615349ca..e72ddb41d75 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/traitImplMethodWithClassReceiver.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/traitImplMethodWithClassReceiver.txt @@ -4,7 +4,6 @@ public final class B { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B/C { synthetic final field this$0: B inner class B/C @@ -12,19 +11,16 @@ public final class B/C { public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public interface T { inner class T/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class T/DefaultImpls { inner class T/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: T): java.lang.String } - public final class TraitImplMethodWithClassReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/function/traitMember.txt b/compiler/testData/codegen/light-analysis/callableReference/function/traitMember.txt index 4fe97fbaa9c..e5bb83a0358 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/function/traitMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/function/traitMember.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class TraitMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/accessViaSubclass.txt b/compiler/testData/codegen/light-analysis/callableReference/property/accessViaSubclass.txt index 9b086230632..6d91dea9aca 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/accessViaSubclass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/accessViaSubclass.txt @@ -2,14 +2,12 @@ public final class AccessViaSubclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class Base { private final @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class Derived { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt b/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt index 82b8741dece..58a3811731b 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt @@ -5,7 +5,6 @@ public final class A { public final method getTwo(): int } - public final class DelegatedKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field four$delegate: NumberDecrypter @@ -13,7 +12,6 @@ public final class DelegatedKt { public final static method getFour(): int } - public final class NumberDecrypter { public final static field INSTANCE: NumberDecrypter private method (): void diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt b/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt index 59b480641f6..dee35f82bfe 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt @@ -8,7 +8,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String): void } - public final class DelegatedMutableKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/enumNameOrdinal.txt b/compiler/testData/codegen/light-analysis/callableReference/property/enumNameOrdinal.txt index 2c65f40ef9d..5f8243b5781 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/enumNameOrdinal.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/enumNameOrdinal.txt @@ -5,7 +5,6 @@ public enum class E { public static method values(): E[] } - public final class EnumNameOrdinalKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt b/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt index 222da34bb3a..5862a32bf9a 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt @@ -5,7 +5,6 @@ public final class DVal { public final method getValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.Object } - public final class GenericPropertyKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.Nullable field additionalText$delegate: DVal @@ -15,7 +14,6 @@ public final class GenericPropertyKt { public final static method getAdditionalValue(@org.jetbrains.annotations.NotNull p0: Value): java.lang.Object } - public final class Value { private @org.jetbrains.annotations.Nullable field text: java.lang.String private field value: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/invokePropertyReference.txt b/compiler/testData/codegen/light-analysis/callableReference/property/invokePropertyReference.txt index 43128ab9a12..e4b4fe29bb9 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/invokePropertyReference.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/invokePropertyReference.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getMember(): java.lang.String } - public final class InvokePropertyReferenceKt { private static @org.jetbrains.annotations.NotNull field state: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/kClassInstanceIsInitializedFirst.txt b/compiler/testData/codegen/light-analysis/callableReference/property/kClassInstanceIsInitializedFirst.txt index 02b0a8fba28..36a876d9e1b 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/kClassInstanceIsInitializedFirst.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/kClassInstanceIsInitializedFirst.txt @@ -7,14 +7,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getRef(): kotlin.reflect.KProperty1 } - public final class KClassInstanceIsInitializedFirstKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/kt12982_protectedPropertyReference.txt b/compiler/testData/codegen/light-analysis/callableReference/property/kt12982_protectedPropertyReference.txt index b6ca510bfb7..741e388a86d 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/kt12982_protectedPropertyReference.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/kt12982_protectedPropertyReference.txt @@ -6,7 +6,6 @@ public final class Foo { protected final method setX(p0: int): void } - public final class Kt12982_protectedPropertyReferenceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/kt14330.txt b/compiler/testData/codegen/light-analysis/callableReference/property/kt14330.txt index 74cca7227a3..6fcebcb5519 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/kt14330.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/kt14330.txt @@ -11,7 +11,6 @@ public final class Foo { public method toString(): java.lang.String } - public final class Kt14330Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/kt6870_privatePropertyReference.txt b/compiler/testData/codegen/light-analysis/callableReference/property/kt6870_privatePropertyReference.txt index 3d389b5cfc6..0466a419996 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/kt6870_privatePropertyReference.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/kt6870_privatePropertyReference.txt @@ -2,7 +2,6 @@ public final class Kt6870_privatePropertyReferenceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private field iv: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/overriddenInSubclass.txt b/compiler/testData/codegen/light-analysis/callableReference/property/overriddenInSubclass.txt index b356778d98a..a2eef0f2d7b 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/overriddenInSubclass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/overriddenInSubclass.txt @@ -4,14 +4,12 @@ public class Base { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Derived { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class OverriddenInSubclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterInsideClass.txt b/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterInsideClass.txt index 228d3c9c67c..86d9e573084 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterInsideClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterInsideClass.txt @@ -6,7 +6,6 @@ public final class Bar { public final method test(): void } - public final class PrivateSetterInsideClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterOutsideClass.txt b/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterOutsideClass.txt index 6834c4c9eea..48d9a309a59 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterOutsideClass.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/privateSetterOutsideClass.txt @@ -5,13 +5,11 @@ public class Bar { private final method setFoo(p0: java.lang.String): void } - public final class Baz { public method (): void public final @org.jetbrains.annotations.NotNull method ref(): kotlin.reflect.KProperty1 } - public final class PrivateSetterOutsideClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMember.txt b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMember.txt index 291560b5c4a..34e3d88e776 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMember.txt @@ -4,7 +4,6 @@ public final class A { public final method getX(): int } - public final class SimpleMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableMember.txt b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableMember.txt index f01e1d9fd3c..3ae26ed35a1 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableMember.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableMember.txt @@ -11,7 +11,6 @@ public final class Box { public method toString(): java.lang.String } - public final class SimpleMutableMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableTopLevel.txt b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableTopLevel.txt index 1eeb1710e2c..f3e35b3a33c 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableTopLevel.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/simpleMutableTopLevel.txt @@ -10,7 +10,6 @@ public final class Box { public method toString(): java.lang.String } - public final class SimpleMutableTopLevelKt { private static @org.jetbrains.annotations.NotNull field pr: Box public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/simpleTopLevel.txt b/compiler/testData/codegen/light-analysis/callableReference/property/simpleTopLevel.txt index ca11411bcda..d041d346eb5 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/simpleTopLevel.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/simpleTopLevel.txt @@ -10,7 +10,6 @@ public final class Box { public method toString(): java.lang.String } - public final class SimpleTopLevelKt { private final static @org.jetbrains.annotations.NotNull field foo: Box public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/casts/asSafeFail.txt b/compiler/testData/codegen/light-analysis/casts/asSafeFail.txt index 4a15d67adc8..1d315cf4270 100644 --- a/compiler/testData/codegen/light-analysis/casts/asSafeFail.txt +++ b/compiler/testData/codegen/light-analysis/casts/asSafeFail.txt @@ -2,12 +2,10 @@ public final class A { public method (): void } - public final class AsSafeFailKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/casts/functions/asFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/asFunKBig.txt index 7b1f517c8de..97f8ae330ba 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/asFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/asFunKBig.txt @@ -31,7 +31,6 @@ public final class AsFunKBigKt { public final static @org.jetbrains.annotations.NotNull method getTests(): TestFnBase[] } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -39,7 +38,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -47,7 +45,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -55,7 +52,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -63,7 +59,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -71,7 +66,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -79,7 +73,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -87,7 +80,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -95,7 +87,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -103,7 +94,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -111,7 +101,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -119,7 +108,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -127,7 +115,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -135,7 +122,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -143,7 +129,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -151,7 +136,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -159,7 +143,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -167,7 +150,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -175,7 +157,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -183,7 +164,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -191,7 +171,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -199,7 +178,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -207,7 +185,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -215,7 +192,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public interface TestFnBase { public abstract method testBad(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public abstract method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/casts/functions/asFunKSmall.txt b/compiler/testData/codegen/light-analysis/casts/functions/asFunKSmall.txt index 73893b828ca..ec7944e254c 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/asFunKSmall.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/asFunKSmall.txt @@ -6,7 +6,6 @@ public final class AsFunKSmallKt { public final static method fn1(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class MyFun { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/casts/functions/isFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/isFunKBig.txt index f6e2154c4c1..72688826b64 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/isFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/isFunKBig.txt @@ -29,7 +29,6 @@ public final class IsFunKBigKt { public final static @org.jetbrains.annotations.NotNull method getTests(): TestFnBase[] } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -37,7 +36,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -45,7 +43,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -53,7 +50,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -61,7 +57,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -69,7 +64,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -77,7 +71,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -85,7 +78,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -93,7 +85,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -101,7 +92,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -109,7 +99,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -117,7 +106,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -125,7 +113,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -133,7 +120,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -141,7 +127,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -149,7 +134,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -157,7 +141,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -165,7 +148,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -173,7 +155,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -181,7 +162,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -189,7 +169,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -197,7 +176,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -205,7 +183,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -213,7 +190,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public abstract class TestFnBase { private final @org.jetbrains.annotations.NotNull field type: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/casts/functions/isFunKSmall.txt b/compiler/testData/codegen/light-analysis/casts/functions/isFunKSmall.txt index 2539c5f799d..fbb3a1e6433 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/isFunKSmall.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/isFunKSmall.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(): void } - public final class IsFunKSmallKt { private final static @org.jetbrains.annotations.NotNull field lambda0: kotlin.jvm.functions.Function0 private final static @org.jetbrains.annotations.NotNull field lambda1: kotlin.jvm.functions.Function1 diff --git a/compiler/testData/codegen/light-analysis/casts/functions/reifiedAsFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/reifiedAsFunKBig.txt index 4309870362b..556dfc1c2c3 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/reifiedAsFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/reifiedAsFunKBig.txt @@ -31,7 +31,6 @@ public final class ReifiedAsFunKBigKt { private final static method reifiedAsSucceeds(p0: java.lang.Object, p1: java.lang.String): void } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -39,7 +38,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -47,7 +45,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -55,7 +52,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -63,7 +59,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -71,7 +66,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -79,7 +73,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -87,7 +80,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -95,7 +87,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -103,7 +94,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -111,7 +101,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -119,7 +108,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -127,7 +115,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -135,7 +122,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -143,7 +129,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -151,7 +136,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -159,7 +143,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -167,7 +150,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -175,7 +157,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -183,7 +164,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -191,7 +171,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -199,7 +178,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -207,7 +185,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -215,7 +192,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public interface TestFnBase { public abstract method testBad(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public abstract method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/casts/functions/reifiedIsFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/reifiedIsFunKBig.txt index 0069e781daf..7bec9e6eb50 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/reifiedIsFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/reifiedIsFunKBig.txt @@ -31,7 +31,6 @@ public final class ReifiedIsFunKBigKt { public final static @org.jetbrains.annotations.NotNull method getTests(): TestFnBase[] } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -39,7 +38,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -47,7 +45,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -55,7 +52,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -63,7 +59,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -71,7 +66,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -79,7 +73,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -87,7 +80,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -95,7 +87,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -103,7 +94,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -111,7 +101,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -119,7 +108,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -127,7 +115,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -135,7 +122,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -143,7 +129,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -151,7 +136,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -159,7 +143,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -167,7 +150,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -175,7 +157,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -183,7 +164,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -191,7 +171,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -199,7 +178,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -207,7 +185,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -215,7 +192,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public abstract class TestFnBase { private final @org.jetbrains.annotations.NotNull field type: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/casts/functions/reifiedSafeAsFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/reifiedSafeAsFunKBig.txt index 37d165fd536..87cc126d025 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/reifiedSafeAsFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/reifiedSafeAsFunKBig.txt @@ -31,7 +31,6 @@ public final class ReifiedSafeAsFunKBigKt { private final static method reifiedSafeAsReturnsNull(p0: java.lang.Object, p1: java.lang.String): void } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -39,7 +38,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -47,7 +45,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -55,7 +52,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -63,7 +59,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -71,7 +66,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -79,7 +73,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -87,7 +80,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -95,7 +87,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -103,7 +94,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -111,7 +101,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -119,7 +108,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -127,7 +115,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -135,7 +122,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -143,7 +129,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -151,7 +136,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -159,7 +143,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -167,7 +150,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -175,7 +157,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -183,7 +164,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -191,7 +171,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -199,7 +178,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -207,7 +185,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -215,7 +192,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public interface TestFnBase { public abstract method testBad(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public abstract method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/casts/functions/safeAsFunKBig.txt b/compiler/testData/codegen/light-analysis/casts/functions/safeAsFunKBig.txt index 7c67f447017..36a44fcc14f 100644 --- a/compiler/testData/codegen/light-analysis/casts/functions/safeAsFunKBig.txt +++ b/compiler/testData/codegen/light-analysis/casts/functions/safeAsFunKBig.txt @@ -31,7 +31,6 @@ public final class SafeAsFunKBigKt { public final static method safeAsReturnsNull(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void } - public final class TestFn0 { public final static field INSTANCE: TestFn0 private method (): void @@ -39,7 +38,6 @@ public final class TestFn0 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn1 { public final static field INSTANCE: TestFn1 private method (): void @@ -47,7 +45,6 @@ public final class TestFn1 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn10 { public final static field INSTANCE: TestFn10 private method (): void @@ -55,7 +52,6 @@ public final class TestFn10 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn11 { public final static field INSTANCE: TestFn11 private method (): void @@ -63,7 +59,6 @@ public final class TestFn11 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn12 { public final static field INSTANCE: TestFn12 private method (): void @@ -71,7 +66,6 @@ public final class TestFn12 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn13 { public final static field INSTANCE: TestFn13 private method (): void @@ -79,7 +73,6 @@ public final class TestFn13 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn14 { public final static field INSTANCE: TestFn14 private method (): void @@ -87,7 +80,6 @@ public final class TestFn14 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn15 { public final static field INSTANCE: TestFn15 private method (): void @@ -95,7 +87,6 @@ public final class TestFn15 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn16 { public final static field INSTANCE: TestFn16 private method (): void @@ -103,7 +94,6 @@ public final class TestFn16 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn17 { public final static field INSTANCE: TestFn17 private method (): void @@ -111,7 +101,6 @@ public final class TestFn17 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn18 { public final static field INSTANCE: TestFn18 private method (): void @@ -119,7 +108,6 @@ public final class TestFn18 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn19 { public final static field INSTANCE: TestFn19 private method (): void @@ -127,7 +115,6 @@ public final class TestFn19 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn2 { public final static field INSTANCE: TestFn2 private method (): void @@ -135,7 +122,6 @@ public final class TestFn2 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn20 { public final static field INSTANCE: TestFn20 private method (): void @@ -143,7 +129,6 @@ public final class TestFn20 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn21 { public final static field INSTANCE: TestFn21 private method (): void @@ -151,7 +136,6 @@ public final class TestFn21 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn22 { public final static field INSTANCE: TestFn22 private method (): void @@ -159,7 +143,6 @@ public final class TestFn22 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn3 { public final static field INSTANCE: TestFn3 private method (): void @@ -167,7 +150,6 @@ public final class TestFn3 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn4 { public final static field INSTANCE: TestFn4 private method (): void @@ -175,7 +157,6 @@ public final class TestFn4 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn5 { public final static field INSTANCE: TestFn5 private method (): void @@ -183,7 +164,6 @@ public final class TestFn5 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn6 { public final static field INSTANCE: TestFn6 private method (): void @@ -191,7 +171,6 @@ public final class TestFn6 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn7 { public final static field INSTANCE: TestFn7 private method (): void @@ -199,7 +178,6 @@ public final class TestFn7 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn8 { public final static field INSTANCE: TestFn8 private method (): void @@ -207,7 +185,6 @@ public final class TestFn8 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class TestFn9 { public final static field INSTANCE: TestFn9 private method (): void @@ -215,7 +192,6 @@ public final class TestFn9 { public method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public interface TestFnBase { public abstract method testBad(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public abstract method testGood(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/casts/intersectionTypeMultipleBounds.txt b/compiler/testData/codegen/light-analysis/casts/intersectionTypeMultipleBounds.txt index 43e34c4c5c8..871dc21cf43 100644 --- a/compiler/testData/codegen/light-analysis/casts/intersectionTypeMultipleBounds.txt +++ b/compiler/testData/codegen/light-analysis/casts/intersectionTypeMultipleBounds.txt @@ -3,12 +3,10 @@ public interface A { public abstract @org.jetbrains.annotations.Nullable method foo(): java.lang.Object } - public interface B { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method bar(): java.lang.String @@ -16,7 +14,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class IntersectionTypeMultipleBoundsKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: A): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/casts/intersectionTypeSmartcast.txt b/compiler/testData/codegen/light-analysis/casts/intersectionTypeSmartcast.txt index 387163aa1a4..f26e37bf703 100644 --- a/compiler/testData/codegen/light-analysis/casts/intersectionTypeSmartcast.txt +++ b/compiler/testData/codegen/light-analysis/casts/intersectionTypeSmartcast.txt @@ -2,12 +2,10 @@ public interface A { public abstract @org.jetbrains.annotations.Nullable method foo(): java.lang.Object } - public interface B { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class IntersectionTypeSmartcastKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/binaryExpressionCast.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/binaryExpressionCast.txt index 87c1a8d9b26..03ac5a8fed0 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/binaryExpressionCast.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/binaryExpressionCast.txt @@ -2,7 +2,6 @@ public final class BinaryExpressionCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Box { private final field value: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/labeledExpressionCast.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/labeledExpressionCast.txt index 7844e16a531..92e1facf805 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/labeledExpressionCast.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/labeledExpressionCast.txt @@ -4,7 +4,6 @@ public final class Box { public final method getValue(): java.lang.Object } - public final class LabeledExpressionCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.txt index e40881ceb9a..6ddf993197c 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.txt @@ -4,7 +4,6 @@ public final class Box { public final method getValue(): java.lang.Object } - public final class ParenthesizedExpressionCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/superConstructor.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/superConstructor.txt index 76eacb97cec..4f298425f06 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/superConstructor.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/superConstructor.txt @@ -4,12 +4,10 @@ public class Base { public final method getValue(): java.lang.Object } - public final class Box { public method (): void } - public final class SuperConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/unaryExpressionCast.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/unaryExpressionCast.txt index a2688893220..696fae56011 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/unaryExpressionCast.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/unaryExpressionCast.txt @@ -4,7 +4,6 @@ public final class Box { public final method getValue(): java.lang.Object } - public final class UnaryExpressionCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/vararg.txt b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/vararg.txt index cc54dbd3d57..49e55c6b6f4 100644 --- a/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/vararg.txt +++ b/compiler/testData/codegen/light-analysis/casts/literalExpressionAsGenericArgument/vararg.txt @@ -4,7 +4,6 @@ public final class Box { public final method getValue(): java.lang.Object } - public final class VarargKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method run(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): Box diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/asWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/asWithMutable.txt index 11d514250c6..63bff455dfc 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/asWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/asWithMutable.txt @@ -4,7 +4,6 @@ public final class AsWithMutableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class C { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -26,14 +25,12 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -43,7 +40,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -81,7 +77,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -100,7 +95,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -126,7 +120,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -149,7 +142,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -160,14 +152,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -177,7 +167,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -217,7 +206,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -236,7 +224,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -263,7 +250,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -274,7 +260,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -297,7 +282,6 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/isWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/isWithMutable.txt index f58011faa7e..c007027a620 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/isWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/isWithMutable.txt @@ -19,20 +19,17 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class IsWithMutableKt { public final static method assert(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -42,7 +39,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -80,7 +76,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -99,7 +94,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -125,7 +119,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -148,7 +141,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -159,14 +151,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -176,7 +166,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -216,7 +205,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -235,7 +223,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -262,7 +249,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -273,7 +259,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -296,7 +281,6 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/mutabilityMarkerInterfaces.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/mutabilityMarkerInterfaces.txt index d96f2bf3017..9540ae3a1fd 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/mutabilityMarkerInterfaces.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/mutabilityMarkerInterfaces.txt @@ -16,19 +16,16 @@ public abstract class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public abstract class It { public method (): void public method iterator(): java.util.Iterator } - public abstract class Itr { public method (): void public method remove(): void } - public abstract class L { public method (): void public synthetic method add(p0: int, p1: java.lang.Object): void @@ -60,12 +57,10 @@ public abstract class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public abstract class L2 { public method (): void } - public abstract class LItr { public method (): void public synthetic method add(p0: java.lang.Object): void @@ -78,7 +73,6 @@ public abstract class LItr { public method set(p0: java.lang.String): void } - public abstract class M { public method (): void public method clear(): void @@ -102,7 +96,6 @@ public abstract class M { public final method values(): java.util.Collection } - public abstract class MC { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -115,24 +108,20 @@ public abstract class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public abstract class ME { public method (): void public synthetic method setValue(p0: java.lang.Object): java.lang.Object public method setValue(p0: java.lang.String): java.lang.String } - public abstract class MIt { public method (): void } - public abstract class MItr { public method (): void } - public abstract class ML { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -152,18 +141,15 @@ public abstract class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public abstract class ML2 { public method (): void public synthetic method remove(p0: int): java.lang.Object } - public abstract class MLItr { public method (): void } - public abstract class MM { public method (): void public final method containsKey(p0: java.lang.Object): boolean @@ -184,12 +170,10 @@ public abstract class MM { public final method values(): java.util.Collection } - public abstract class MME { public method (): void } - public abstract class MS { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -202,13 +186,11 @@ public abstract class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MutabilityMarkerInterfacesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method expectInterfaces(@org.jetbrains.annotations.NotNull p0: java.lang.Class, @org.jetbrains.annotations.NotNull p1: java.util.Set): void } - public abstract class S { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -227,7 +209,6 @@ public abstract class S { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public abstract class Weird { public method (): void public final method contains(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedAsWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedAsWithMutable.txt index d0f73857a61..2fd830620dc 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedAsWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedAsWithMutable.txt @@ -19,14 +19,12 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -36,7 +34,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -74,7 +71,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -93,7 +89,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -119,7 +114,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -142,7 +136,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -153,14 +146,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -170,7 +161,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -210,7 +200,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -229,7 +218,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -256,7 +244,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -267,7 +254,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -290,14 +276,12 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ReifiedAsWithMutableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method reifiedAsFailsWithCCE(p0: java.lang.Object, p1: java.lang.String): void private final static method reifiedAsSucceeds(p0: java.lang.Object, p1: java.lang.String): void } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedIsWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedIsWithMutable.txt index 5cdf1492463..e87f404fdf5 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedIsWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedIsWithMutable.txt @@ -19,14 +19,12 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -36,7 +34,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -74,7 +71,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -93,7 +89,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -119,7 +114,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -142,7 +136,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -153,14 +146,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -170,7 +161,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -210,7 +200,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -229,7 +218,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -256,7 +244,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -267,7 +254,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -290,7 +276,6 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ReifiedIsWithMutableKt { public final static method assert(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -298,7 +283,6 @@ public final class ReifiedIsWithMutableKt { private final static method reifiedIsNot(p0: java.lang.Object): boolean } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedSafeAsWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedSafeAsWithMutable.txt index 987e82503fe..418a2b108c5 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedSafeAsWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/reifiedSafeAsWithMutable.txt @@ -19,14 +19,12 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -36,7 +34,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -74,7 +71,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -93,7 +89,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -119,7 +114,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -142,7 +136,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -153,14 +146,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -170,7 +161,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -210,7 +200,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -229,7 +218,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -256,7 +244,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -267,7 +254,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -290,14 +276,12 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ReifiedSafeAsWithMutableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method reifiedSafeAsReturnsNonNull(p0: java.lang.Object, p1: java.lang.String): void private final static method reifiedSafeAsReturnsNull(p0: java.lang.Object, p1: java.lang.String): void } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/safeAsWithMutable.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/safeAsWithMutable.txt index 6d2e075b1a3..7302d9d8ab9 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/safeAsWithMutable.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/safeAsWithMutable.txt @@ -19,14 +19,12 @@ public final class C { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class It { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class Itr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -36,7 +34,6 @@ public final class Itr { public method remove(): void } - public final class L { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -74,7 +71,6 @@ public final class L { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class LItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -93,7 +89,6 @@ public final class LItr { public method set(p0: java.lang.String): void } - public final class M { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -119,7 +114,6 @@ public final class M { public final method values(): java.util.Collection } - public final class MC { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -142,7 +136,6 @@ public final class MC { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ME { public method (): void public synthetic method getKey(): java.lang.Object @@ -153,14 +146,12 @@ public final class ME { public method setValue(p0: java.lang.String): java.lang.String } - public final class MIt { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class MItr { private synthetic final field $$delegate_0: java.util.Iterator public method (): void @@ -170,7 +161,6 @@ public final class MItr { public method remove(): void } - public final class ML { private synthetic final field $$delegate_0: java.util.ArrayList public method (): void @@ -210,7 +200,6 @@ public final class ML { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MLItr { private synthetic final field $$delegate_0: java.util.ListIterator public method (): void @@ -229,7 +218,6 @@ public final class MLItr { public synthetic method set(p0: java.lang.Object): void } - public final class MM { private synthetic final field $$delegate_0: java.util.HashMap public method (): void @@ -256,7 +244,6 @@ public final class MM { public final method values(): java.util.Collection } - public final class MME { public method (): void public synthetic method getKey(): java.lang.Object @@ -267,7 +254,6 @@ public final class MME { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class MS { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -290,7 +276,6 @@ public final class MS { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class S { private synthetic final field $$delegate_0: java.util.HashSet public method (): void @@ -312,7 +297,6 @@ public final class S { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class SafeAsWithMutableKt { public final static method assert(p0: boolean, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/casts/mutableCollections/weirdMutableCasts.txt b/compiler/testData/codegen/light-analysis/casts/mutableCollections/weirdMutableCasts.txt index 036be91b3ea..6fe3bc01b2f 100644 --- a/compiler/testData/codegen/light-analysis/casts/mutableCollections/weirdMutableCasts.txt +++ b/compiler/testData/codegen/light-analysis/casts/mutableCollections/weirdMutableCasts.txt @@ -13,7 +13,6 @@ public final class Weird { public synthetic method setValue(p0: java.lang.Object): java.lang.Object } - public final class WeirdMutableCastsKt { public final static method asFailsWithCCE(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void public final static method asSucceeds(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/classLiteral/java/kt11943.txt b/compiler/testData/codegen/light-analysis/classLiteral/java/kt11943.txt index 34e4876c50b..618d0cd8cf0 100644 --- a/compiler/testData/codegen/light-analysis/classLiteral/java/kt11943.txt +++ b/compiler/testData/codegen/light-analysis/classLiteral/java/kt11943.txt @@ -2,14 +2,12 @@ public final class K { public method (): void } - public final class Kt11943Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getMyjava1(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass): java.lang.Class public final static @org.jetbrains.annotations.NotNull method getMyjava2(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass): java.lang.Class } - public final class O { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/classLiteral/java/objectSuperConstructorCall.txt b/compiler/testData/codegen/light-analysis/classLiteral/java/objectSuperConstructorCall.txt index 60eb6378d42..030873579c8 100644 --- a/compiler/testData/codegen/light-analysis/classLiteral/java/objectSuperConstructorCall.txt +++ b/compiler/testData/codegen/light-analysis/classLiteral/java/objectSuperConstructorCall.txt @@ -4,24 +4,20 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void } - public final class OK { public final static field INSTANCE: OK private method (): void } - public final class ObjectSuperConstructorCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class S { private final @org.jetbrains.annotations.NotNull field klass: java.lang.Class private final field result: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/classes/boxPrimitiveTypeInClinitOfClassObject.txt b/compiler/testData/codegen/light-analysis/classes/boxPrimitiveTypeInClinitOfClassObject.txt index c7af134599b..67467cb1e08 100644 --- a/compiler/testData/codegen/light-analysis/classes/boxPrimitiveTypeInClinitOfClassObject.txt +++ b/compiler/testData/codegen/light-analysis/classes/boxPrimitiveTypeInClinitOfClassObject.txt @@ -22,7 +22,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -64,7 +63,6 @@ public final static class A/Companion { public final method setXsnn(@org.jetbrains.annotations.Nullable p0: java.lang.Short): void } - public final class BoxPrimitiveTypeInClinitOfClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classCompanionInitializationWithJava.txt b/compiler/testData/codegen/light-analysis/classes/classCompanionInitializationWithJava.txt index c46ebaecb0f..0cde2f72b9d 100644 --- a/compiler/testData/codegen/light-analysis/classes/classCompanionInitializationWithJava.txt +++ b/compiler/testData/codegen/light-analysis/classes/classCompanionInitializationWithJava.txt @@ -2,23 +2,19 @@ public final class CompanionInitializationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class ConcreteWithStatic { public final static field Companion: ConcreteWithStatic.Companion inner class ConcreteWithStatic/Companion public method (): void } - public final static class ConcreteWithStatic/Companion { inner class ConcreteWithStatic/Companion private method (): void } - public interface IStatic - public class Static { public method (@org.jetbrains.annotations.NotNull p0: IStatic): void public final method doSth(): void diff --git a/compiler/testData/codegen/light-analysis/classes/classNamedAsOldPackageFacade.txt b/compiler/testData/codegen/light-analysis/classes/classNamedAsOldPackageFacade.txt index 8b60a8d9935..23c9d42e757 100644 --- a/compiler/testData/codegen/light-analysis/classes/classNamedAsOldPackageFacade.txt +++ b/compiler/testData/codegen/light-analysis/classes/classNamedAsOldPackageFacade.txt @@ -2,7 +2,6 @@ public final class test/ClassNamedAsOldPackageFacadeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class test/TestPackage { private final @org.jetbrains.annotations.NotNull field OK: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/classObject.txt b/compiler/testData/codegen/light-analysis/classes/classObject.txt index c2f252db582..e059eb50e7a 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObject.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObject.txt @@ -4,14 +4,12 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void public final @org.jetbrains.annotations.NotNull method create(): C } - public final class ClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectAsExtensionReceiver.txt b/compiler/testData/codegen/light-analysis/classes/classObjectAsExtensionReceiver.txt index b8c360c1270..e3f06d284a5 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectAsExtensionReceiver.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectAsExtensionReceiver.txt @@ -4,13 +4,11 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class ClassObjectAsExtensionReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object): int diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectAsStaticInitializer.txt b/compiler/testData/codegen/light-analysis/classes/classObjectAsStaticInitializer.txt index aae900b0f4c..a68797f426e 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectAsStaticInitializer.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectAsStaticInitializer.txt @@ -4,13 +4,11 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void } - public final class ClassObjectAsStaticInitializerKt { private static field global: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectField.txt b/compiler/testData/codegen/light-analysis/classes/classObjectField.txt index d75c301d25d..1c06a5d462a 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectField.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectField.txt @@ -5,14 +5,12 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void public final method getValue(): int } - public final class ClassObjectFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectInTrait.txt b/compiler/testData/codegen/light-analysis/classes/classObjectInTrait.txt index c97decc21ad..356d9f0c6d2 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectInTrait.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectInTrait.txt @@ -3,7 +3,6 @@ public interface C { inner class C/Companion } - public final static class C/Companion { private final static @org.jetbrains.annotations.NotNull field FOO: java.lang.String inner class C/Companion @@ -11,7 +10,6 @@ public final static class C/Companion { public final @org.jetbrains.annotations.NotNull method getFOO(): java.lang.String } - public final class ClassObjectInTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectNotOfEnum.txt b/compiler/testData/codegen/light-analysis/classes/classObjectNotOfEnum.txt index 6486492caa7..c22aac46bdf 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectNotOfEnum.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectNotOfEnum.txt @@ -4,7 +4,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -12,7 +11,6 @@ public final static class A/Companion { public final @org.jetbrains.annotations.NotNull method values(): java.lang.String } - public final class ClassObjectNotOfEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectToString.txt b/compiler/testData/codegen/light-analysis/classes/classObjectToString.txt index 1c9dcb4feb8..06ab2ac9ce2 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectToString.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectToString.txt @@ -2,14 +2,12 @@ public final class ClassObjectToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class SomeClass { public final static field Companion: SomeClass.Companion inner class SomeClass/Companion public method (): void } - public final static class SomeClass/Companion { inner class SomeClass/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectWithPrivateGenericMember.txt b/compiler/testData/codegen/light-analysis/classes/classObjectWithPrivateGenericMember.txt index 5278ccc8f29..5a7092ffd53 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectWithPrivateGenericMember.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectWithPrivateGenericMember.txt @@ -5,14 +5,12 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void private final method create(): C } - public final static class C/ZZZ { private final @org.jetbrains.annotations.NotNull field c: C inner class C/ZZZ @@ -20,7 +18,6 @@ public final static class C/ZZZ { public final @org.jetbrains.annotations.NotNull method getC(): C } - public final class ClassObjectWithPrivateGenericMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/classObjectsWithParentClasses.txt b/compiler/testData/codegen/light-analysis/classes/classObjectsWithParentClasses.txt index 4a78974e5f5..25ee585862f 100644 --- a/compiler/testData/codegen/light-analysis/classes/classObjectsWithParentClasses.txt +++ b/compiler/testData/codegen/light-analysis/classes/classObjectsWithParentClasses.txt @@ -2,7 +2,6 @@ public final class ClassObjectsWithParentClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Test { public final static field Companion: Test.Companion inner class Test/Companion @@ -12,14 +11,12 @@ public class Test { public final @org.jetbrains.annotations.NotNull method test(): Test.InnerClass } - public final static class Test/Companion { inner class Test/Companion private method (): void public final @org.jetbrains.annotations.NotNull method testStatic(@org.jetbrains.annotations.NotNull p0: Test.InnerClass): Test.NotInnerClass } - public class Test/InnerClass { synthetic final field this$0: Test private final field value: int @@ -28,7 +25,6 @@ public class Test/InnerClass { public final method getValue(): int } - public static class Test/NotInnerClass { private final field value: int inner class Test/NotInnerClass diff --git a/compiler/testData/codegen/light-analysis/classes/defaultObjectSameNamesAsInOuter.txt b/compiler/testData/codegen/light-analysis/classes/defaultObjectSameNamesAsInOuter.txt index e34c7eb7a61..3a8ab44c1e7 100644 --- a/compiler/testData/codegen/light-analysis/classes/defaultObjectSameNamesAsInOuter.txt +++ b/compiler/testData/codegen/light-analysis/classes/defaultObjectSameNamesAsInOuter.txt @@ -6,14 +6,12 @@ public final class A { private final method getP(): int } - public final static class A/B { inner class A/B private method (): void public final method getP(): int } - public final class DefaultObjectSameNamesAsInOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/delegation2.txt b/compiler/testData/codegen/light-analysis/classes/delegation2.txt index 02ffbd2b804..eaed509e3c1 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegation2.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegation2.txt @@ -6,29 +6,24 @@ public final class C { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Delegation2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class T1 { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class T2 { public method (): void public @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public interface Trait1 { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public interface Trait2 { public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/delegation3.txt b/compiler/testData/codegen/light-analysis/classes/delegation3.txt index 171b1d4eeb3..79b022c9316 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegation3.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegation3.txt @@ -2,27 +2,23 @@ public final class Delegation3Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface One { inner class One/DefaultImpls public abstract method faz(): int public abstract method foo(): int } - public final class One/DefaultImpls { inner class One/DefaultImpls public static method faz(p0: One): int } - public final class OneImpl { public method (): void public method faz(): int public method foo(): int } - public final class Test2 { private synthetic final field $$delegate_0: Two private synthetic final field $$delegate_1: One @@ -32,20 +28,17 @@ public final class Test2 { public method quux(): int } - public interface Two { inner class Two/DefaultImpls public abstract method foo(): int public abstract method quux(): int } - public final class Two/DefaultImpls { inner class Two/DefaultImpls public static method quux(p0: Two): int } - public final class TwoImpl { public method (): void public method foo(): int diff --git a/compiler/testData/codegen/light-analysis/classes/delegation4.txt b/compiler/testData/codegen/light-analysis/classes/delegation4.txt index cca1cfe961e..af817e470a2 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegation4.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegation4.txt @@ -2,24 +2,20 @@ public final class Delegation4Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface First { public abstract method foo(): int } - public final class Impl { public method (): void public method bar(): int public method foo(): int } - public interface Second { public abstract method bar(): int } - public final class Test { private synthetic final field $$delegate_0: Second public method (@org.jetbrains.annotations.NotNull p0: Second): void diff --git a/compiler/testData/codegen/light-analysis/classes/delegationGenericArg.txt b/compiler/testData/codegen/light-analysis/classes/delegationGenericArg.txt index 327aa9febbd..3f9490e40e6 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegationGenericArg.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegationGenericArg.txt @@ -2,12 +2,10 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String } - public final class DelegationGenericArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Derived { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/classes/delegationGenericArgUpperBound.txt b/compiler/testData/codegen/light-analysis/classes/delegationGenericArgUpperBound.txt index 9aa50c78dd1..b458a1167be 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegationGenericArgUpperBound.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegationGenericArgUpperBound.txt @@ -2,12 +2,10 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Number): java.lang.String } - public final class DelegationGenericArgUpperBoundKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Derived { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/classes/delegationGenericLongArg.txt b/compiler/testData/codegen/light-analysis/classes/delegationGenericLongArg.txt index 5545c4c126e..222d494f220 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegationGenericLongArg.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegationGenericLongArg.txt @@ -2,12 +2,10 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class DelegationGenericLongArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Derived { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/classes/delegationJava.txt b/compiler/testData/codegen/light-analysis/classes/delegationJava.txt index 8eb1b17df00..44a00f34494 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegationJava.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegationJava.txt @@ -2,14 +2,12 @@ public final class DelegationJavaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TestJava { private synthetic final field $$delegate_0: java.lang.Runnable public method (@org.jetbrains.annotations.NotNull p0: java.lang.Runnable): void public method run(): void } - public final class TestRunnable { public method (): void public method run(): void diff --git a/compiler/testData/codegen/light-analysis/classes/delegationMethodsWithArgs.txt b/compiler/testData/codegen/light-analysis/classes/delegationMethodsWithArgs.txt index bcdc99bce51..ec56be1083a 100644 --- a/compiler/testData/codegen/light-analysis/classes/delegationMethodsWithArgs.txt +++ b/compiler/testData/codegen/light-analysis/classes/delegationMethodsWithArgs.txt @@ -2,17 +2,14 @@ public final class test/DelegationMethodsWithArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface test/InputTextField { public abstract method setText(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface test/MooableTextField { public abstract method moo(p0: int, p1: int, p2: int): int } - public final class test/SimpleTextField { private field text2: java.lang.String public method (): void @@ -21,12 +18,10 @@ public final class test/SimpleTextField { public method setText(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface test/TextField { public abstract @org.jetbrains.annotations.NotNull method getText(): java.lang.String } - public final class test/TextFieldWrapper { private synthetic final field $$delegate_0: test.MooableTextField public method (@org.jetbrains.annotations.NotNull p0: test.MooableTextField): void diff --git a/compiler/testData/codegen/light-analysis/classes/exceptionConstructor.txt b/compiler/testData/codegen/light-analysis/classes/exceptionConstructor.txt index e518eaf121c..86d93779f9f 100644 --- a/compiler/testData/codegen/light-analysis/classes/exceptionConstructor.txt +++ b/compiler/testData/codegen/light-analysis/classes/exceptionConstructor.txt @@ -2,7 +2,6 @@ public final class ExceptionConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class GameError { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } diff --git a/compiler/testData/codegen/light-analysis/classes/extensionOnNamedClassObject.txt b/compiler/testData/codegen/light-analysis/classes/extensionOnNamedClassObject.txt index 304baa948d1..b57d30b937c 100644 --- a/compiler/testData/codegen/light-analysis/classes/extensionOnNamedClassObject.txt +++ b/compiler/testData/codegen/light-analysis/classes/extensionOnNamedClassObject.txt @@ -4,13 +4,11 @@ public final class C { public method (): void } - public final static class C/Foo { inner class C/Foo private method (): void } - public final class ExtensionOnNamedClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method create(@org.jetbrains.annotations.NotNull p0: C.Foo): int diff --git a/compiler/testData/codegen/light-analysis/classes/funDelegation.txt b/compiler/testData/codegen/light-analysis/classes/funDelegation.txt index 814ad86f22a..6b427bab228 100644 --- a/compiler/testData/codegen/light-analysis/classes/funDelegation.txt +++ b/compiler/testData/codegen/light-analysis/classes/funDelegation.txt @@ -1,22 +1,18 @@ public interface Abstract - public class Base { public method (): void public final method n(p0: int): int } - public final class Derived1 { public method (): void } - public final class Derived2 { public method (): void } - public final class FunDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: Base): boolean diff --git a/compiler/testData/codegen/light-analysis/classes/implementComparableInSubclass.txt b/compiler/testData/codegen/light-analysis/classes/implementComparableInSubclass.txt index ff69f74a1c2..1fcdc0b5a2d 100644 --- a/compiler/testData/codegen/light-analysis/classes/implementComparableInSubclass.txt +++ b/compiler/testData/codegen/light-analysis/classes/implementComparableInSubclass.txt @@ -4,7 +4,6 @@ public abstract class foo/Base { public final method getX(): int } - public final class foo/Derived { private final field y: int public method (): void @@ -13,7 +12,6 @@ public final class foo/Derived { public final method getY(): int } - public final class foo/ImplementComparableInSubclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inheritSetAndHashSet.txt b/compiler/testData/codegen/light-analysis/classes/inheritSetAndHashSet.txt index 7c6689679c6..1e9a2b3af00 100644 --- a/compiler/testData/codegen/light-analysis/classes/inheritSetAndHashSet.txt +++ b/compiler/testData/codegen/light-analysis/classes/inheritSetAndHashSet.txt @@ -1,6 +1,5 @@ public interface A - public final class B { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -11,7 +10,6 @@ public final class B { public final method size(): int } - public final class InheritSetAndHashSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inheritance.txt b/compiler/testData/codegen/light-analysis/classes/inheritance.txt index 481510e016e..1d18f09fee6 100644 --- a/compiler/testData/codegen/light-analysis/classes/inheritance.txt +++ b/compiler/testData/codegen/light-analysis/classes/inheritance.txt @@ -1,58 +1,49 @@ public interface Abstract - public final class InheritanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class P1 { private synthetic final field $$delegate_0: Y public method (p0: int, @org.jetbrains.annotations.NotNull p1: Y): void public method getY(): int } - public final class P2 { private synthetic final field $$delegate_0: Y public method (p0: int, @org.jetbrains.annotations.NotNull p1: Y): void public method getY(): int } - public final class P3 { private synthetic final field $$delegate_0: Y public method (p0: int, @org.jetbrains.annotations.NotNull p1: Y): void public method getY(): int } - public final class P4 { private synthetic final field $$delegate_0: Y public method (p0: int, @org.jetbrains.annotations.NotNull p1: Y): void public method getY(): int } - public final class Point { private final field y: int public method (p0: int, p1: int): void public method getY(): int } - public class X { private final field x: int public method (p0: int): void public final method getX(): int } - public interface Y { public abstract method getY(): int } - public final class YImpl { private final field y: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/classes/inheritedInnerClass.txt b/compiler/testData/codegen/light-analysis/classes/inheritedInnerClass.txt index cf54637f5c8..66ca9f26fa4 100644 --- a/compiler/testData/codegen/light-analysis/classes/inheritedInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/classes/inheritedInnerClass.txt @@ -2,7 +2,6 @@ public final class InheritedInnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.Nullable field foo: Outer.InnerBase inner class Outer/InnerBase @@ -11,14 +10,12 @@ public final class Outer { public final @org.jetbrains.annotations.Nullable method getFoo(): Outer.InnerBase } - public class Outer/InnerBase { synthetic final field this$0: Outer inner class Outer/InnerBase public method (p0: Outer): void } - public final class Outer/InnerDerived { synthetic final field this$0: Outer inner class Outer/InnerDerived diff --git a/compiler/testData/codegen/light-analysis/classes/inheritedMethod.txt b/compiler/testData/codegen/light-analysis/classes/inheritedMethod.txt index eb1b2adb860..8ee4a1860b2 100644 --- a/compiler/testData/codegen/light-analysis/classes/inheritedMethod.txt +++ b/compiler/testData/codegen/light-analysis/classes/inheritedMethod.txt @@ -3,13 +3,11 @@ public final class Bar { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public class Foo { public method (): void public final @org.jetbrains.annotations.NotNull method xyzzy(): java.lang.String } - public final class InheritedMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/initializerBlock.txt b/compiler/testData/codegen/light-analysis/classes/initializerBlock.txt index 890ce279e1e..12621d0f5f8 100644 --- a/compiler/testData/codegen/light-analysis/classes/initializerBlock.txt +++ b/compiler/testData/codegen/light-analysis/classes/initializerBlock.txt @@ -5,7 +5,6 @@ public final class C { public final method setF(p0: int): void } - public final class InitializerBlockKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/initializerBlockDImpl.txt b/compiler/testData/codegen/light-analysis/classes/initializerBlockDImpl.txt index 2ad5d899444..f8787c95fe5 100644 --- a/compiler/testData/codegen/light-analysis/classes/initializerBlockDImpl.txt +++ b/compiler/testData/codegen/light-analysis/classes/initializerBlockDImpl.txt @@ -2,7 +2,6 @@ public final class InitializerBlockDImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class World { private final @org.jetbrains.annotations.NotNull field foo: World.Item private final @org.jetbrains.annotations.NotNull field items: java.util.ArrayList @@ -12,7 +11,6 @@ public final class World { public final @org.jetbrains.annotations.NotNull method getItems(): java.util.ArrayList } - public final class World/Item { synthetic final field this$0: World inner class World/Item diff --git a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerived.txt b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerived.txt index 6a5228a3471..84dff691524 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerived.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerived.txt @@ -5,7 +5,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public final class A/B { private final @org.jetbrains.annotations.NotNull field result: java.lang.String private final @org.jetbrains.annotations.NotNull field s: java.lang.String @@ -16,7 +15,6 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class C { public method (): void public final @org.jetbrains.annotations.NotNull method aReceiver(): A.B @@ -27,7 +25,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method superReceiver(): A.B } - public final class InstantiateInDerivedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerivedLabeled.txt b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerivedLabeled.txt index 3aa2ba7cf10..5bfab15412e 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerivedLabeled.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInDerivedLabeled.txt @@ -5,7 +5,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public final class A/B { private final @org.jetbrains.annotations.NotNull field result: java.lang.String private final @org.jetbrains.annotations.NotNull field s: java.lang.String @@ -16,13 +15,11 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class C { inner class C/X public method (): void } - public final class C/X { synthetic final field this$0: C inner class C/X @@ -35,7 +32,6 @@ public final class C/X { public final @org.jetbrains.annotations.NotNull method superXReceiver(): A.B } - public final class InstantiateInDerivedLabeledKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInSameClass.txt b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInSameClass.txt index 9fa7b969fb4..7dd0024d579 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/instantiateInSameClass.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/instantiateInSameClass.txt @@ -12,7 +12,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method newCReceiver(): C.B } - public final class C/B { private final @org.jetbrains.annotations.NotNull field result: java.lang.String private final @org.jetbrains.annotations.NotNull field s: java.lang.String @@ -23,7 +22,6 @@ public final class C/B { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class InstantiateInSameClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inner/kt6708.txt b/compiler/testData/codegen/light-analysis/classes/inner/kt6708.txt index b94b35df32f..060f5e753e8 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/kt6708.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/kt6708.txt @@ -3,27 +3,23 @@ public class A { public method (): void } - public class A/InnerA { synthetic final field this$0: A inner class A/InnerA public method (p0: A): void } - public final class B { inner class B/InnerB public method (): void } - public final class B/InnerB { synthetic final field this$0: B inner class B/InnerB public method (p0: B): void } - public final class Kt6708Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inner/properOuter.txt b/compiler/testData/codegen/light-analysis/classes/inner/properOuter.txt index c93aa4004e3..4f2d9a0d19a 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/properOuter.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/properOuter.txt @@ -6,7 +6,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public class A/B { private final @org.jetbrains.annotations.NotNull field s: java.lang.String synthetic final field this$0: A @@ -16,7 +15,6 @@ public class A/B { public final @org.jetbrains.annotations.NotNull method testB(): java.lang.String } - public class A/C { synthetic final field this$0: A inner class A/C @@ -24,7 +22,6 @@ public class A/C { public final @org.jetbrains.annotations.NotNull method testC(): java.lang.String } - public final class ProperOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/inner/properSuperLinking.txt b/compiler/testData/codegen/light-analysis/classes/inner/properSuperLinking.txt index b914d4d799e..75d03fec305 100644 --- a/compiler/testData/codegen/light-analysis/classes/inner/properSuperLinking.txt +++ b/compiler/testData/codegen/light-analysis/classes/inner/properSuperLinking.txt @@ -8,7 +8,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public class A/B { synthetic final field this$0: A inner class A/B @@ -16,7 +15,6 @@ public class A/B { public final @org.jetbrains.annotations.NotNull method testB(): java.lang.String } - public final class ProperSuperLinkingKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/innerClass.txt b/compiler/testData/codegen/light-analysis/classes/innerClass.txt index 5505e549b87..51bea732fc0 100644 --- a/compiler/testData/codegen/light-analysis/classes/innerClass.txt +++ b/compiler/testData/codegen/light-analysis/classes/innerClass.txt @@ -2,7 +2,6 @@ public final class InnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field foo: java.lang.StringBuilder inner class Outer/Inner @@ -11,7 +10,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method test(): Outer.Inner } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner diff --git a/compiler/testData/codegen/light-analysis/classes/interfaceCompanionInitializationWithJava.txt b/compiler/testData/codegen/light-analysis/classes/interfaceCompanionInitializationWithJava.txt index 2138c627b6d..920c95c80db 100644 --- a/compiler/testData/codegen/light-analysis/classes/interfaceCompanionInitializationWithJava.txt +++ b/compiler/testData/codegen/light-analysis/classes/interfaceCompanionInitializationWithJava.txt @@ -2,7 +2,6 @@ public final class CompanionInitializationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface IStatic { public final static field Companion: IStatic.Companion public final static field const: int @@ -11,20 +10,17 @@ public interface IStatic { public abstract method doSth(): void } - public final static class IStatic/Companion { public final static field const: int inner class IStatic/Companion private method (): void } - public final class IStatic/DefaultImpls { inner class IStatic/DefaultImpls public static method doSth(p0: IStatic): void } - public class Static { private final field p: java.lang.Object public method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt1018.txt b/compiler/testData/codegen/light-analysis/classes/kt1018.txt index 2504fd6d0c0..ead7d175123 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1018.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1018.txt @@ -2,7 +2,6 @@ public final class Kt1018Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class StockMarketTableModel { private final static field COLUMN_TITLES: java.lang.Integer[] public final static field Companion: StockMarketTableModel.Companion @@ -11,7 +10,6 @@ public final class StockMarketTableModel { public final method getColumnCount(): int } - public final static class StockMarketTableModel/Companion { inner class StockMarketTableModel/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt1120.txt b/compiler/testData/codegen/light-analysis/classes/kt1120.txt index 14c41e38788..296a7252b66 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1120.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1120.txt @@ -2,7 +2,6 @@ public final class Kt1120Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class RefreshQueue { public final static field INSTANCE: RefreshQueue private final static @org.jetbrains.annotations.NotNull field any: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/classes/kt1134.txt b/compiler/testData/codegen/light-analysis/classes/kt1134.txt index 69c0d44753a..d2fc009ae10 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1134.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1134.txt @@ -2,7 +2,6 @@ public final class Kt1134Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class SomeClass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/classes/kt1157.txt b/compiler/testData/codegen/light-analysis/classes/kt1157.txt index 88a48d46d46..bfa724974e7 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1157.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1157.txt @@ -2,12 +2,10 @@ public final class Kt1157Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Runnable { public abstract method run(): void } - public final class SomeClass { public final static field INSTANCE: SomeClass private final static field work: SomeClass$work$1 diff --git a/compiler/testData/codegen/light-analysis/classes/kt1345.txt b/compiler/testData/codegen/light-analysis/classes/kt1345.txt index 6cb93d6db8b..594751227f7 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1345.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1345.txt @@ -6,20 +6,16 @@ public final class Actor { public final @org.jetbrains.annotations.NotNull method getCode(): java.lang.String } - public interface Creator { public abstract method create(): java.lang.Object } - public interface Factory - public final class Kt1345Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyFactory { public method (): void public @org.jetbrains.annotations.NotNull method create(): Actor diff --git a/compiler/testData/codegen/light-analysis/classes/kt1439.txt b/compiler/testData/codegen/light-analysis/classes/kt1439.txt index 8120ad5a993..b27a58975cf 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1439.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1439.txt @@ -3,7 +3,6 @@ public final class Kt1439Kt { public final static @org.jetbrains.annotations.NotNull method printtest(): java.lang.String } - public final class MyClass { private @org.jetbrains.annotations.NotNull field fnc: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt1535.txt b/compiler/testData/codegen/light-analysis/classes/kt1535.txt index 060edcd83b1..9b03f9617dd 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1535.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1535.txt @@ -4,12 +4,10 @@ public final class Broken { public @org.jetbrains.annotations.NotNull method invoke(): java.lang.String } - public final class Kt1535Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Works { public method (): void public @org.jetbrains.annotations.NotNull method invoke(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/classes/kt1538.txt b/compiler/testData/codegen/light-analysis/classes/kt1538.txt index 0b3d081e178..82da824e91c 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1538.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1538.txt @@ -4,7 +4,6 @@ public final class Kt1538Kt { public final static @org.jetbrains.annotations.NotNull method toHasMap(@org.jetbrains.annotations.Nullable p0: java.lang.Object): Pair } - public final class Pair { private final field first: java.lang.Object private final field second: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/classes/kt1611.txt b/compiler/testData/codegen/light-analysis/classes/kt1611.txt index 5d39a0cd976..0fdc9ae270b 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1611.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1611.txt @@ -5,7 +5,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getBar(): kotlin.jvm.functions.Function1 } - public final class Kt1611Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt1721.txt b/compiler/testData/codegen/light-analysis/classes/kt1721.txt index 1503b98a050..4b0659560e6 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1721.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1721.txt @@ -2,7 +2,6 @@ public final class Kt1721Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class T { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt1726.txt b/compiler/testData/codegen/light-analysis/classes/kt1726.txt index 4d354c2be57..9b1b98e7396 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1726.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1726.txt @@ -8,7 +8,6 @@ public final class Foo { public final method setState(p0: int): void } - public final class Kt1726Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt1759.txt b/compiler/testData/codegen/light-analysis/classes/kt1759.txt index 59f8e8a96d1..b8e1f18881e 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1759.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1759.txt @@ -6,7 +6,6 @@ public final class Greeter { public final method setName(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt1759Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt1891.txt b/compiler/testData/codegen/light-analysis/classes/kt1891.txt index 547584f0e0d..00113a323a9 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1891.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1891.txt @@ -2,7 +2,6 @@ public final class Kt1891Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyList { private @org.jetbrains.annotations.Nullable field value: java.lang.Object public method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt1918.txt b/compiler/testData/codegen/light-analysis/classes/kt1918.txt index 311cf40f2a3..1a981aeed33 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1918.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1918.txt @@ -2,12 +2,10 @@ public final class Bar { public method (): void } - public interface Foo { public abstract @org.jetbrains.annotations.NotNull method xyzzy(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.String } - public final class Kt1918Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method buildFoo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Foo diff --git a/compiler/testData/codegen/light-analysis/classes/kt1976.txt b/compiler/testData/codegen/light-analysis/classes/kt1976.txt index 2a94e5b29e2..1d56599e8ce 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt1976.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt1976.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getF(): kotlin.jvm.functions.Function0 } - public final class Kt1976Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2224.txt b/compiler/testData/codegen/light-analysis/classes/kt2224.txt index 80d45a79c2c..ae4228dbcee 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2224.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2224.txt @@ -2,13 +2,11 @@ public interface A { public abstract method foo(): int } - public final class B1 { public method (): void public method foo(): int } - public final class B2 { private final field z: int public method (p0: int): void @@ -16,7 +14,6 @@ public final class B2 { public final method getZ(): int } - public final class Kt2224Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method f1(@org.jetbrains.annotations.NotNull p0: B1): int diff --git a/compiler/testData/codegen/light-analysis/classes/kt2288.txt b/compiler/testData/codegen/light-analysis/classes/kt2288.txt index cd9223523f1..b6fe015b533 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2288.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2288.txt @@ -2,7 +2,6 @@ public final class Kt2288Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Test { public method (): void public @org.jetbrains.annotations.NotNull method clone(): Test diff --git a/compiler/testData/codegen/light-analysis/classes/kt2384.txt b/compiler/testData/codegen/light-analysis/classes/kt2384.txt index f6d01313670..73bb2f59c4a 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2384.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2384.txt @@ -6,7 +6,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -14,7 +13,6 @@ public final static class A/Companion { public final method getC(): int } - public final class Kt2384Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2390.txt b/compiler/testData/codegen/light-analysis/classes/kt2390.txt index a7b31e1fac5..ea26897ce15 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2390.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2390.txt @@ -2,44 +2,36 @@ public interface Formatter { public abstract @org.jetbrains.annotations.NotNull method format(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object } - public final class JsonArray { public method (): void } - public interface JsonFormatter { inner class JsonFormatter/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method format(@org.jetbrains.annotations.NotNull p0: java.util.Collection): JsonArray } - public final class JsonFormatter/DefaultImpls { inner class JsonFormatter/DefaultImpls public static @org.jetbrains.annotations.NotNull method format(@org.jetbrains.annotations.NotNull p0: JsonFormatter, p1: java.util.Collection): JsonArray } - public final class JsonObject { public method (): void } - public final class Kt2390Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface MultiFormatter { public abstract @org.jetbrains.annotations.NotNull method format(@org.jetbrains.annotations.NotNull p0: java.util.Collection): java.lang.Object } - public final class Project { public method (): void } - public final class ProjectJsonFormatter { public method (): void public @org.jetbrains.annotations.NotNull method format(@org.jetbrains.annotations.NotNull p0: java.util.Collection): JsonArray diff --git a/compiler/testData/codegen/light-analysis/classes/kt2391.txt b/compiler/testData/codegen/light-analysis/classes/kt2391.txt index ac0f84bc873..cb4b09a128e 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2391.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2391.txt @@ -3,17 +3,14 @@ public abstract class HttpServer { public final method start(): void } - public final class Kt2391Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface LoggerAware { public abstract @org.jetbrains.annotations.NotNull method getLogger(): java.lang.StringBuilder } - public final class MyHttpServer { private final @org.jetbrains.annotations.NotNull field logger: java.lang.StringBuilder public method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt2395.txt b/compiler/testData/codegen/light-analysis/classes/kt2395.txt index 3b2a574ed80..2b66cb110ac 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2395.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2395.txt @@ -2,7 +2,6 @@ public final class Kt2395Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyList { public method (): void public final method contains(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/classes/kt2477.txt b/compiler/testData/codegen/light-analysis/classes/kt2477.txt index 3dfda94c351..37beef2b971 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2477.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2477.txt @@ -3,30 +3,25 @@ public interface test/A { public abstract @org.jetbrains.annotations.NotNull method getC(): java.lang.String } - public final class test/A/DefaultImpls { inner class test/A/DefaultImpls public static @org.jetbrains.annotations.NotNull method getC(p0: test.A): java.lang.String } - public interface test/B { inner class test/B/DefaultImpls } - public final class test/B/DefaultImpls { inner class test/B/DefaultImpls private static method getC(p0: test.B): java.lang.String } - public class test/C { private final field c: java.lang.String public method (): void } - public class test/D { private final @org.jetbrains.annotations.NotNull field b: java.lang.String public method (): void @@ -34,7 +29,6 @@ public class test/D { public @org.jetbrains.annotations.NotNull method getC(): java.lang.String } - public final class test/Kt2477Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2480.txt b/compiler/testData/codegen/light-analysis/classes/kt2480.txt index b8dd21b7397..bfae2969c1a 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2480.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2480.txt @@ -4,14 +4,12 @@ public abstract class AbstractClass { public final method printSome(): java.lang.Object } - public final class Class { public method (): void public synthetic method getSome(): java.lang.Object public @org.jetbrains.annotations.NotNull method getSome(): java.lang.String } - public final class Kt2480Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt249.txt b/compiler/testData/codegen/light-analysis/classes/kt249.txt index 3d2dc216861..1c0a85b972c 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt249.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt249.txt @@ -2,21 +2,18 @@ public final class x/Kt249Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class x/Outer { public final static field Companion: x.Outer.Companion inner class x/Outer/Companion public method (): void } - public final static class x/Outer/Companion { inner class x/Outer/Companion inner class x/Outer/Companion/Inner private method (): void } - public final static class x/Outer/Companion/Inner { inner class x/Outer/Companion inner class x/Outer/Companion/Inner diff --git a/compiler/testData/codegen/light-analysis/classes/kt2532.txt b/compiler/testData/codegen/light-analysis/classes/kt2532.txt index b15e1f46b33..0170617acb6 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2532.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2532.txt @@ -6,19 +6,16 @@ public final class foo/A { public method getC(): int } - public interface foo/B { inner class foo/B/DefaultImpls public abstract method getC(): int } - public final class foo/B/DefaultImpls { inner class foo/B/DefaultImpls public static method getC(p0: foo.B): int } - public final class foo/Kt2532Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2566.txt b/compiler/testData/codegen/light-analysis/classes/kt2566.txt index 717429658c1..43923d5e574 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2566.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2566.txt @@ -3,22 +3,18 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public interface I - public final class Kt2566Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2566_2.txt b/compiler/testData/codegen/light-analysis/classes/kt2566_2.txt index 864932af2b6..c2e144dfa76 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2566_2.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2566_2.txt @@ -4,13 +4,11 @@ public class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public class B { inner class B/E public method (): void } - public final class B/E { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: B @@ -19,13 +17,11 @@ public final class B/E { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class C { inner class C/D public method (): void } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -34,7 +30,6 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Kt2566_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2626.txt b/compiler/testData/codegen/light-analysis/classes/kt2626.txt index 5ad15e18be6..aab5ca5aaec 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2626.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2626.txt @@ -4,7 +4,6 @@ public final class example2/Context { private method (): void } - public static enum class example2/Context/OsType { public final static field LINUX: example2.Context.OsType public final static field MACOSX: example2.Context.OsType @@ -18,7 +17,6 @@ public static enum class example2/Context/OsType { public static method values(): example2.Context.OsType[] } - public final class example2/Kt2626Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2711.txt b/compiler/testData/codegen/light-analysis/classes/kt2711.txt index 6fc288ff725..80e30ce3c4a 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2711.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2711.txt @@ -3,13 +3,11 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(p0: int): IntRange } - public final class IntRange { public method (): void public final method contains(p0: int): boolean } - public final class Kt2711Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt2784.txt b/compiler/testData/codegen/light-analysis/classes/kt2784.txt index a016ec84022..4b245a13ad3 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt2784.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt2784.txt @@ -4,18 +4,15 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public class Factory { public method (p0: int): void } - public final class Kt2784Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt285.txt b/compiler/testData/codegen/light-analysis/classes/kt285.txt index 381af75a03e..199cd424cba 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt285.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt285.txt @@ -6,26 +6,22 @@ public final class ComplexClass { public final @org.jetbrains.annotations.NotNull method qux(): java.lang.String } - public final class Kt285Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class SimpleClass { public method (): void public @org.jetbrains.annotations.NotNull method bar(): java.lang.String public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public interface Trait { inner class Trait/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Trait/DefaultImpls { inner class Trait/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: Trait): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/classes/kt3001.txt b/compiler/testData/codegen/light-analysis/classes/kt3001.txt index 6ed3e38cb7f..03aca9731e1 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt3001.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt3001.txt @@ -2,26 +2,22 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class Base { private final @org.jetbrains.annotations.NotNull field result: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public class Derived { private synthetic final field $$delegate_0: Base public method (): void public @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class Kt3001Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/classes/kt3114.txt b/compiler/testData/codegen/light-analysis/classes/kt3114.txt index e88652e07d4..1c8a8da5449 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt3114.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt3114.txt @@ -5,7 +5,6 @@ public final class KeySpan { public final method matches(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean } - public final class Kt3114Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt3414.txt b/compiler/testData/codegen/light-analysis/classes/kt3414.txt index dd08498ac4e..707504e4a67 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt3414.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt3414.txt @@ -2,17 +2,14 @@ public interface A { public abstract method foo(): int } - public interface B { public abstract method foo(): int } - public final class Kt3414Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field a: A public method (@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt3546.txt b/compiler/testData/codegen/light-analysis/classes/kt3546.txt index acf3274e437..380c59bc11e 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt3546.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt3546.txt @@ -2,20 +2,16 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public interface B { public abstract @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public interface C - public final class Kt3546Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyClass { private final @org.jetbrains.annotations.NotNull field value: C public method (@org.jetbrains.annotations.NotNull p0: C): void @@ -23,7 +19,6 @@ public final class MyClass { public @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field param: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt471.txt b/compiler/testData/codegen/light-analysis/classes/kt471.txt index 42c73f64ff7..045d958c01c 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt471.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt471.txt @@ -10,7 +10,6 @@ public final class Kt471Kt { public final static method test8(): boolean } - public final class MNR { private @org.jetbrains.annotations.NotNull field ref: MyNumber public method (@org.jetbrains.annotations.NotNull p0: MyNumber): void @@ -18,7 +17,6 @@ public final class MNR { public final method setRef(@org.jetbrains.annotations.NotNull p0: MyNumber): void } - public final class MyArrayList { private field value17: java.lang.Object private field value39: java.lang.Object @@ -27,7 +25,6 @@ public final class MyArrayList { public final @org.jetbrains.annotations.Nullable method set(p0: int, p1: java.lang.Object): java.lang.Object } - public final class MyNumber { private final field i: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt48.txt b/compiler/testData/codegen/light-analysis/classes/kt48.txt index 5a4af576924..4d4e423f215 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt48.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt48.txt @@ -56,7 +56,6 @@ public final class A { public final method setXsnn(@org.jetbrains.annotations.Nullable p0: java.lang.Short): void } - public final class Kt48Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt501.txt b/compiler/testData/codegen/light-analysis/classes/kt501.txt index 7b3632dc92b..11aa04d0de0 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt501.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt501.txt @@ -3,7 +3,6 @@ public final class Kt501Kt { public final static @org.jetbrains.annotations.NotNull method test1(): java.lang.String } - public final class Reluctant { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/classes/kt504.txt b/compiler/testData/codegen/light-analysis/classes/kt504.txt index 5e1307873cb..f30f88b6d9b 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt504.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt504.txt @@ -5,14 +5,12 @@ public class mult_constructors_3_bug/Identifier { public method (): void } - public final static class mult_constructors_3_bug/Identifier/Companion { inner class mult_constructors_3_bug/Identifier/Companion private method (): void public @org.jetbrains.annotations.NotNull method init(p0: boolean): mult_constructors_3_bug.Identifier } - public final class mult_constructors_3_bug/Kt504Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt5347.txt b/compiler/testData/codegen/light-analysis/classes/kt5347.txt index 52e9dd94f89..9b221d07324 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt5347.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt5347.txt @@ -6,7 +6,6 @@ public final class Kt5347Kt { public final static @org.jetbrains.annotations.NotNull method test4(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class TestClass { private final @org.jetbrains.annotations.NotNull field x: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt6136.txt b/compiler/testData/codegen/light-analysis/classes/kt6136.txt index ac906adf422..412f4534f1a 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt6136.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt6136.txt @@ -17,12 +17,10 @@ public final class Actor { public method toString(): java.lang.String } - public interface Id { public abstract method getId(): java.lang.Object } - public final class Kt6136Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt633.txt b/compiler/testData/codegen/light-analysis/classes/kt633.txt index 58163ce19c2..619163f92ef 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt633.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt633.txt @@ -2,7 +2,6 @@ public final class Kt633Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyArray { private final @org.jetbrains.annotations.NotNull field a: mInt[] public method (): void @@ -11,7 +10,6 @@ public final class MyArray { public final method set(@org.jetbrains.annotations.NotNull p0: mInt, @org.jetbrains.annotations.NotNull p1: mInt): void } - public final class mInt { private final field i: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/classes/kt6816.txt b/compiler/testData/codegen/light-analysis/classes/kt6816.txt index 217e7bb5d38..7f8a1a7fc7d 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt6816.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt6816.txt @@ -40,7 +40,6 @@ public final class CalculatorConstants { public final method getTravelClassOne(): double } - public final class Kt6816Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/kt707.txt b/compiler/testData/codegen/light-analysis/classes/kt707.txt index 9f9e16d73a8..3e626c623ce 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt707.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt707.txt @@ -3,7 +3,6 @@ public final class Kt707Kt { public final static @org.jetbrains.annotations.NotNull method mapHead(@org.jetbrains.annotations.NotNull p0: List, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): List } - public final class List { private final field head: java.lang.Object private final @org.jetbrains.annotations.Nullable field tail: List diff --git a/compiler/testData/codegen/light-analysis/classes/kt8011a.txt b/compiler/testData/codegen/light-analysis/classes/kt8011a.txt index b0ba74b9adb..c42e40764a5 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt8011a.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt8011a.txt @@ -6,7 +6,6 @@ public final class Kt8011aKt { public final static @org.jetbrains.annotations.NotNull method testFun4(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class TestClass { private final @org.jetbrains.annotations.NotNull field str: java.lang.String private @org.jetbrains.annotations.Nullable field xx: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/classes/kt903.txt b/compiler/testData/codegen/light-analysis/classes/kt903.txt index 337dd5f5caa..280c8b9df0f 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt903.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt903.txt @@ -3,7 +3,6 @@ public final class Kt903Kt { public final static method plus(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Integer): int } - public class PerfectNumberFinder { public method (): void public method isPerfect(p0: int): boolean diff --git a/compiler/testData/codegen/light-analysis/classes/kt9642.txt b/compiler/testData/codegen/light-analysis/classes/kt9642.txt index cc73a283b83..2bc8b170470 100644 --- a/compiler/testData/codegen/light-analysis/classes/kt9642.txt +++ b/compiler/testData/codegen/light-analysis/classes/kt9642.txt @@ -2,7 +2,6 @@ public final class Kt9642Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { public final static field Companion: Outer.Companion private static @org.jetbrains.annotations.NotNull field s: java.lang.String @@ -11,7 +10,6 @@ public final class Outer { public method (): void } - public final static class Outer/Companion { inner class Outer/Companion private method (): void @@ -19,7 +17,6 @@ public final static class Outer/Companion { private final method setS(p0: java.lang.String): void } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/classes/namedClassObject.txt b/compiler/testData/codegen/light-analysis/classes/namedClassObject.txt index a16bf23db51..f82f43d10d5 100644 --- a/compiler/testData/codegen/light-analysis/classes/namedClassObject.txt +++ b/compiler/testData/codegen/light-analysis/classes/namedClassObject.txt @@ -4,14 +4,12 @@ public final class C { public method (): void } - public final static class C/Foo { inner class C/Foo private method (): void public final method create(): int } - public final class NamedClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/outerThis.txt b/compiler/testData/codegen/light-analysis/classes/outerThis.txt index 9a622e48e29..743c3b9f397 100644 --- a/compiler/testData/codegen/light-analysis/classes/outerThis.txt +++ b/compiler/testData/codegen/light-analysis/classes/outerThis.txt @@ -5,7 +5,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): Outer.Inner } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner @@ -13,7 +12,6 @@ public final class Outer/Inner { public final @org.jetbrains.annotations.NotNull method getOuter(): Outer } - public final class OuterThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/overloadBinaryOperator.txt b/compiler/testData/codegen/light-analysis/classes/overloadBinaryOperator.txt index c5498391dea..79f847c89b3 100644 --- a/compiler/testData/codegen/light-analysis/classes/overloadBinaryOperator.txt +++ b/compiler/testData/codegen/light-analysis/classes/overloadBinaryOperator.txt @@ -6,7 +6,6 @@ public final class ArrayWrapper { public final @org.jetbrains.annotations.NotNull method plus(@org.jetbrains.annotations.NotNull p0: ArrayWrapper): ArrayWrapper } - public final class OverloadBinaryOperatorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/overloadPlusAssign.txt b/compiler/testData/codegen/light-analysis/classes/overloadPlusAssign.txt index f1b91e974d6..cf6b91aef87 100644 --- a/compiler/testData/codegen/light-analysis/classes/overloadPlusAssign.txt +++ b/compiler/testData/codegen/light-analysis/classes/overloadPlusAssign.txt @@ -7,7 +7,6 @@ public final class ArrayWrapper { public final method plusAssign(@org.jetbrains.annotations.NotNull p0: ArrayWrapper): void } - public final class OverloadPlusAssignKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/overloadPlusAssignReturn.txt b/compiler/testData/codegen/light-analysis/classes/overloadPlusAssignReturn.txt index 7ac5fc25f90..cdbd03d122f 100644 --- a/compiler/testData/codegen/light-analysis/classes/overloadPlusAssignReturn.txt +++ b/compiler/testData/codegen/light-analysis/classes/overloadPlusAssignReturn.txt @@ -7,7 +7,6 @@ public final class ArrayWrapper { public final @org.jetbrains.annotations.NotNull method plus(@org.jetbrains.annotations.NotNull p0: ArrayWrapper): ArrayWrapper } - public final class OverloadPlusAssignReturnKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/overloadPlusToPlusAssign.txt b/compiler/testData/codegen/light-analysis/classes/overloadPlusToPlusAssign.txt index 4fafdabe28e..179e9e6e3bb 100644 --- a/compiler/testData/codegen/light-analysis/classes/overloadPlusToPlusAssign.txt +++ b/compiler/testData/codegen/light-analysis/classes/overloadPlusToPlusAssign.txt @@ -7,7 +7,6 @@ public final class ArrayWrapper { public final @org.jetbrains.annotations.NotNull method plus(@org.jetbrains.annotations.NotNull p0: ArrayWrapper): ArrayWrapper } - public final class OverloadPlusToPlusAssignKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/overloadUnaryOperator.txt b/compiler/testData/codegen/light-analysis/classes/overloadUnaryOperator.txt index e2947afbea9..27a611620cb 100644 --- a/compiler/testData/codegen/light-analysis/classes/overloadUnaryOperator.txt +++ b/compiler/testData/codegen/light-analysis/classes/overloadUnaryOperator.txt @@ -7,7 +7,6 @@ public final class ArrayWrapper { public final @org.jetbrains.annotations.NotNull method unaryMinus(): ArrayWrapper } - public final class OverloadUnaryOperatorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/privateOuterFunctions.txt b/compiler/testData/codegen/light-analysis/classes/privateOuterFunctions.txt index f2eed16826c..2ea1b9dea0a 100644 --- a/compiler/testData/codegen/light-analysis/classes/privateOuterFunctions.txt +++ b/compiler/testData/codegen/light-analysis/classes/privateOuterFunctions.txt @@ -6,7 +6,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - private final class C/Inner { synthetic final field this$0: C inner class C/Inner @@ -14,12 +13,10 @@ private final class C/Inner { public final method innerFun(): void } - public final class PrivateOuterFunctionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Runnable { public abstract method run(): void } diff --git a/compiler/testData/codegen/light-analysis/classes/privateOuterProperty.txt b/compiler/testData/codegen/light-analysis/classes/privateOuterProperty.txt index d573130c961..a9f9c6f7797 100644 --- a/compiler/testData/codegen/light-analysis/classes/privateOuterProperty.txt +++ b/compiler/testData/codegen/light-analysis/classes/privateOuterProperty.txt @@ -5,7 +5,6 @@ public final class C { public final method foo(): int } - private final class C/Inner { synthetic final field this$0: C inner class C/Inner @@ -13,12 +12,10 @@ private final class C/Inner { public final method innerFun(): void } - public final class PrivateOuterPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Runnable { public abstract method run(): void } diff --git a/compiler/testData/codegen/light-analysis/classes/privateToThis.txt b/compiler/testData/codegen/light-analysis/classes/privateToThis.txt index 2f83d99c08f..17e42fcea53 100644 --- a/compiler/testData/codegen/light-analysis/classes/privateToThis.txt +++ b/compiler/testData/codegen/light-analysis/classes/privateToThis.txt @@ -6,7 +6,6 @@ public final class A { private final method k(): java.lang.Object } - public final class PrivateToThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/propertyDelegation.txt b/compiler/testData/codegen/light-analysis/classes/propertyDelegation.txt index 01cb8951ac6..4005eadfd49 100644 --- a/compiler/testData/codegen/light-analysis/classes/propertyDelegation.txt +++ b/compiler/testData/codegen/light-analysis/classes/propertyDelegation.txt @@ -1,6 +1,5 @@ public interface Abstract - public class Base { private final field plain: int private field readwrite: int @@ -11,17 +10,14 @@ public class Base { public final method setReadwrite(p0: int): void } - public final class Derived1 { public method (): void } - public final class Derived2 { public method (): void } - public final class PropertyDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method code(@org.jetbrains.annotations.NotNull p0: Base): int diff --git a/compiler/testData/codegen/light-analysis/classes/propertyInInitializer.txt b/compiler/testData/codegen/light-analysis/classes/propertyInInitializer.txt index 7306dc59f75..2c271117754 100644 --- a/compiler/testData/codegen/light-analysis/classes/propertyInInitializer.txt +++ b/compiler/testData/codegen/light-analysis/classes/propertyInInitializer.txt @@ -8,7 +8,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): Outer.InnerDerived } - public class Outer/InnerBase { private final @org.jetbrains.annotations.NotNull field name: java.lang.String synthetic final field this$0: Outer @@ -17,14 +16,12 @@ public class Outer/InnerBase { public final @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public final class Outer/InnerDerived { synthetic final field this$0: Outer inner class Outer/InnerDerived public method (p0: Outer): void } - public final class PropertyInInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/rightHandOverride.txt b/compiler/testData/codegen/light-analysis/classes/rightHandOverride.txt index ce8b5787708..fa95746a76d 100644 --- a/compiler/testData/codegen/light-analysis/classes/rightHandOverride.txt +++ b/compiler/testData/codegen/light-analysis/classes/rightHandOverride.txt @@ -3,16 +3,13 @@ public final class D { public method f(): int } - public interface Left - public class Right { public method (): void public method f(): int } - public final class RightHandOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/sealedInSameFile.txt b/compiler/testData/codegen/light-analysis/classes/sealedInSameFile.txt index 0c58b9ad65e..ceb2a101f11 100644 --- a/compiler/testData/codegen/light-analysis/classes/sealedInSameFile.txt +++ b/compiler/testData/codegen/light-analysis/classes/sealedInSameFile.txt @@ -4,61 +4,50 @@ public abstract class A { private method (p0: int): void } - public final static class A/C { inner class A/C public method (): void } - public final class B { public method (): void } - public final class D { public method (): void } - public final class E { public method (): void public method (p0: int): void } - public final class Q { public method (): void } - public final class S { public final static field INSTANCE: S private method (): void } - public final class SealedInSameFileKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class T { public final static field INSTANCE: T private method (): void } - public abstract class X { private method (): void } - public abstract class Y { private method (): void } - public abstract class Z { private method (): void } diff --git a/compiler/testData/codegen/light-analysis/classes/selfcreate.txt b/compiler/testData/codegen/light-analysis/classes/selfcreate.txt index 0f1f5215bd4..ef342d7eb06 100644 --- a/compiler/testData/codegen/light-analysis/classes/selfcreate.txt +++ b/compiler/testData/codegen/light-analysis/classes/selfcreate.txt @@ -5,12 +5,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method getB(): B } - public final class B { public method (): void } - public final class SelfcreateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/simpleBox.txt b/compiler/testData/codegen/light-analysis/classes/simpleBox.txt index 6022d50f067..03da68f3323 100644 --- a/compiler/testData/codegen/light-analysis/classes/simpleBox.txt +++ b/compiler/testData/codegen/light-analysis/classes/simpleBox.txt @@ -5,7 +5,6 @@ public final class Box { public final method setValue(p0: java.lang.Object): void } - public final class SimpleBoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/classes/typedDelegation.txt b/compiler/testData/codegen/light-analysis/classes/typedDelegation.txt index aff2e5873ca..4e81758598c 100644 --- a/compiler/testData/codegen/light-analysis/classes/typedDelegation.txt +++ b/compiler/testData/codegen/light-analysis/classes/typedDelegation.txt @@ -4,7 +4,6 @@ public interface A { public abstract method zzz(): java.lang.Object } - public final class Base { private @org.jetbrains.annotations.Nullable field zzzValue: java.lang.Object public method (): void @@ -13,12 +12,10 @@ public final class Base { public @org.jetbrains.annotations.Nullable method zzz(): java.lang.Object } - public final class TypedDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { private synthetic final field $$delegate_0: Base public method (): void diff --git a/compiler/testData/codegen/light-analysis/closures/captureExtensionReceiver.txt b/compiler/testData/codegen/light-analysis/closures/captureExtensionReceiver.txt index af11705a03b..4c1b6c6e420 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureExtensionReceiver.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureExtensionReceiver.txt @@ -2,7 +2,6 @@ public interface B { public abstract method getBar(): java.lang.Object } - public final class C { public method (): void public final method extension(@org.jetbrains.annotations.NotNull p0: java.lang.String): int @@ -12,7 +11,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method fooInClassNoReceiver(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class CaptureExtensionReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): B diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/captureFunctionInProperty.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/captureFunctionInProperty.txt index 359dcfce895..536e42af2cc 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/captureFunctionInProperty.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/captureFunctionInProperty.txt @@ -6,12 +6,10 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getx(): java.lang.String } - public final class CaptureFunctionInPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inFunction.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inFunction.txt index e268462b9d3..b4ba010385b 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inFunction.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inFunction.txt @@ -5,12 +5,10 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class InFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inProperty.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inProperty.txt index 39a9cc6b711..9cbcfcf3dbe 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inProperty.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inProperty.txt @@ -5,12 +5,10 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class InPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyDeepObjectChain.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyDeepObjectChain.txt index dc60f9f769b..dd4b3bc258e 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyDeepObjectChain.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyDeepObjectChain.txt @@ -5,12 +5,10 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class InPropertyDeepObjectChainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperClass.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperClass.txt index d16a83b89f2..0d90466efe6 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperClass.txt @@ -3,19 +3,16 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(): T } - public class B { private final @org.jetbrains.annotations.NotNull field x: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class InPropertyFromSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperSuperClass.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperSuperClass.txt index 271465a0541..d017a4d6bf9 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/inPropertyFromSuperSuperClass.txt @@ -4,23 +4,19 @@ public abstract class A { public final method getX(): java.lang.Object } - public class B { public method (): void } - public final class C { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): T } - public final class InPropertyFromSuperSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/kt4176.txt b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/kt4176.txt index 01cc0c10321..4598102451d 100644 --- a/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/kt4176.txt +++ b/compiler/testData/codegen/light-analysis/closures/captureOuterProperty/kt4176.txt @@ -5,12 +5,10 @@ public final class B { public final method getX(): int } - public final class Kt4176Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Z { private final field s: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/closures/closureInsideClosure/propertyAndFunctionNameClash.txt b/compiler/testData/codegen/light-analysis/closures/closureInsideClosure/propertyAndFunctionNameClash.txt index d4a99fa34d9..305243cae26 100644 --- a/compiler/testData/codegen/light-analysis/closures/closureInsideClosure/propertyAndFunctionNameClash.txt +++ b/compiler/testData/codegen/light-analysis/closures/closureInsideClosure/propertyAndFunctionNameClash.txt @@ -4,22 +4,18 @@ public abstract class d/A { public abstract method setText(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class d/HtmlTag { public method (): void } - public final class d/LI { public method (): void } - public class d/ListTag { public method (): void } - public final class d/PropertyAndFunctionNameClashKt { public final static method a(@org.jetbrains.annotations.NotNull p0: d.HtmlTag, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/closures/closureInsideConstrucor.txt b/compiler/testData/codegen/light-analysis/closures/closureInsideConstrucor.txt index d43adc17f5d..377a6ceec30 100644 --- a/compiler/testData/codegen/light-analysis/closures/closureInsideConstrucor.txt +++ b/compiler/testData/codegen/light-analysis/closures/closureInsideConstrucor.txt @@ -2,7 +2,6 @@ public final class ClosureInsideConstrucorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class KModel { private final @org.jetbrains.annotations.NotNull field sourcesInfo: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/closures/enclosingThis.txt b/compiler/testData/codegen/light-analysis/closures/enclosingThis.txt index 9300592ce4d..12d2583d4e6 100644 --- a/compiler/testData/codegen/light-analysis/closures/enclosingThis.txt +++ b/compiler/testData/codegen/light-analysis/closures/enclosingThis.txt @@ -4,7 +4,6 @@ public final class EnclosingThisKt { public final static @org.jetbrains.annotations.NotNull method getM(): kotlin.jvm.functions.Function1 } - public final class Point { private final field x: int private final field y: int diff --git a/compiler/testData/codegen/light-analysis/closures/extensionClosure.txt b/compiler/testData/codegen/light-analysis/closures/extensionClosure.txt index 9370fea0162..9f2d1333e0f 100644 --- a/compiler/testData/codegen/light-analysis/closures/extensionClosure.txt +++ b/compiler/testData/codegen/light-analysis/closures/extensionClosure.txt @@ -3,7 +3,6 @@ public final class ExtensionClosureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Point { private final field x: int private final field y: int diff --git a/compiler/testData/codegen/light-analysis/closures/kt10044.txt b/compiler/testData/codegen/light-analysis/closures/kt10044.txt index adac127a3f4..f9e743964c1 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt10044.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt10044.txt @@ -6,7 +6,6 @@ public final class Example { public final method setResult(@org.jetbrains.annotations.Nullable p0: java.lang.String): void } - public final class Example2 { private field obj: JClass private @org.jetbrains.annotations.Nullable field result: java.lang.String @@ -15,13 +14,11 @@ public final class Example2 { public final method setResult(@org.jetbrains.annotations.Nullable p0: java.lang.String): void } - public class JClass { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class Kt10044Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt11634.txt b/compiler/testData/codegen/light-analysis/closures/kt11634.txt index e03b74789e7..81cfdca6756 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt11634.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt11634.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class AFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(): A } - public final class AImpl { private final @org.jetbrains.annotations.NotNull field z: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -16,14 +14,12 @@ public final class AImpl { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class AWrapperFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(): A public final @org.jetbrains.annotations.NotNull method createMyA(): A } - public final class Kt11634Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt11634_2.txt b/compiler/testData/codegen/light-analysis/closures/kt11634_2.txt index f62165a8e79..2792cebee6e 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt11634_2.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt11634_2.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class AFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(@org.jetbrains.annotations.NotNull p0: java.lang.String): A } - public final class AImpl { private final @org.jetbrains.annotations.NotNull field z: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -16,14 +14,12 @@ public final class AImpl { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class AWrapperFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(@org.jetbrains.annotations.NotNull p0: java.lang.String): A public final @org.jetbrains.annotations.NotNull method createMyA(): A } - public final class Kt11634_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt11634_3.txt b/compiler/testData/codegen/light-analysis/closures/kt11634_3.txt index 94b27ac8b26..f65d32a2a2b 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt11634_3.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt11634_3.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class AFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(@org.jetbrains.annotations.NotNull p0: java.lang.String): A } - public final class AImpl { private final @org.jetbrains.annotations.NotNull field z: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -16,14 +14,12 @@ public final class AImpl { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class AWrapperFabric { public method (): void public @org.jetbrains.annotations.NotNull method createA(@org.jetbrains.annotations.NotNull p0: java.lang.String): A public final @org.jetbrains.annotations.NotNull method createMyA(): A } - public final class Kt11634_3Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt11634_4.txt b/compiler/testData/codegen/light-analysis/closures/kt11634_4.txt index 21cf57c7128..334951b1e3f 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt11634_4.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt11634_4.txt @@ -2,7 +2,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class Base { private final @org.jetbrains.annotations.NotNull field a: A private final @org.jetbrains.annotations.NotNull field p: java.lang.String @@ -11,7 +10,6 @@ public class Base { public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String } - public class Derived1 { private final @org.jetbrains.annotations.NotNull field a: A inner class Derived1/Derived2 @@ -19,7 +17,6 @@ public class Derived1 { public @org.jetbrains.annotations.NotNull method getA(): A } - public final class Derived1/Derived2 { synthetic final field this$0: Derived1 private final @org.jetbrains.annotations.NotNull field x: A @@ -28,7 +25,6 @@ public final class Derived1/Derived2 { public final @org.jetbrains.annotations.NotNull method getX(): A } - public final class Kt11634_4Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt3152.txt b/compiler/testData/codegen/light-analysis/closures/kt3152.txt index 7f2c75d9281..b8fce6c3544 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt3152.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt3152.txt @@ -2,7 +2,6 @@ public final class Kt3152Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private final field content: int inner class Test/A @@ -10,7 +9,6 @@ public final class Test { public final method getContent(): int } - public final class Test/A { synthetic final field this$0: Test private final @org.jetbrains.annotations.NotNull field v: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/closures/kt3523.txt b/compiler/testData/codegen/light-analysis/closures/kt3523.txt index d1cfa12de0d..09a78afe547 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt3523.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt3523.txt @@ -3,13 +3,11 @@ public class Base { public final method doSomething(): void } - public final class Foo { inner class Foo/Bar public method (): void } - public final class Foo/Bar { synthetic final field this$0: Foo private final @org.jetbrains.annotations.NotNull field x: X @@ -18,12 +16,10 @@ public final class Foo/Bar { public final @org.jetbrains.annotations.NotNull method getX(): X } - public final class Kt3523Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { private final @org.jetbrains.annotations.NotNull field action: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/closures/kt3738.txt b/compiler/testData/codegen/light-analysis/closures/kt3738.txt index 447ce427fb2..34896d654ce 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt3738.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt3738.txt @@ -5,19 +5,16 @@ public final class A { public final method foo(): void } - public final class B { inner class B/D public method (): void } - public final static class B/D { inner class B/D public method (): void } - public final class Kt3738Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt4106.txt b/compiler/testData/codegen/light-analysis/closures/kt4106.txt index 305e6b0277d..a87fd1eb94d 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt4106.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt4106.txt @@ -6,7 +6,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getF(): Foo.Inner } - public final class Foo/Inner { synthetic final field this$0: Foo private final field x: java.lang.String @@ -14,7 +13,6 @@ public final class Foo/Inner { public method (p0: Foo): void } - public final class Kt4106Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/kt4137.txt b/compiler/testData/codegen/light-analysis/closures/kt4137.txt index 73c8d820e0b..2deb842c2e8 100644 --- a/compiler/testData/codegen/light-analysis/closures/kt4137.txt +++ b/compiler/testData/codegen/light-analysis/closures/kt4137.txt @@ -4,12 +4,10 @@ public class A { public final method getS(): int } - public class B { public method (): void } - public final class Kt4137Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(p0: int, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/closures/noRefToOuter.txt b/compiler/testData/codegen/light-analysis/closures/noRefToOuter.txt index 92d48f503c5..568c2bf3c18 100644 --- a/compiler/testData/codegen/light-analysis/closures/noRefToOuter.txt +++ b/compiler/testData/codegen/light-analysis/closures/noRefToOuter.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method f(): kotlin.jvm.functions.Function0 } - public final class NoRefToOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/closures/subclosuresWithinInitializers.txt b/compiler/testData/codegen/light-analysis/closures/subclosuresWithinInitializers.txt index 88927876e01..963fc2e5ab2 100644 --- a/compiler/testData/codegen/light-analysis/closures/subclosuresWithinInitializers.txt +++ b/compiler/testData/codegen/light-analysis/closures/subclosuresWithinInitializers.txt @@ -5,7 +5,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getOuterProp(): java.lang.String } - public final class SubclosuresWithinInitializersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method inlineRun(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/collections/charSequence.txt b/compiler/testData/codegen/light-analysis/collections/charSequence.txt index f8227f69984..b2bb1c8a335 100644 --- a/compiler/testData/codegen/light-analysis/collections/charSequence.txt +++ b/compiler/testData/codegen/light-analysis/collections/charSequence.txt @@ -8,7 +8,6 @@ public class A { public @org.jetbrains.annotations.NotNull method subSequence(p0: int, p1: int): java.lang.CharSequence } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/implementCollectionThroughKotlin.txt b/compiler/testData/codegen/light-analysis/collections/implementCollectionThroughKotlin.txt index d22476313f6..604b91de914 100644 --- a/compiler/testData/codegen/light-analysis/collections/implementCollectionThroughKotlin.txt +++ b/compiler/testData/codegen/light-analysis/collections/implementCollectionThroughKotlin.txt @@ -3,7 +3,6 @@ public final class ListImpl { public method getSize(): int } - public abstract class MyList { public method (): void public synthetic method add(p0: int, p1: java.lang.Object): void @@ -35,7 +34,6 @@ public abstract class MyList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequence.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequence.txt index e29f8b392aa..4b680cc28f6 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequence.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequence.txt @@ -2,7 +2,6 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void public final method charAt(p0: int): char diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequenceKotlin.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequenceKotlin.txt index b29465c3053..ce2796d8810 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequenceKotlin.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantImplCharSequenceKotlin.txt @@ -4,12 +4,10 @@ public abstract class AImpl { public final method length(): int } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableList.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableList.txt index 3f0527944f0..de538ea827b 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableList.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableList.txt @@ -2,7 +2,6 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void public final method indexOf(p0: java.lang.Object): int diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListKotlin.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListKotlin.txt index 383045856a4..61e6d17c197 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListKotlin.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListKotlin.txt @@ -23,12 +23,10 @@ public abstract class AImpl { public final @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListSubstitution.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListSubstitution.txt index 08dcc095315..9cf76647667 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListSubstitution.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantImplMutableListSubstitution.txt @@ -2,7 +2,6 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void public method getSize(): int diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantRemoveAtOverrideInJava.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantRemoveAtOverrideInJava.txt index e052b8fae4f..8facd043f87 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantRemoveAtOverrideInJava.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantRemoveAtOverrideInJava.txt @@ -35,12 +35,10 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public interface Container { public abstract @org.jetbrains.annotations.NotNull method removeAt(p0: int): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/irrelevantSizeOverrideInJava.txt b/compiler/testData/codegen/light-analysis/collections/irrelevantSizeOverrideInJava.txt index c238fa915a8..25ee8aa4e36 100644 --- a/compiler/testData/codegen/light-analysis/collections/irrelevantSizeOverrideInJava.txt +++ b/compiler/testData/codegen/light-analysis/collections/irrelevantSizeOverrideInJava.txt @@ -15,12 +15,10 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public interface Sized { public abstract method getSize(): int } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/mutableList.txt b/compiler/testData/codegen/light-analysis/collections/mutableList.txt index 7010b352483..8f0a68884ec 100644 --- a/compiler/testData/codegen/light-analysis/collections/mutableList.txt +++ b/compiler/testData/codegen/light-analysis/collections/mutableList.txt @@ -27,7 +27,6 @@ public class KList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/noStubsInJavaSuperClass.txt b/compiler/testData/codegen/light-analysis/collections/noStubsInJavaSuperClass.txt index 6be055f2f23..139817f2823 100644 --- a/compiler/testData/codegen/light-analysis/collections/noStubsInJavaSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/collections/noStubsInJavaSuperClass.txt @@ -16,7 +16,6 @@ public class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class C { public method (): void public method add(p0: int, p1: java.lang.Object): void @@ -31,10 +30,8 @@ public final class C { public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List } - public interface L - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/platformValueContains.txt b/compiler/testData/codegen/light-analysis/collections/platformValueContains.txt index c5ec7e04d30..a0016813088 100644 --- a/compiler/testData/codegen/light-analysis/collections/platformValueContains.txt +++ b/compiler/testData/codegen/light-analysis/collections/platformValueContains.txt @@ -18,7 +18,6 @@ public final class MySet { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/readOnlyList.txt b/compiler/testData/codegen/light-analysis/collections/readOnlyList.txt index 201ae97f445..7f13c95aa80 100644 --- a/compiler/testData/codegen/light-analysis/collections/readOnlyList.txt +++ b/compiler/testData/codegen/light-analysis/collections/readOnlyList.txt @@ -26,7 +26,6 @@ public class KList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/readOnlyMap.txt b/compiler/testData/codegen/light-analysis/collections/readOnlyMap.txt index c3aed98e932..87461ecd04b 100644 --- a/compiler/testData/codegen/light-analysis/collections/readOnlyMap.txt +++ b/compiler/testData/codegen/light-analysis/collections/readOnlyMap.txt @@ -18,7 +18,6 @@ public class KMap { public final method values(): java.util.Collection } - public final class TestKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/removeAtInt.txt b/compiler/testData/codegen/light-analysis/collections/removeAtInt.txt index 69b8aa3fcdd..8d49c0ff649 100644 --- a/compiler/testData/codegen/light-analysis/collections/removeAtInt.txt +++ b/compiler/testData/codegen/light-analysis/collections/removeAtInt.txt @@ -36,7 +36,6 @@ public class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/strList.txt b/compiler/testData/codegen/light-analysis/collections/strList.txt index 01f036e09a1..441e309efd9 100644 --- a/compiler/testData/codegen/light-analysis/collections/strList.txt +++ b/compiler/testData/codegen/light-analysis/collections/strList.txt @@ -36,7 +36,6 @@ public abstract class KList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class TestKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/collections/toArrayInJavaClass.txt b/compiler/testData/codegen/light-analysis/collections/toArrayInJavaClass.txt index c901ae53fb8..2dcf24ef808 100644 --- a/compiler/testData/codegen/light-analysis/collections/toArrayInJavaClass.txt +++ b/compiler/testData/codegen/light-analysis/collections/toArrayInJavaClass.txt @@ -16,7 +16,6 @@ public class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class MainKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/compatibility/dataClassEqualsHashCodeToString.txt b/compiler/testData/codegen/light-analysis/compatibility/dataClassEqualsHashCodeToString.txt index f54c2e5269b..10e8243fa23 100644 --- a/compiler/testData/codegen/light-analysis/compatibility/dataClassEqualsHashCodeToString.txt +++ b/compiler/testData/codegen/light-analysis/compatibility/dataClassEqualsHashCodeToString.txt @@ -2,7 +2,6 @@ public final class DataClassEqualsHashCodeToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/constants/kt9532.txt b/compiler/testData/codegen/light-analysis/constants/kt9532.txt index 50e0e8b2481..ce160eace34 100644 --- a/compiler/testData/codegen/light-analysis/constants/kt9532.txt +++ b/compiler/testData/codegen/light-analysis/constants/kt9532.txt @@ -10,7 +10,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getBNullable(): java.lang.String } - public final class B { public final static field INSTANCE: B public final static @org.jetbrains.annotations.NotNull field a: java.lang.String @@ -23,7 +22,6 @@ public final class B { public final @org.jetbrains.annotations.NotNull method getBNullable(): java.lang.String } - public final class Kt9532Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/controlStructures/emptyFor.txt b/compiler/testData/codegen/light-analysis/controlStructures/emptyFor.txt index f147d5cd022..9ca2330d168 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/emptyFor.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/emptyFor.txt @@ -7,13 +7,11 @@ public final class EmptyForKt { public final static method setIndex(p0: int): void } - public interface IterableIterator { inner class IterableIterator/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class IterableIterator/DefaultImpls { inner class IterableIterator/DefaultImpls public static @org.jetbrains.annotations.NotNull method iterator(p0: IterableIterator): java.util.Iterator diff --git a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionAll.txt b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionAll.txt index e31ff33c2db..9cb07efae2f 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionAll.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionAll.txt @@ -2,18 +2,15 @@ public final class C { public method (): void } - public final class ForLoopMemberExtensionAllKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(p0: int): void } - public final class It { public method (): void } - public final class X { private field hasNext: boolean public method (): void diff --git a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionHasNext.txt b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionHasNext.txt index 6e6d28d05f5..701fa8f31b3 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionHasNext.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionHasNext.txt @@ -3,19 +3,16 @@ public final class C { public final @org.jetbrains.annotations.NotNull method iterator(): It } - public final class ForLoopMemberExtensionHasNextKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(p0: int): void } - public final class It { public method (): void public final method next(): int } - public final class X { private field hasNext: boolean public method (): void diff --git a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionNext.txt b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionNext.txt index a7eeef4de6f..4d5915455c2 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionNext.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/forLoopMemberExtensionNext.txt @@ -3,13 +3,11 @@ public final class C { public final @org.jetbrains.annotations.NotNull method iterator(): It } - public final class ForLoopMemberExtensionNextKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(p0: int): void } - public final class It { private field hasNext: boolean public method (): void @@ -18,7 +16,6 @@ public final class It { public final method setHasNext(p0: boolean): void } - public final class X { public method (): void public final method next(@org.jetbrains.annotations.NotNull p0: It): int diff --git a/compiler/testData/codegen/light-analysis/controlStructures/forUserType.txt b/compiler/testData/codegen/light-analysis/controlStructures/forUserType.txt index e7f5129bf94..c5aa757483e 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/forUserType.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/forUserType.txt @@ -2,14 +2,12 @@ public final class ForUserTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyCollection1 { inner class MyCollection1/MyIterator public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final static class MyCollection1/MyIterator { private field k: int inner class MyCollection1/MyIterator @@ -22,14 +20,12 @@ public final static class MyCollection1/MyIterator { public final method setK(p0: int): void } - public final class MyCollection2 { inner class MyCollection2/MyIterator public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final static class MyCollection2/MyIterator { private field k: int inner class MyCollection2/MyIterator @@ -42,14 +38,12 @@ public final static class MyCollection2/MyIterator { public final method setK(p0: int): void } - public final class MyCollection3 { inner class MyCollection3/MyIterator public method (): void public final @org.jetbrains.annotations.NotNull method iterator(): MyCollection3.MyIterator } - public final static class MyCollection3/MyIterator { private field k: int inner class MyCollection3/MyIterator @@ -60,14 +54,12 @@ public final static class MyCollection3/MyIterator { public final method setK(p0: int): void } - public final class MyCollection4 { inner class MyCollection4/MyIterator public method (): void public final @org.jetbrains.annotations.NotNull method iterator(): MyCollection4.MyIterator } - public final static class MyCollection4/MyIterator { private field k: int inner class MyCollection4/MyIterator diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt1441.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt1441.txt index eaf7f8f2f9d..c14a9e77395 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt1441.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt1441.txt @@ -6,7 +6,6 @@ public final class Foo { public final method setRnd(p0: int): void } - public final class Kt1441Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt2147.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt2147.txt index 6790b784b95..15842fc3091 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt2147.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt2147.txt @@ -3,7 +3,6 @@ public final class Foo { public final method isOk(): boolean } - public final class Kt2147Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt237.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt237.txt index 6e663c6ade0..96c225cb31d 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt237.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt237.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class C { private final field value: java.lang.Object public method (p0: java.lang.Object): void @@ -10,7 +9,6 @@ public final class C { public final method getValue(): java.lang.Object } - public final class Kt237Kt { public final static method almostFilter(@org.jetbrains.annotations.NotNull p0: java.lang.Integer[], @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt299.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt299.txt index ec2ca937d8d..66edf04d399 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt299.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt299.txt @@ -2,7 +2,6 @@ public final class Kt299Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyRange1 { public method (): void public method contains(p0: int): boolean @@ -14,7 +13,6 @@ public final class MyRange1 { public method isEmpty(): boolean } - public final class MyRange2 { public method (): void public final method contains(p0: int): boolean diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt513.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt513.txt index bd08f900eff..89a09c9bd7b 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt513.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt513.txt @@ -4,7 +4,6 @@ public final class A { public final method test(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): void } - public final class Kt513Kt { public final static method add2(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList, p1: java.lang.Object): boolean public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt628.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt628.txt index 35733d6ade6..3cb487f4254 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt628.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt628.txt @@ -7,7 +7,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method infix(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Kt628Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test1(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt8148.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt8148.txt index 556366b3933..5568e3431c1 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt8148.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt8148.txt @@ -5,7 +5,6 @@ public final class A { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt8148Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt8148_break.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt8148_break.txt index cb4bdf317f3..8acb2fe0973 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt8148_break.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt8148_break.txt @@ -5,7 +5,6 @@ public final class A { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt8148_breakKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/kt8148_continue.txt b/compiler/testData/codegen/light-analysis/controlStructures/kt8148_continue.txt index 12b325a0294..0ec954beb10 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/kt8148_continue.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/kt8148_continue.txt @@ -5,7 +5,6 @@ public final class A { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt8148_continueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/controlStructures/returnsNothing/propertyGetter.txt b/compiler/testData/codegen/light-analysis/controlStructures/returnsNothing/propertyGetter.txt index cb512b3ac04..c3da344e592 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/returnsNothing/propertyGetter.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/returnsNothing/propertyGetter.txt @@ -5,7 +5,6 @@ public final class PropertyGetterKt { public final static method setFlag(p0: boolean): void } - public final class Test { public final static field INSTANCE: Test private method (): void diff --git a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/kt8608.txt b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/kt8608.txt index 4df84ae5bda..ab67af08590 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/kt8608.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/kt8608.txt @@ -4,12 +4,10 @@ public final class A { private final method x(): void } - public interface Callable { public abstract method call(p0: boolean): void } - public final class Kt8608Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/multipleCatchBlocks.txt b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/multipleCatchBlocks.txt index 77cd06b347e..21eed3c9d00 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/multipleCatchBlocks.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/multipleCatchBlocks.txt @@ -2,17 +2,14 @@ public final class Exception1 { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Exception2 { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Exception3 { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MultipleCatchBlocksKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/tryInsideTry.txt b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/tryInsideTry.txt index 331e834092c..de68bfa73e9 100644 --- a/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/tryInsideTry.txt +++ b/compiler/testData/codegen/light-analysis/controlStructures/tryCatchInExpressions/tryInsideTry.txt @@ -2,7 +2,6 @@ public final class MyException { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class TryInsideTryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt b/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt index e267e8c3fc3..b4b7e6545bb 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/asyncIterator.txt @@ -2,7 +2,6 @@ public interface AsyncGenerator { public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class AsyncGeneratorIterator { private @org.jetbrains.annotations.Nullable field computeContinuation: kotlin.coroutines.Continuation private field computedNext: boolean @@ -32,31 +31,26 @@ public final class AsyncGeneratorIterator { public @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public interface AsyncIterator { public abstract @org.jetbrains.annotations.Nullable method hasNext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object public abstract @org.jetbrains.annotations.Nullable method next(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class AsyncIteratorKt { public final static @org.jetbrains.annotations.NotNull method asyncGenerate(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): AsyncSequence public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void } - public interface AsyncSequence { public abstract @org.jetbrains.annotations.NotNull method iterator(): AsyncIterator } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/await.txt b/compiler/testData/codegen/light-analysis/coroutines/await.txt index bc6940c2d72..0578f31cb06 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/await.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/await.txt @@ -8,13 +8,11 @@ public final class AwaitKt { public final static @org.jetbrains.annotations.NotNull method getLog(): java.lang.String } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -22,13 +20,11 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method test(): Promise } - public final class Promise { private final field executor: kotlin.jvm.functions.Function1 private field thenList: java.util.List @@ -37,7 +33,6 @@ public final class Promise { public final @org.jetbrains.annotations.NotNull method then(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Promise } - public final class QueueKt { private final static field queue: java.util.List public final static @org.jetbrains.annotations.NotNull method postpone(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): Promise diff --git a/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt b/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt index e1fed45a476..09576ea41d3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithException.txt @@ -4,13 +4,11 @@ public final class BeginWithExceptionKt { public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt b/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt index 9f7c37b02e1..356dd4f6066 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/beginWithExceptionNoHandleException.txt @@ -4,13 +4,11 @@ public final class BeginWithExceptionNoHandleExceptionKt { public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt b/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt index 258c4299b98..321327efe4c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/coercionToUnit.txt @@ -10,13 +10,11 @@ public final class CoercionToUnitKt { public final static method setTRUE(p0: boolean): void } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt index db4c3075a6d..3d7b320a69f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakFinally.txt @@ -3,7 +3,6 @@ public final class BreakFinallyKt { public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String } - public final class Controller { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void @@ -12,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt index a2ad9fc66fc..2229bd4f099 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/breakStatement.txt @@ -3,7 +3,6 @@ public final class BreakStatementKt { public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String } - public final class Controller { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void @@ -12,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt index 92db2b48cb1..03b777c03de 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/doWhileStatement.txt @@ -6,19 +6,16 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class DoWhileStatementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt index 21825a8597a..b9989987000 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forContinue.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ForContinueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt index 49f601f39af..b843cc4e154 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/forStatement.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ForStatementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt index 40dd76c9936..b2ab0979927 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/ifStatement.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class IfStatementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt index bf0c9b0ae1c..6f17b09d911 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/switchLikeWhen.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SwitchLikeWhenKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt index f6d2bca6fe0..e47c495dffe 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwFromCatch.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendLogAndThrow(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ThrowFromCatchKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt index c62e08e0e1b..9a5f5c7b73f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/throwInTryWithHandleResult.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ThrowInTryWithHandleResultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt index d32c20cdd51..afe5d1c8fb0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controlFlow/whileStatement.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithResult(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class WhileStatementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt index 4005fee469f..dff914e34e0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/controllerAccessFromInnerLambda.txt @@ -7,20 +7,17 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class ControllerAccessFromInnerLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void public final static method noinlineRun(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt b/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt index 5ec1fd94603..1ebc9d65c5b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/defaultParametersInSuspend.txt @@ -4,19 +4,16 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class DefaultParametersInSuspendKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt b/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt index d5f130d6389..a7d27f24d11 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/dispatchResume.txt @@ -1,4 +1,3 @@ - public final class Controller { private @org.jetbrains.annotations.NotNull field log: java.lang.String private field resumeIndex: int @@ -11,22 +10,19 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class DispatchResumeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt b/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt index 33eeeaf0de1..7593b0ea715 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/emptyClosure.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyClosureKt { private static field result: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -18,7 +16,6 @@ public final class EmptyClosureKt { public final static method setResult(p0: int): void } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt b/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt index 8c6a9f82936..6a05a1f4362 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/falseUnitCoercion.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class FalseUnitCoercionKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/generate.txt b/compiler/testData/codegen/light-analysis/coroutines/generate.txt index bdbadbd84c1..bc5c5ffe575 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/generate.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/generate.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class GenerateKt { private static field was: boolean public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -21,7 +19,6 @@ public final class GenerateKt { public final static method setWas(p0: boolean): void } - public final class GeneratedIterator { private field nextStep: kotlin.coroutines.Continuation public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void @@ -29,14 +26,12 @@ public final class GeneratedIterator { public @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class GeneratedSequence { private final field block: kotlin.jvm.functions.Function2 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public interface Generator { public abstract @org.jetbrains.annotations.Nullable method yield(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleException.txt b/compiler/testData/codegen/light-analysis/coroutines/handleException.txt index 450bd6ac4e0..66acc428b6f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleException.txt @@ -10,13 +10,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -24,7 +22,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class HandleExceptionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt index d9f6d6675a1..441012463cd 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultCallEmptyBody.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class HandleResultCallEmptyBodyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt index 0c2d34e6053..d86126990f3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultNonUnitExpression.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class HandleResultNonUnitExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt b/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt index e65913d62f2..500bf80b6ad 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/handleResultSuspended.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendAndLog(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class HandleResultSuspendedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt index 8987888ae98..7232604c2f8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/illegalState.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class IllegalStateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder1(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt b/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt index d3ea2389746..e5c3a9d8ff3 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/inlineSuspendFunction.txt @@ -6,13 +6,11 @@ public final class Controller { public final method withValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): void } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,13 +18,11 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class InlineSuspendFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void } - public final class OK { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt index da7712c029b..35fe3841d11 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/inlinedTryCatchFinally.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class InlinedTryCatchFinallyKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String private static field wasCalled: boolean diff --git a/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt index 8e9306a2a8f..ad82c0d90d4 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/innerSuspensionCalls.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class InnerSuspensionCallsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt index f174463e8ca..7d2a5b4ceae 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/instanceOfContinuation.txt @@ -4,13 +4,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method runInstanceOf(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -18,7 +16,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class InstanceOfContinuationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt index 5f342b7af04..dbb4f600c5a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/complicatedMerge.txt @@ -6,19 +6,16 @@ public final class ComplicatedMergeKt { public final static method setBooleanRes(p0: boolean): void } - public final class Controller { public method (): void public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt index c479aff2ff1..06e64e06aec 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/i2bResult.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class I2bResultKt { private static field byteResult: byte public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt index d1729caf12f..f093cc23cc0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromBooleanArray.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LoadFromBooleanArrayKt { private static field booleanResult: boolean public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt index f36c58276e6..2e19f548432 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/loadFromByteArray.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LoadFromByteArrayKt { private static field byteResult: byte public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt index ce16a6b37e2..85a5257ed1b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/noVariableInTable.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class NoVariableInTableKt { private static field booleanResult: boolean public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt index 09038139553..9522b7abea7 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/sameIconst1ManyVars.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SameIconst1ManyVarsKt { private static field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt index 7ccc15e1eb0..df6540231dc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInArrayStore.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class UsedInArrayStoreKt { public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field booleanResult: boolean[] public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field byteResult: byte[] diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt index 4e9de0e4a39..f4c2251b2a2 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInMethodCall.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class UsedInMethodCallKt { private static field booleanResult: boolean private static field byteResult: byte diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt index 71573ffae85..c427f49f448 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInPutfield.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class UsedInPutfieldKt { public static @kotlin.jvm.JvmField field booleanResult: boolean public static @kotlin.jvm.JvmField field byteResult: byte diff --git a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt index 8005ebf8fe0..6966a6b37d0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/intLikeVarSpilling/usedInVarStore.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class UsedInVarStoreKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt index db42dfa97cf..21f13c65b5f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/iterateOverArray.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class IterateOverArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt index 63614dfbf58..ca1386b4aa8 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/kt12958.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class Kt12958Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/lambdaParameters.txt b/compiler/testData/codegen/light-analysis/coroutines/lambdaParameters.txt deleted file mode 100644 index 1f148f02095..00000000000 --- a/compiler/testData/codegen/light-analysis/coroutines/lambdaParameters.txt +++ /dev/null @@ -1,12 +0,0 @@ -public final class Controller { - public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - - -public final class LambdaParametersKt { - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function3): void - public final static @org.jetbrains.annotations.NotNull method inline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String - public final static @org.jetbrains.annotations.NotNull method noinline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String -} diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt index 677d5727beb..3ea2342b561 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastExpressionIsLoop.txt @@ -9,13 +9,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -23,7 +21,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LastExpressionIsLoopKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt index 906c3380fcb..b3f57ee982b 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastStatementInc.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LastStatementIncKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt b/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt index 33e61f9eebb..5d0c86650b7 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastStementAssignment.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LastStementAssignmentKt { private static @org.jetbrains.annotations.NotNull field varWithCustomSetter: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt index ec9ed843b5e..795d9de33da 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/lastUnitExpression.txt @@ -9,13 +9,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -23,7 +21,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class LastUnitExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/manualContinuationImpl.txt b/compiler/testData/codegen/light-analysis/coroutines/manualContinuationImpl.txt deleted file mode 100644 index 012f0c156df..00000000000 --- a/compiler/testData/codegen/light-analysis/coroutines/manualContinuationImpl.txt +++ /dev/null @@ -1,10 +0,0 @@ -public final class Controller { - public method (): void - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} - - -public final class ManualContinuationImplKt { - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void -} diff --git a/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt index 8151cb8d907..5d9b315f6a2 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multiModule/simple.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,13 +10,11 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void } - public final class lib/Controller { public method (): void public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt index a5d73195fcd..20008bcada1 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCalls.txt @@ -11,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -25,7 +23,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MultipleInvokeCallsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt index 3fe89b34e9e..4d32981ae65 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda1.txt @@ -11,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -25,7 +23,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MultipleInvokeCallsInsideInlineLambda1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt index 1ee23d2b301..8f58fa3c0aa 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda2.txt @@ -11,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -25,7 +23,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MultipleInvokeCallsInsideInlineLambda2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt index ac1bb000820..6dcd595b83a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/multipleInvokeCallsInsideInlineLambda3.txt @@ -11,13 +11,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -25,7 +23,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class MultipleInvokeCallsInsideInlineLambda3Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt index 1a4346cf8d2..903c4aa07bf 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nestedTryCatch.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class NestedTryCatchKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String private static field wasCalled: boolean diff --git a/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt index 24507948132..ffc56a7247a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/noSuspensionPoints.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class NoSuspensionPointsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int diff --git a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt index 87e7319f22a..f257fcbaebf 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambda.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class NonLocalReturnFromInlineLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Controller diff --git a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt index 1e27d46f4dd..55632633345 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/nonLocalReturnFromInlineLambdaDeep.txt @@ -6,13 +6,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -20,7 +18,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class NonLocalReturnFromInlineLambdaDeepKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Controller diff --git a/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt index 10312036733..58bc196835f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/returnByLabel.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ReturnByLabelKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int diff --git a/compiler/testData/codegen/light-analysis/coroutines/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/simple.txt index 317cb1e1133..f8fd9542981 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simple.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt b/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt index 5b523044663..8caeea33505 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simpleException.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SimpleExceptionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt index fd744e7a446..8473b560ab7 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/simpleWithHandleResult.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SimpleWithHandleResultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt index 1588df80c99..4f335a28424 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/exception.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class ExceptionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt index 98024476eb6..34133a5afc0 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/inlineSuspendFunction.txt @@ -5,13 +5,11 @@ public final class Controller { private final method suspendInline(p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -19,13 +17,11 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class InlineSuspendFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void } - public final class OK { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt index 0f01e9be74c..f19c87871bc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/simple.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt index 7429c2766c4..7aef02369ea 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/stackUnwinding/suspendInCycle.txt @@ -4,13 +4,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -18,7 +16,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendInCycleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt index abfc5411fd5..71486eafeb6 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/statementLikeLastExpression.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class StatementLikeLastExpressionKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt index 79f012dd527..74e57d89af5 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendDelegation.txt @@ -4,13 +4,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -18,7 +16,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt index 900a7a603d3..d450ed1864c 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendFromInlineLambda.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendFromInlineLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt index 70a4af7ecad..284032a668e 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInCycle.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendInCycleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt index 05052377d41..1cfa00e38f9 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/suspendInTheMiddleOfObjectConstruction.txt @@ -7,7 +7,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field first: java.lang.String private final @org.jetbrains.annotations.NotNull field second: java.lang.String @@ -19,7 +18,6 @@ public final class B { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class C { private final field first: long private final field second: double @@ -31,7 +29,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class Controller { public method (): void public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object @@ -39,13 +36,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithDouble(p0: double, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -53,7 +48,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendInTheMiddleOfObjectConstructionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt index 7c4c6aeccc3..a701a119a87 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchFinallyWithHandleResult.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class TryCatchFinallyWithHandleResultKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String private static field wasCalled: boolean diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt index a158d9fd485..9c92ac87892 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryCatchWithHandleResult.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class TryCatchWithHandleResultKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String private static field wasCalled: boolean diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt index 690803ff4da..f78d84b9971 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyInsideInlineLambda.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class TryFinallyInsideInlineLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt index aa09ffa744f..b0f5ee21a4d 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tryFinallyWithHandleResult.txt @@ -7,13 +7,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendWithValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -21,7 +19,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class TryFinallyWithHandleResultKt { private static @org.jetbrains.annotations.NotNull field globalResult: java.lang.String private static field wasCalled: boolean diff --git a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt index 4e055e4a9b0..ad7d66a72bc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineNonLocalReturn.txt @@ -4,13 +4,11 @@ public final class CoroutineNonLocalReturnKt { public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt index eadf509b64e..9d933297d7a 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/coroutineReturn.txt @@ -4,13 +4,11 @@ public final class CoroutineReturnKt { public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt index 3603b7480c9..c02ac2ad86e 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendNonLocalReturn.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendNonLocalReturnKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt index 2081d32289d..870b0d44580 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/unitTypeReturn/suspendReturn.txt @@ -3,7 +3,6 @@ public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -11,7 +10,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class SuspendReturnKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt index 4f88a3a2ac5..d7d9fc56ff6 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTable.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class VarValueConflictsWithTableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt index a47bd424f8e..7920f15a9bf 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/varValueConflictsWithTableSameSort.txt @@ -3,13 +3,11 @@ public final class Controller { public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } - public final class CoroutineUtilKt { public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } - public final class EmptyContinuation { public final static field INSTANCE: EmptyContinuation private method (): void @@ -17,7 +15,6 @@ public final class EmptyContinuation { public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } - public final class VarValueConflictsWithTableSameSortKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/light-analysis/dataClasses/arrayParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/arrayParams.txt index 14c4e997c35..1bbbfedffda 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/arrayParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/arrayParams.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class ArrayParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Integer[], @org.jetbrains.annotations.NotNull p1: int[]): A diff --git a/compiler/testData/codegen/light-analysis/dataClasses/changingVarParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/changingVarParam.txt index 10ddc956d97..4ad09753ca1 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/changingVarParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/changingVarParam.txt @@ -11,7 +11,6 @@ public final class A { public method toString(): java.lang.String } - public final class ChangingVarParamKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/constructorWithDefaultParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/constructorWithDefaultParam.txt index 7527b70fe0f..e79a971bbb7 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/constructorWithDefaultParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/constructorWithDefaultParam.txt @@ -15,7 +15,6 @@ public final class A { public method toString(): java.lang.String } - public final class ConstructorWithDefaultParamKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/copyInObjectNestedDataClass.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/copyInObjectNestedDataClass.txt index dd75a983de5..36f6edfc16b 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/copyInObjectNestedDataClass.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/copyInObjectNestedDataClass.txt @@ -4,12 +4,10 @@ public final class Bar { public final @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public final class CopyInObjectNestedDataClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class Foo { public method (): void public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/kt12708.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/kt12708.txt index a3ea257022f..2e737b7c155 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/kt12708.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/kt12708.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method copy(p0: int): A } - public final class B { private final field x: int public method (p0: int): void @@ -18,7 +17,6 @@ public final class B { public method toString(): java.lang.String } - public final class Kt12708Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/kt3033.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/kt3033.txt index 38d5e665b14..5607b6f3f32 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/kt3033.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/kt3033.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class Kt3033Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/valInConstructorParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/valInConstructorParams.txt index 00ea9989a87..18a871a5acd 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/valInConstructorParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/valInConstructorParams.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class ValInConstructorParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/varInConstructorParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/varInConstructorParams.txt index a651d4c1f2a..5b007341f11 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/varInConstructorParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/varInConstructorParams.txt @@ -15,7 +15,6 @@ public final class A { public method toString(): java.lang.String } - public final class VarInConstructorParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/copy/withGenericParameter.txt b/compiler/testData/codegen/light-analysis/dataClasses/copy/withGenericParameter.txt index 87e4c3ee0f9..579471dc672 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/copy/withGenericParameter.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/copy/withGenericParameter.txt @@ -10,14 +10,12 @@ public final class A { public method toString(): java.lang.String } - public final class Foo { private final field a: java.lang.Object public method (p0: java.lang.Object): void public final method getA(): java.lang.Object } - public final class WithGenericParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/doubleParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/doubleParam.txt index e5d666de252..c70f10034f4 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/doubleParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/doubleParam.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class DoubleParamKt { private final static field NAN: double public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclared.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclared.txt index 5390ecb4faa..43ee2e7c78e 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclared.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclared.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class AlreadyDeclaredKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclaredWrongSignature.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclaredWrongSignature.txt index 58ae08c49ca..5e694118753 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclaredWrongSignature.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/alreadyDeclaredWrongSignature.txt @@ -2,7 +2,6 @@ public final class AlreadyDeclaredWrongSignatureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { private final field x: int public method (p0: int): void @@ -16,7 +15,6 @@ public final class B { public method toString(): java.lang.String } - public final class C { private final field x: int public method (p0: int): void @@ -30,7 +28,6 @@ public final class C { public method toString(): java.lang.String } - public final class D { private final field x: int public method (p0: int): void @@ -44,7 +41,6 @@ public final class D { public method toString(): java.lang.String } - public final class E { private final field x: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/genericarray.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/genericarray.txt index b2443f86791..6661b08e28f 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/genericarray.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/genericarray.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class GenericarrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/intarray.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/intarray.txt index 41dc8db9852..59cc971df42 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/intarray.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/intarray.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class IntarrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/nullother.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/nullother.txt index 7f43b541b6c..724222cf2e3 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/nullother.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/nullother.txt @@ -10,13 +10,11 @@ public final class A { public method toString(): java.lang.String } - public final class Dummy { public method (): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean } - public final class NullotherKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/equals/sameinstance.txt b/compiler/testData/codegen/light-analysis/dataClasses/equals/sameinstance.txt index d64c5eede67..c29c1fcbb75 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/equals/sameinstance.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/equals/sameinstance.txt @@ -12,7 +12,6 @@ public final class A { public method toString(): java.lang.String } - public final class SameinstanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/floatParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/floatParam.txt index a1222e7ca27..490b930f9df 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/floatParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/floatParam.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class FloatParamKt { private final static field NAN: float public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/dataClasses/genericParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/genericParam.txt index c0ad9c8a078..0062ac27b0e 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/genericParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/genericParam.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class GenericParamKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclared.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclared.txt index dfe7f7e059c..78757cfb717 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclared.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclared.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class AlreadyDeclaredKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclaredWrongSignature.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclaredWrongSignature.txt index 43a3abf9e21..1f4477298d9 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclaredWrongSignature.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/alreadyDeclaredWrongSignature.txt @@ -11,12 +11,10 @@ public final class A { public method toString(): java.lang.String } - public final class AlreadyDeclaredWrongSignatureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { private final field x: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/array.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/array.txt index aea74d46eb0..c61cc88b647 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/array.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/array.txt @@ -14,7 +14,6 @@ public final class A { public method toString(): java.lang.String } - public final class ArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/boolean.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/boolean.txt index 4a03f58f5b4..aa47d04a6fa 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/boolean.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/boolean.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class BooleanKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/byte.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/byte.txt index c66122f9b43..82e8a473e58 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/byte.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/byte.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class ByteKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/char.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/char.txt index 88913b1a26e..09d140977e7 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/char.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/char.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class CharKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/double.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/double.txt index a0a21cfb01f..f8cae00c8c0 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/double.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/double.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class DoubleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/float.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/float.txt index eef4b4f591d..0f1a5a29230 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/float.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/float.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class FloatKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/genericNull.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/genericNull.txt index 82c3c04c961..f328cceac4d 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/genericNull.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/genericNull.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class GenericNullKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/int.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/int.txt index 8bf9ca8206f..bedf269a140 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/int.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/int.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class IntKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/long.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/long.txt index 8958e8d7e47..dd83dd95f4c 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/long.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/long.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class LongKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/null.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/null.txt index fd6f9f0e4f8..4f11c7d5a09 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/null.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/null.txt @@ -14,7 +14,6 @@ public final class A { public method toString(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.Nullable field a: java.lang.Object public method (@org.jetbrains.annotations.Nullable p0: java.lang.Object): void @@ -27,7 +26,6 @@ public final class B { public method toString(): java.lang.String } - public final class C { private final field a: int private @org.jetbrains.annotations.Nullable field x: java.lang.Integer @@ -44,7 +42,6 @@ public final class C { public method toString(): java.lang.String } - public final class D { private final @org.jetbrains.annotations.Nullable field a: java.lang.Integer public method (@org.jetbrains.annotations.Nullable p0: java.lang.Integer): void @@ -57,7 +54,6 @@ public final class D { public method toString(): java.lang.String } - public final class NullKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/short.txt b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/short.txt index 413297514bf..71547b7f8b5 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/hashCode/short.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/hashCode/short.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class ShortKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/kt5002.txt b/compiler/testData/codegen/light-analysis/dataClasses/kt5002.txt index 2e8264bdf1e..a17093fcfd2 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/kt5002.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/kt5002.txt @@ -2,7 +2,6 @@ public final class Kt5002Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Pair { private final field first: java.lang.Object private final field second: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/dataClasses/mixedParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/mixedParams.txt index 5bb03586444..b5aa35078e0 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/mixedParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/mixedParams.txt @@ -14,7 +14,6 @@ public final class A { public method toString(): java.lang.String } - public final class MixedParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/multiDeclaration.txt b/compiler/testData/codegen/light-analysis/dataClasses/multiDeclaration.txt index 903cc13cb4e..e8205727fce 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/multiDeclaration.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/multiDeclaration.txt @@ -16,7 +16,6 @@ public final class A { public method toString(): java.lang.String } - public final class MultiDeclarationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/multiDeclarationFor.txt b/compiler/testData/codegen/light-analysis/dataClasses/multiDeclarationFor.txt index 63facee2999..802e8d02bf1 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/multiDeclarationFor.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/multiDeclarationFor.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class MultiDeclarationForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialFinalMemberInSuperClass.txt b/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialFinalMemberInSuperClass.txt index a8319162013..ba729a0c51f 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialFinalMemberInSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialFinalMemberInSuperClass.txt @@ -5,7 +5,6 @@ public abstract class Base { public final @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class DataClass { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -15,7 +14,6 @@ public final class DataClass { public final @org.jetbrains.annotations.NotNull method getField(): java.lang.String } - public final class NonTrivialFinalMemberInSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialMemberInSuperClass.txt b/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialMemberInSuperClass.txt index 33f6d25fb8e..ef9adb92b69 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialMemberInSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/nonTrivialMemberInSuperClass.txt @@ -5,7 +5,6 @@ public abstract class Base { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class DataClass { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -18,7 +17,6 @@ public final class DataClass { public method toString(): java.lang.String } - public final class NonTrivialMemberInSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/privateValParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/privateValParams.txt index fc3af817f04..3d4da09e7ba 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/privateValParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/privateValParams.txt @@ -12,7 +12,6 @@ public final class D { public method toString(): java.lang.String } - public final class PrivateValParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclared.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclared.txt index 56b9d70d2a5..e57c2585622 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclared.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclared.txt @@ -10,7 +10,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class AlreadyDeclaredKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclaredWrongSignature.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclaredWrongSignature.txt index f73ba74f5a2..0561b620f65 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclaredWrongSignature.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/alreadyDeclaredWrongSignature.txt @@ -11,12 +11,10 @@ public final class A { public final @org.jetbrains.annotations.NotNull method toString(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.String } - public final class AlreadyDeclaredWrongSignatureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { private final field x: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/arrayParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/arrayParams.txt index 862cc7994ea..856a40b037e 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/arrayParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/arrayParams.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class ArrayParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/changingVarParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/changingVarParam.txt index 10ddc956d97..4ad09753ca1 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/changingVarParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/changingVarParam.txt @@ -11,7 +11,6 @@ public final class A { public method toString(): java.lang.String } - public final class ChangingVarParamKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/genericParam.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/genericParam.txt index c0ad9c8a078..0062ac27b0e 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/genericParam.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/genericParam.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class GenericParamKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/mixedParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/mixedParams.txt index 1c37882c134..bb5eadeecc9 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/mixedParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/mixedParams.txt @@ -14,7 +14,6 @@ public final class A { public method toString(): java.lang.String } - public final class MixedParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/toString/unitComponent.txt b/compiler/testData/codegen/light-analysis/dataClasses/toString/unitComponent.txt index 9f9e5aee9b0..d8b48c1a8ed 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/toString/unitComponent.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/toString/unitComponent.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class UnitComponentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/twoValParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/twoValParams.txt index d7fa2ec7830..6dacaac92ed 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/twoValParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/twoValParams.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class TwoValParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/twoVarParams.txt b/compiler/testData/codegen/light-analysis/dataClasses/twoVarParams.txt index a28cd19f178..3dd6b8a6ee1 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/twoVarParams.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/twoVarParams.txt @@ -15,7 +15,6 @@ public final class A { public method toString(): java.lang.String } - public final class TwoVarParamsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/dataClasses/unitComponent.txt b/compiler/testData/codegen/light-analysis/dataClasses/unitComponent.txt index 9f9e5aee9b0..d8b48c1a8ed 100644 --- a/compiler/testData/codegen/light-analysis/dataClasses/unitComponent.txt +++ b/compiler/testData/codegen/light-analysis/dataClasses/unitComponent.txt @@ -10,7 +10,6 @@ public final class A { public method toString(): java.lang.String } - public final class UnitComponentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/annotation.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/annotation.txt index 45fb4d35895..ab1673893c5 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/annotation.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/annotation.txt @@ -3,7 +3,6 @@ public annotation class A { public abstract method a(): int } - public final class AnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @A method test1(): int diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/checkIfConstructorIsSynthetic.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/checkIfConstructorIsSynthetic.txt index aa108dcd466..27a51508502 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/checkIfConstructorIsSynthetic.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/checkIfConstructorIsSynthetic.txt @@ -4,7 +4,6 @@ public final class A { public synthetic method (p0: int, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class CheckIfConstructorIsSyntheticKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1.txt index a4658e8b525..c5e4aff5e80 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1.txt @@ -6,7 +6,6 @@ public final class A { public final method getA(): int } - public final class DefArgs1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1InnerClass.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1InnerClass.txt index b894b5a23dc..fdf7eea091c 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1InnerClass.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs1InnerClass.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private final @org.jetbrains.annotations.NotNull field a: java.lang.String private final field b: int @@ -17,7 +16,6 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method getC(): java.lang.String } - public final class DefArgs1InnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs2.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs2.txt index 7b3596a8f3c..cfd15c21564 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs2.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/defArgs2.txt @@ -8,7 +8,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String } - public final class DefArgs2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/doubleDefArgs1InnerClass.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/doubleDefArgs1InnerClass.txt index c68401d7ca5..d635f17407e 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/doubleDefArgs1InnerClass.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/doubleDefArgs1InnerClass.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private final field a: double private final field b: int @@ -17,7 +16,6 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method getC(): java.lang.String } - public final class DoubleDefArgs1InnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enum.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enum.txt index 4d63adc58f1..a6da774137d 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enum.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enum.txt @@ -9,7 +9,6 @@ public enum class A { public static method values(): A[] } - public final class EnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithOneDefArg.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithOneDefArg.txt index d24cf54893e..503b8dc599e 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithOneDefArg.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithOneDefArg.txt @@ -2,7 +2,6 @@ public final class EnumWithOneDefArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Foo { public final static field B: Foo public final static field C: Foo diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDefArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDefArgs.txt index 8d4d60767ea..5d46519a433 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDefArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDefArgs.txt @@ -2,7 +2,6 @@ public final class EnumWithTwoDefArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Foo { public final static field A: Foo public final static field B: Foo diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDoubleDefArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDoubleDefArgs.txt index 9d375647ea6..ed7b273374e 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDoubleDefArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/enumWithTwoDoubleDefArgs.txt @@ -2,7 +2,6 @@ public final class EnumWithTwoDoubleDefArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Foo { public final static field A: Foo public final static field B: Foo diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/kt3060.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/kt3060.txt index fb69f6c5a34..3839430e32f 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/kt3060.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/kt3060.txt @@ -8,14 +8,12 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getParam(): java.lang.String } - public final static class Foo/Companion { inner class Foo/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getS(): Foo } - public final class Kt3060Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/manyArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/manyArgs.txt index 525ffd4d904..d11e9268489 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/constructor/manyArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/constructor/manyArgs.txt @@ -69,7 +69,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class B { private final field a: int private final field aa: int @@ -157,7 +156,6 @@ public final class B { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class C { private final field a: int private final field aa: int @@ -305,7 +303,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class ManyArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/convention/incWithDefaultInGetter.txt b/compiler/testData/codegen/light-analysis/defaultArguments/convention/incWithDefaultInGetter.txt index 9cd71f4f302..2e8f0a3d60f 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/convention/incWithDefaultInGetter.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/convention/incWithDefaultInGetter.txt @@ -6,7 +6,6 @@ public final class IncWithDefaultInGetterKt { public final static method setInc(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class X { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/convention/kt9140.txt b/compiler/testData/codegen/light-analysis/defaultArguments/convention/kt9140.txt index bc376b7b9e1..c35a1f275ae 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/convention/kt9140.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/convention/kt9140.txt @@ -2,7 +2,6 @@ public final class Kt9140Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public method (): void public synthetic static method get$default(p0: X, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/convention/plusAssignWithDefaultInGetter.txt b/compiler/testData/codegen/light-analysis/defaultArguments/convention/plusAssignWithDefaultInGetter.txt index 602eb327b9c..043881c4faa 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/convention/plusAssignWithDefaultInGetter.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/convention/plusAssignWithDefaultInGetter.txt @@ -2,7 +2,6 @@ public final class PlusAssignWithDefaultInGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void @@ -13,7 +12,6 @@ public final class X { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Y { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/abstractClass.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/abstractClass.txt index 929d95caa06..feea428f0a9 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/abstractClass.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/abstractClass.txt @@ -2,14 +2,12 @@ public final class AbstractClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class Base { public method (): void public synthetic static method foo$default(p0: Base, p1: java.lang.String, p2: int, p3: java.lang.Object): java.lang.String public abstract @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Derived { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverride.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverride.txt index 96c1c56f4f1..917c1961c82 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverride.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverride.txt @@ -4,12 +4,10 @@ public final class Bar { public synthetic method foo(p0: java.lang.CharSequence): java.lang.CharSequence } - public final class CovariantOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Foo { public method (): void public synthetic static method foo$default(p0: Foo, p1: java.lang.CharSequence, p2: int, p3: java.lang.Object): java.lang.CharSequence diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverrideGeneric.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverrideGeneric.txt index d46033489a2..1bfef2a5dc6 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverrideGeneric.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/covariantOverrideGeneric.txt @@ -4,12 +4,10 @@ public final class Bar { public synthetic method foo(p0: java.lang.CharSequence): java.lang.CharSequence } - public final class CovariantOverrideGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Foo { public method (): void public synthetic static method foo$default(p0: Foo, p1: java.lang.CharSequence, p2: int, p3: java.lang.Object): java.lang.CharSequence diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInClassObject.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInClassObject.txt index a09bfa1c8ea..35de67f0eb3 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInClassObject.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInClassObject.txt @@ -4,7 +4,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -13,7 +12,6 @@ public final static class A/Companion { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class ExtentionFunctionInClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInObject.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInObject.txt index f1cc30a864f..2760c73bece 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInObject.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/extentionFunctionInObject.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class ExtentionFunctionInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/funInTrait.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/funInTrait.txt index f313a1cd734..3f1c7169ea7 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/funInTrait.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/funInTrait.txt @@ -3,19 +3,16 @@ public interface Foo { public abstract method foo(p0: double): double } - public final class Foo/DefaultImpls { inner class Foo/DefaultImpls public synthetic static method foo$default(p0: Foo, p1: double, p2: int, p3: java.lang.Object): double } - public final class FooImpl { public method (): void public method foo(p0: double): double } - public final class FunInTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunction.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunction.txt index a7b0c6cf9f9..34935d86548 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunction.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunction.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class InnerExtentionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDouble.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDouble.txt index dc6ea47fd2c..74a1d09544d 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDouble.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDouble.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class InnerExtentionFunctionDoubleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.txt index 5a427d9f979..3f4b21fc326 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class InnerExtentionFunctionDoubleTwoArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionManyArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionManyArgs.txt index c1838d6ffe3..bfc9a44c6c6 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionManyArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/innerExtentionFunctionManyArgs.txt @@ -9,7 +9,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class InnerExtentionFunctionManyArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/kt5232.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/kt5232.txt index 035dddcc06c..b16bfa664a5 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/kt5232.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/kt5232.txt @@ -3,20 +3,17 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method visit(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public synthetic static method visit$default(p0: A, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String public static @org.jetbrains.annotations.NotNull method visit(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String, p2: java.lang.String): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method visit(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class Kt5232Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/memberFunctionManyArgs.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/memberFunctionManyArgs.txt index 2e590d50353..9462a94bdca 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/memberFunctionManyArgs.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/memberFunctionManyArgs.txt @@ -8,7 +8,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: int, p7: int, p8: int, p9: int, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: int, p17: int, p18: int, p19: int, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: int, p27: int, p28: int, p29: int, p30: int, p31: int): java.lang.String } - public final class MemberFunctionManyArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/function/trait.txt b/compiler/testData/codegen/light-analysis/defaultArguments/function/trait.txt index 2a280a972e8..dcae2271868 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/function/trait.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/function/trait.txt @@ -3,20 +3,17 @@ public interface Base { public abstract @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Base/DefaultImpls { inner class Base/DefaultImpls public synthetic static method bar$default(p0: Base, p1: java.lang.String, p2: int, p3: java.lang.Object): java.lang.String public static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: Base, p1: java.lang.String): java.lang.String } - public final class Derived { public method (): void public @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class TraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/kt6382.txt b/compiler/testData/codegen/light-analysis/defaultArguments/kt6382.txt index c0300538a90..59bc50d2dfd 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/kt6382.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/kt6382.txt @@ -6,7 +6,6 @@ public final class A { private final method show(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean): java.lang.String } - public final class Kt6382Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/private/memberExtensionFunction.txt b/compiler/testData/codegen/light-analysis/defaultArguments/private/memberExtensionFunction.txt index 75c814c6e23..65145070fea 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/private/memberExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/private/memberExtensionFunction.txt @@ -5,7 +5,6 @@ public final class A { private final method foo(p0: int, p1: int): int } - public final class A/B { synthetic final field this$0: A inner class A/B @@ -13,7 +12,6 @@ public final class A/B { public final method bar(): int } - public final class MemberExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/private/memberFunction.txt b/compiler/testData/codegen/light-analysis/defaultArguments/private/memberFunction.txt index 329ddb5b460..9d4a8b6481f 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/private/memberFunction.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/private/memberFunction.txt @@ -6,14 +6,12 @@ public final class A { private final method foo(p0: java.lang.String): java.lang.String } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class MemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/private/primaryConstructor.txt b/compiler/testData/codegen/light-analysis/defaultArguments/private/primaryConstructor.txt index 32831d21919..31b8517eaff 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/private/primaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/private/primaryConstructor.txt @@ -5,14 +5,12 @@ public final class A { synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method foo(): A } - public final class PrimaryConstructorKt { private static @org.jetbrains.annotations.NotNull field state: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/private/secondaryConstructor.txt b/compiler/testData/codegen/light-analysis/defaultArguments/private/secondaryConstructor.txt index 74c559433ea..fff1e31ed4d 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/private/secondaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/private/secondaryConstructor.txt @@ -5,14 +5,12 @@ public final class A { synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method foo(): A } - public final class SecondaryConstructorKt { private static @org.jetbrains.annotations.NotNull field state: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/protected.txt b/compiler/testData/codegen/light-analysis/defaultArguments/protected.txt index 634da34b586..49abab309f4 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/protected.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/protected.txt @@ -3,12 +3,10 @@ public final class bar/Bar { public final @org.jetbrains.annotations.NotNull method execute(): java.lang.String } - public final class bar/BarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class foo/Foo { public method (): void public synthetic static method foo$default(p0: foo.Foo, p1: boolean, p2: int, p3: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt2789.txt b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt2789.txt index 29c5b8646a0..3fd070327d1 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt2789.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt2789.txt @@ -6,21 +6,18 @@ public final class FooClass { public @org.jetbrains.annotations.NotNull method makeFromTraitImpl(): java.lang.String } - public interface FooTrait { inner class FooTrait/DefaultImpls public abstract method make(p0: int): java.lang.Object public abstract method makeFromTraitImpl(): java.lang.Object } - public final class FooTrait/DefaultImpls { inner class FooTrait/DefaultImpls public synthetic static method make$default(p0: FooTrait, p1: int, p2: int, p3: java.lang.Object): java.lang.Object public static method makeFromTraitImpl(p0: FooTrait): java.lang.Object } - public final class Kt2789Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9428.txt b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9428.txt index 501ab18f1e3..becbf03f73d 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9428.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9428.txt @@ -4,26 +4,22 @@ public abstract class Game { public abstract @org.jetbrains.annotations.Nullable method getPlayer(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean): Player } - public final class Kt9428Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Player { private final @org.jetbrains.annotations.NotNull field name: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public final class SimpleGame { public method (): void public @org.jetbrains.annotations.Nullable method getPlayer(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean): SlashPlayer public synthetic method getPlayer(p0: java.lang.String, p1: boolean): Player } - public class SlashPlayer { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9924.txt b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9924.txt index 73d832ef858..2d2160aac49 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9924.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/signature/kt9924.txt @@ -4,14 +4,12 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method test(p0: java.lang.Object, p1: boolean): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean): java.lang.String public synthetic method test(p0: java.lang.Object, p1: boolean): java.lang.String } - public final class Kt9924Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/defaultArguments/simpleFromOtherFile.txt b/compiler/testData/codegen/light-analysis/defaultArguments/simpleFromOtherFile.txt index 2653c287ddc..e1e3463235e 100644 --- a/compiler/testData/codegen/light-analysis/defaultArguments/simpleFromOtherFile.txt +++ b/compiler/testData/codegen/light-analysis/defaultArguments/simpleFromOtherFile.txt @@ -2,7 +2,6 @@ public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class _2Kt { public synthetic static method ok$default(p0: java.lang.String, p1: int, p2: java.lang.Object): java.lang.String public final static @org.jetbrains.annotations.NotNull method ok(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt index 9fcc9f23321..1ba5bcbf973 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt @@ -7,7 +7,6 @@ public final class AccessTopLevelDelegatedPropertyInClinitKt { public final static @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class Delegate { public method (): void public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt index d11e46e46c0..40b08b54c17 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt @@ -7,12 +7,10 @@ public final class B { public final method test(): void } - public final class CapturePropertyInClosureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Delegate { private field inner: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt index 7932a53e3ff..43828f62aaf 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt @@ -5,12 +5,10 @@ public final class AImpl { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.Number } - public final class CastGetReturnTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt index 1ac695fb4d2..07f0bec8e21 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: Derived): void } - public class Base { private final @org.jetbrains.annotations.NotNull field a: java.lang.String public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -15,12 +14,10 @@ public class Base { public @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class CastSetParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Delegate { private @org.jetbrains.annotations.NotNull field inner: Derived public method (): void @@ -30,7 +27,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: Base): void } - public final class Derived { private final @org.jetbrains.annotations.NotNull field a: java.lang.String public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt index 405c6536ed4..2d263ab14d9 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt @@ -7,7 +7,6 @@ public final class A { public final method setProp(p0: int): void } - public final static class A/Delegate { private field inner: int inner class A/Delegate @@ -18,7 +17,6 @@ public final static class A/Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class DelegateAsInnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt index 9c07449ff34..a09755a4810 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt @@ -8,7 +8,6 @@ public final class A { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -18,7 +17,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class DelegateByOtherPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt index c67ce64c0a8..47252dba736 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -16,7 +15,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class DelegateByTopLevelFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt index 519bd4d606c..fbc703dd6ea 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -16,7 +15,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class DelegateByTopLevelPropertyKt { private final static @org.jetbrains.annotations.NotNull field p: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt index 2f7369d8ec6..22520c326e9 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt @@ -2,13 +2,11 @@ public final class A { public method (): void } - public final class Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class DelegateForExtPropertyKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt index 66e3e110a70..a7ebde4a09a 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt @@ -3,12 +3,10 @@ public final class Delegate { public final method getValue(@org.jetbrains.annotations.NotNull p0: F.A, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class DelegateForExtPropertyInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class F { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -18,7 +16,6 @@ public final class F { public final method getProp(@org.jetbrains.annotations.NotNull p0: F.A): int } - public final static class F/A { inner class F/A public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt index 358adde79ce..db1b90d0390 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt @@ -2,7 +2,6 @@ public final class DelegateWithPrivateSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field delegate$delegate: kotlin.properties.ReadWriteProperty diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt index 70cca21fc92..a7bb8bbf8d5 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt @@ -2,7 +2,6 @@ public class C { public method (): void } - public final class D { private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -10,7 +9,6 @@ public final class D { public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: C, @org.jetbrains.annotations.NotNull p1: java.lang.Object): java.lang.String } - public final class ExtensionDelegatesWithSameNamesKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate$1: D @@ -20,13 +18,11 @@ public final class ExtensionDelegatesWithSameNamesKt { public final static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: O): java.lang.String } - public final class K { public final static field INSTANCE: K private method (): void } - public final class O { public final static field INSTANCE: O private method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt index 117749914ba..02cabb99c9e 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt @@ -4,14 +4,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field k: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public @org.jetbrains.annotations.NotNull method getK(): java.lang.String } - public final class ExtensionPropertyAndExtensionGetValueKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: A @@ -20,7 +18,6 @@ public final class ExtensionPropertyAndExtensionGetValueKt { public final static @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: I, @org.jetbrains.annotations.NotNull p2: java.lang.Object): java.lang.String } - public interface I { public abstract @org.jetbrains.annotations.NotNull method getK(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt index 83321f8b9e3..1ef94941958 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -14,7 +13,6 @@ public final class A/B { public final method setProp(p0: int): void } - public final class Delegate { private field inner: java.lang.Object public method (p0: java.lang.Object): void @@ -24,7 +22,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: java.lang.Object): void } - public final class GenericDelegateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt index 5137e35501a..dbfba23b04c 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt @@ -5,12 +5,10 @@ public final class A { public final method getProp(): int } - public final class Delegate { public method (): void } - public final class GetAsExtensionFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getValue(@org.jetbrains.annotations.NotNull p0: Delegate, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.reflect.KProperty): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt index 2883c3d0c7d..ff7e5167c72 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt @@ -6,12 +6,10 @@ public final class A { public final method getValue(@org.jetbrains.annotations.NotNull p0: Delegate, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.reflect.KProperty): int } - public final class Delegate { public method (): void } - public final class GetAsExtensionFunInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt index d9d53b3682f..a0c15275f82 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt @@ -5,13 +5,11 @@ public final class A { public final method getProp(): int } - public final class Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class InClassValKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt index 06154e89417..95a43017860 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -16,7 +15,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class InClassVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt index 81695349f62..20e2815aec3 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt @@ -2,7 +2,6 @@ public interface A { public abstract method getProp(): int } - public final class AImpl { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -10,13 +9,11 @@ public final class AImpl { public method getProp(): int } - public final class Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class InTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt index f91489e7796..4d5223c6297 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -14,7 +13,6 @@ public final class A/B { public final method setProp(p0: int): void } - public final class Delegate { private field inner: java.lang.Object public method (p0: java.lang.Object): void @@ -24,7 +22,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: java.lang.Object): void } - public final class InferredPropertyTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt index c45375cbf7b..8d91c73beba 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt @@ -7,7 +7,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: java.lang.Object): void } - public final class Foo { private final static @org.jetbrains.annotations.NotNull field A$delegate: Delegate private final static @org.jetbrains.annotations.NotNull field B$delegate: Delegate @@ -18,7 +17,6 @@ public final class Foo { public final method getF(): int } - public final static class Foo/Companion { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] inner class Foo/Companion @@ -28,13 +26,11 @@ public final static class Foo/Companion { public final method setB(@org.jetbrains.annotations.NotNull p0: Foo): void } - public interface FooTrait { public final static field Companion: FooTrait.Companion inner class FooTrait/Companion } - public final static class FooTrait/Companion { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field A$delegate: Delegate @@ -46,7 +42,6 @@ public final static class FooTrait/Companion { public final method setB(@org.jetbrains.annotations.NotNull p0: Foo): void } - public final class Kt4138Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/kt6722.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/kt6722.txt index e92091e722e..c2ac286f35c 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/kt6722.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/kt6722.txt @@ -2,5 +2,4 @@ public final class Kt6722Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt index b8cc8fa8c9d..6c4cb3f976d 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt @@ -6,17 +6,14 @@ public class A { protected final method setK(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class B { public method (): void } - public final class Kt9712Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: X diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVal.txt index 30084d5b127..0b1242a94e4 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVal.txt @@ -3,7 +3,6 @@ public final class foo/CapturedLocalValKt { public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object } - public final class foo/Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalValNoInline.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalValNoInline.txt index 9b04cfdb4db..b02f15b648b 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalValNoInline.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalValNoInline.txt @@ -3,7 +3,6 @@ public final class foo/CapturedLocalValNoInlineKt { public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object } - public final class foo/Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVar.txt index abad73c5efc..d4205e82f63 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVar.txt @@ -3,7 +3,6 @@ public final class foo/CapturedLocalVarKt { public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object } - public final class foo/Delegate { private field inner: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVarNoInline.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVarNoInline.txt index c6b098699ca..f65e39d2dea 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVarNoInline.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/capturedLocalVarNoInline.txt @@ -3,7 +3,6 @@ public final class foo/CapturedLocalVarNoInlineKt { public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object } - public final class foo/Delegate { private field inner: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineGetValue.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineGetValue.txt index 95b5c4250fa..76056e6b103 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineGetValue.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineGetValue.txt @@ -3,7 +3,6 @@ public final class foo/Delegate { public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String } - public final class foo/InlineGetValueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineOperators.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineOperators.txt index 181cf7a54a0..4c2fd9c5e53 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineOperators.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/inlineOperators.txt @@ -7,7 +7,6 @@ public final class foo/Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class foo/InlineOperatorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVal.txt index ac426d9d1e1..481b8866a3e 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVal.txt @@ -3,7 +3,6 @@ public final class foo/Delegate { public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class foo/LocalValKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localValNoExplicitType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localValNoExplicitType.txt index 8cf8a03fe74..f0f161c926c 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localValNoExplicitType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localValNoExplicitType.txt @@ -3,7 +3,6 @@ public final class foo/Delegate { public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class foo/LocalValNoExplicitTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVar.txt index d6485c20ba3..a181948f9e2 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVar.txt @@ -7,7 +7,6 @@ public final class foo/Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class foo/LocalVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVarNoExplicitType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVarNoExplicitType.txt index 6bb46be5fb5..26493cd88ae 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVarNoExplicitType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/local/localVarNoExplicitType.txt @@ -7,7 +7,6 @@ public final class foo/Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class foo/LocalVarNoExplicitTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt index 672953bc9de..3d62dcf427d 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt @@ -5,7 +5,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.NotNull p0: My, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String): void } - public final class My { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field delegate$delegate: Delegate @@ -14,7 +13,6 @@ public final class My { private final method setDelegate(p0: java.lang.String): void } - public final class PrivateSetterKPropertyIsNotMutableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt index dab82cd3f1e..499a5af5c09 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt @@ -7,7 +7,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class Delegate { private field inner: int public method (): void @@ -17,7 +16,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class PrivateVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt index 864d973433e..0178215eaf4 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt @@ -9,7 +9,6 @@ public final class A { public final method setFoo(p0: int): void } - public final static class A/Companion { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] inner class A/Companion @@ -18,7 +17,6 @@ public final static class A/Companion { public final method setBar(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void } - public final class AnyHandler { public final static field INSTANCE: AnyHandler private method (): void @@ -26,7 +24,6 @@ public final class AnyHandler { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.Nullable p2: java.lang.Object): void } - public final class IntHandler { public final static field INSTANCE: IntHandler private method (): void @@ -34,7 +31,6 @@ public final class IntHandler { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class PropertyMetadataShouldBeCachedKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field baz$delegate: StringHandler @@ -45,7 +41,6 @@ public final class PropertyMetadataShouldBeCachedKt { public final static @org.jetbrains.annotations.Nullable method record(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KProperty): kotlin.Unit } - public final class StringHandler { public final static field INSTANCE: StringHandler private method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt index 2858e396635..2846ac69ad6 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt @@ -6,12 +6,10 @@ public class A { private final method setValue(p0: java.lang.Object): void } - public final class B { public method (): void } - public final class ProtectedVarWithPrivateSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt index de8eca093bd..16eb2488a08 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt @@ -15,7 +15,6 @@ public final class DifferentReceiversKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyClass { private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt index 7179b406db5..a8e5956582d 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt @@ -18,4 +18,4 @@ public final class EvaluationOrderVarKt { public final static method setTestK(@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final static method setTestO(@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final static method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: java.lang.String): void -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt index 4e6484ef7d8..e98377a1338 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt @@ -9,7 +9,6 @@ public final class ExtensionDelegatedKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class UserDataProperty { private final @org.jetbrains.annotations.NotNull field key: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt index 1885637a6fa..da20e8b55d4 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt @@ -15,7 +15,6 @@ public final class GenericKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class MyClass { private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt index e6628f0e7b9..f3d61889be3 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt @@ -8,7 +8,6 @@ public final class InClassKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Test { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt index 56abef78195..6fc73c72745 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt @@ -1,4 +1,3 @@ - public final class InlineProvideDelegateKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.NotNull field log: java.lang.String @@ -14,4 +13,4 @@ public final class InlineProvideDelegateKt { public final static @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.Object): java.lang.String public final static method runLogged(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): java.lang.Object public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt index b2d28dce3ae..931101d3d05 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt @@ -8,7 +8,6 @@ public final class JvmStaticInObjectKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Test { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: Test diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/local.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/local.txt index 445be14e911..1f81cdfb551 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/local.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/local.txt @@ -6,4 +6,4 @@ public final class LocalKt { public final static @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.Object): java.lang.String public final static method runLogged(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): java.lang.Object public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/localDifferentReceivers.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/localDifferentReceivers.txt index 3bc4de36192..201e11373cf 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/localDifferentReceivers.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/localDifferentReceivers.txt @@ -1,4 +1,3 @@ - public final class LocalDifferentReceiversKt { private static @org.jetbrains.annotations.NotNull field log: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -10,9 +9,8 @@ public final class LocalDifferentReceiversKt { public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyClass { private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt index 649f3922371..a894f6c0c44 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt @@ -10,7 +10,6 @@ public final class Host { public final @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.Object): Host.StringDelegate } - public final static class Host/StringDelegate { private final @org.jetbrains.annotations.NotNull field s: java.lang.String inner class Host/StringDelegate @@ -19,7 +18,6 @@ public final static class Host/StringDelegate { public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.Object): java.lang.String } - public final class MemberExtensionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt index 341a4d79d2a..e557d031ebb 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt @@ -13,4 +13,4 @@ public final class PropertyMetadataKt { public final static @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.reflect.KProperty): java.lang.String public final static method runLogged(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): java.lang.Object public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt index 93efc83f506..87c83efc1e8 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -15,7 +14,6 @@ public final class Delegate { public final method setInner(p0: int): void } - public final class SetAsExtensionFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method setValue(@org.jetbrains.annotations.NotNull p0: Delegate, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.reflect.KProperty, p3: int): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt index 7ffb6f4085e..e8c3f648377 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt @@ -7,7 +7,6 @@ public final class A { public final method setValue(@org.jetbrains.annotations.NotNull p0: Delegate, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.reflect.KProperty, p3: int): void } - public final class Delegate { private field inner: int public method (): void @@ -16,7 +15,6 @@ public final class Delegate { public final method setInner(p0: int): void } - public final class SetAsExtensionFunInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt index a4529deb3a6..6368fb85884 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt @@ -5,7 +5,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String): void } - public final class O { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: O @@ -18,7 +17,6 @@ public final class O { public final method setMember(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class StackOverflowOnCallFromGetValueKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field topLevel$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt index 77c95cacbd7..4569128b3d9 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt @@ -3,7 +3,6 @@ public final class Delegate { public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class TopLevelValKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt index 5699f5d4625..6c82cd0809c 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt @@ -7,7 +7,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class TopLevelVarKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt index 091f396cf61..bd1ba6f92b9 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt @@ -8,7 +8,6 @@ public final class A { public final method getProp(): int } - public final class Delegate { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function1 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void @@ -16,7 +15,6 @@ public final class Delegate { public final method getValue(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class TwoPropByOneDelegeteKt { private final static @org.jetbrains.annotations.NotNull field p: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt index 09c83ebcdbe..30b93993299 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt @@ -5,7 +5,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, @org.jetbrains.annotations.NotNull p2: java.lang.String): void } - public final class O { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: O @@ -18,7 +17,6 @@ public final class O { public final method setMember(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class UseKPropertyLaterKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field properties: java.util.HashSet diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt index e78064af5a7..c8cb49ec8aa 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt @@ -3,7 +3,6 @@ public final class Delegate { public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String } - public final class UseReflectionOnKPropertyKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt index b16d79f1a30..e60a56a0156 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -13,13 +12,11 @@ public final class A/B { public final method getProp(): int } - public final class Delegate { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): int } - public final class ValInInnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt index c16b67d8994..77ba3e14163 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate @@ -14,7 +13,6 @@ public final class A/B { public final method setProp(p0: int): void } - public final class Delegate { private field inner: int public method (): void @@ -24,7 +22,6 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: int): void } - public final class VarInInnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/delegation/delegationToVal.txt b/compiler/testData/codegen/light-analysis/delegation/delegationToVal.txt index e17f9136b16..16c96e19b20 100644 --- a/compiler/testData/codegen/light-analysis/delegation/delegationToVal.txt +++ b/compiler/testData/codegen/light-analysis/delegation/delegationToVal.txt @@ -7,17 +7,14 @@ public final class CActing { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public final class DelegationToValKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface IActing { public abstract @org.jetbrains.annotations.NotNull method act(): java.lang.String } - public final class Test { private final @org.jetbrains.annotations.NotNull field acting: CActing public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -27,7 +24,6 @@ public final class Test { public final @org.jetbrains.annotations.NotNull method getActing(): CActing } - public class Test2 { private final @org.jetbrains.annotations.NotNull field acting: CActing public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -37,7 +33,6 @@ public class Test2 { public @org.jetbrains.annotations.NotNull method getActing(): CActing } - public final class Test3 { private final @org.jetbrains.annotations.NotNull field acting: CActing public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegation/kt8154.txt b/compiler/testData/codegen/light-analysis/delegation/kt8154.txt index b375fb53099..5c9c7ef4e3c 100644 --- a/compiler/testData/codegen/light-analysis/delegation/kt8154.txt +++ b/compiler/testData/codegen/light-analysis/delegation/kt8154.txt @@ -2,17 +2,14 @@ public interface A { public abstract method foo(): java.lang.Object } - public interface B - public final class BImpl { private synthetic final field $$delegate_0: A public method (@org.jetbrains.annotations.NotNull p0: A): void public method foo(): java.lang.Object } - public final class Kt8154Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/extensionComponents.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/extensionComponents.txt index f4dfa25c6ae..440f6895da0 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/extensionComponents.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/extensionComponents.txt @@ -8,14 +8,12 @@ public final class A { public final method getZ(): java.lang.Object } - public final class B { public final static field INSTANCE: B private method (): void public final @org.jetbrains.annotations.NotNull method component2(@org.jetbrains.annotations.NotNull p0: A): java.lang.String } - public final class ExtensionComponentsKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: B): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/generic.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/generic.txt index 0de85912b02..1065cee5f8b 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/generic.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/generic.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class GenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/inline.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/inline.txt index 23da89185c9..565685cff28 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/inline.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/inline.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class InlineKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/otherParameters.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/otherParameters.txt index 603e27b0bd4..26641cb3dad 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/otherParameters.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/otherParameters.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class OtherParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function3): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/simple.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/simple.txt index f9b1f095001..55f6a4008e7 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/simple.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/simple.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/underscoreNames.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/underscoreNames.txt index 0a26ac6dd49..707f5ec513c 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/underscoreNames.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/underscoreNames.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method component3(): java.lang.String } - public final class UnderscoreNamesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/withIndexed.txt b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/withIndexed.txt index 43ec57dea36..ef1a5fc14d6 100644 --- a/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/withIndexed.txt +++ b/compiler/testData/codegen/light-analysis/destructuringDeclInLambdaParam/withIndexed.txt @@ -16,7 +16,6 @@ public final class Station { public method toString(): java.lang.String } - public final class WithIndexedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt index d61caecd460..a057df95c05 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt @@ -4,14 +4,12 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void public final method invoke(p0: int): int } - public final class InvokeOnClassObject1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt index 065bab2d409..d98d775cac6 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt @@ -4,16 +4,13 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public interface B - public final class InvokeOnClassObject2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method invoke(@org.jetbrains.annotations.NotNull p0: B, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt index f87a1a08ae6..d2bd8572264 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final static class A/Nested { public final static field Companion: A.Nested.Companion inner class A/Nested @@ -11,7 +10,6 @@ public final static class A/Nested { public method (): void } - public final static class A/Nested/Companion { inner class A/Nested inner class A/Nested/Companion @@ -19,7 +17,6 @@ public final static class A/Nested/Companion { public final method invoke(p0: int): int } - public final class InvokeOnClassObjectOfNestedClass1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt index ac0fe5aec3e..a9fcd015786 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final static class A/Nested { public final static field Companion: A.Nested.Companion inner class A/Nested @@ -11,7 +10,6 @@ public final static class A/Nested { public method (): void } - public final static class A/Nested/Companion { inner class A/Nested inner class A/Nested/Companion @@ -19,7 +17,6 @@ public final static class A/Nested/Companion { public final method invoke(p0: int): int } - public final class InvokeOnClassObjectOfNestedClass2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt index e98abd1f07e..5933f1e7ac8 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt @@ -7,7 +7,6 @@ public enum class A { public static method values(): A[] } - public final class InvokeOnEnum1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt index 807e1afa86c..f8064abee2e 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt @@ -6,7 +6,6 @@ public enum class A { public static method values(): A[] } - public final class InvokeOnEnum2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method invoke(@org.jetbrains.annotations.NotNull p0: A, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt index 34dee8b168c..94e73464510 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt @@ -7,7 +7,6 @@ public enum class A { public static method values(): A[] } - public final class InvokeOnImportedEnum1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt index 383500dc9f6..6bf01a17d0b 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt @@ -6,7 +6,6 @@ public enum class A { public static method values(): A[] } - public final class InvokeOnImportedEnum2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method invoke(@org.jetbrains.annotations.NotNull p0: A, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt index a085c572fb9..b94cdec7ec8 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt @@ -3,7 +3,6 @@ public final class A { private method (): void } - public final class InvokeOnObject1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method invoke(@org.jetbrains.annotations.NotNull p0: A, p1: int): int diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt index dbe83d6f26b..2c940a5a93f 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt @@ -4,7 +4,6 @@ public final class A { public final method invoke(p0: int): int } - public final class InvokeOnObject2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt index c8d9fe4de28..d1844ea613d 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt @@ -4,13 +4,11 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class DefaultArgsOverriddenKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/labeledThisReferences.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/labeledThisReferences.txt index 85cb19ea54f..8f34c3f0227 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/labeledThisReferences.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/labeledThisReferences.txt @@ -5,7 +5,6 @@ public final class B { public final @org.jetbrains.annotations.NotNull method makeC(): B.C } - public final class B/C { synthetic final field this$0: B inner class B/C @@ -14,7 +13,6 @@ public final class B/C { public final method h2(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class LabeledThisReferencesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/thisReferences.txt b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/thisReferences.txt index 03e58bc0891..7e6ae0bb1fd 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/thisReferences.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/functions/tailRecursion/thisReferences.txt @@ -5,7 +5,6 @@ public final class A { public final method f3(@org.jetbrains.annotations.NotNull p0: A): void } - public final class ThisReferencesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/diagnostics/vararg/kt4172.txt b/compiler/testData/codegen/light-analysis/diagnostics/vararg/kt4172.txt index 44dd00944bc..e6c83b069a0 100644 --- a/compiler/testData/codegen/light-analysis/diagnostics/vararg/kt4172.txt +++ b/compiler/testData/codegen/light-analysis/diagnostics/vararg/kt4172.txt @@ -4,7 +4,6 @@ public final class D { public final @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): java.lang.String[] } - public final class Kt4172Kt { private final static @kotlin.Suppress method array(p0: java.lang.Object[]): java.lang.Object[] public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/elvis/kt6694ExactAnnotationForElvis.txt b/compiler/testData/codegen/light-analysis/elvis/kt6694ExactAnnotationForElvis.txt index e6416b7a811..bb170b41520 100644 --- a/compiler/testData/codegen/light-analysis/elvis/kt6694ExactAnnotationForElvis.txt +++ b/compiler/testData/codegen/light-analysis/elvis/kt6694ExactAnnotationForElvis.txt @@ -4,7 +4,6 @@ public final class JetLabelReferenceExpression { public @org.jetbrains.annotations.NotNull method getReferencedNameElement(): PsiElement } - public final class JetOperationReferenceExpression { public method (): void public @org.jetbrains.annotations.Nullable method findChildByType(p0: int): PsiElement @@ -12,30 +11,25 @@ public final class JetOperationReferenceExpression { public synthetic method getReferencedNameElement(): PsiElement } - public interface JetSimpleNameExpression { inner class JetSimpleNameExpression/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method getReferencedNameElement(): PsiElement } - public final class JetSimpleNameExpression/DefaultImpls { inner class JetSimpleNameExpression/DefaultImpls public static @org.jetbrains.annotations.Nullable method findChildByType(p0: JetSimpleNameExpression, p1: int): PsiElement } - public final class Kt6694ExactAnnotationForElvisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface PsiElement { inner class PsiElement/DefaultImpls public abstract @org.jetbrains.annotations.Nullable method findChildByType(p0: int): PsiElement } - public final class PsiElement/DefaultImpls { inner class PsiElement/DefaultImpls public static @org.jetbrains.annotations.Nullable method findChildByType(p0: PsiElement, p1: int): PsiElement diff --git a/compiler/testData/codegen/light-analysis/enum/abstractMethodInEnum.txt b/compiler/testData/codegen/light-analysis/enum/abstractMethodInEnum.txt index fbf4f673d46..f761a63be12 100644 --- a/compiler/testData/codegen/light-analysis/enum/abstractMethodInEnum.txt +++ b/compiler/testData/codegen/light-analysis/enum/abstractMethodInEnum.txt @@ -7,14 +7,12 @@ public abstract enum class A { public static method values(): A[] } - final static class A/ENTRY { inner class A/ENTRY method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method t(): java.lang.String } - public final class AbstractMethodInEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method f(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/enum/abstractNestedClass.txt b/compiler/testData/codegen/light-analysis/enum/abstractNestedClass.txt index 2d8c77c9eb7..e9d791f0c9a 100644 --- a/compiler/testData/codegen/light-analysis/enum/abstractNestedClass.txt +++ b/compiler/testData/codegen/light-analysis/enum/abstractNestedClass.txt @@ -2,7 +2,6 @@ public final class AbstractNestedClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class E { public final static field ENTRY: E inner class E/Nested @@ -11,7 +10,6 @@ public enum class E { public static method values(): E[] } - public abstract static class E/Nested { inner class E/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/enum/asReturnExpression.txt b/compiler/testData/codegen/light-analysis/enum/asReturnExpression.txt index b1c9c2e267e..d62f5b8601c 100644 --- a/compiler/testData/codegen/light-analysis/enum/asReturnExpression.txt +++ b/compiler/testData/codegen/light-analysis/enum/asReturnExpression.txt @@ -3,7 +3,6 @@ public final class AsReturnExpressionKt { public final static @org.jetbrains.annotations.NotNull method foo(): Season } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/enum/classForEnumEntry.txt b/compiler/testData/codegen/light-analysis/enum/classForEnumEntry.txt index 1a31fe4f54b..e6e1ca2e46a 100644 --- a/compiler/testData/codegen/light-analysis/enum/classForEnumEntry.txt +++ b/compiler/testData/codegen/light-analysis/enum/classForEnumEntry.txt @@ -2,7 +2,6 @@ public final class ClassForEnumEntryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class IssueState { public final static field DEFAULT: IssueState public final static field FIXED: IssueState @@ -13,7 +12,6 @@ public enum class IssueState { public static method values(): IssueState[] } - final static class IssueState/FIXED { inner class IssueState/FIXED method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/light-analysis/enum/companionObjectInEnum.txt b/compiler/testData/codegen/light-analysis/enum/companionObjectInEnum.txt index e1562087c64..ce2fc75bc0a 100644 --- a/compiler/testData/codegen/light-analysis/enum/companionObjectInEnum.txt +++ b/compiler/testData/codegen/light-analysis/enum/companionObjectInEnum.txt @@ -2,7 +2,6 @@ public final class CompanionObjectInEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Game { public final static field Companion: Game.Companion public final static field PAPER: Game @@ -17,7 +16,6 @@ public enum class Game { public static method values(): Game[] } - public final static class Game/Companion { inner class Game/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/enum/emptyConstructor.txt b/compiler/testData/codegen/light-analysis/enum/emptyConstructor.txt index 21e78bbbc46..0ac9a21f675 100644 --- a/compiler/testData/codegen/light-analysis/enum/emptyConstructor.txt +++ b/compiler/testData/codegen/light-analysis/enum/emptyConstructor.txt @@ -2,7 +2,6 @@ public final class test/EmptyConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class test/My { public final static field ENTRY: test.My private final @org.jetbrains.annotations.NotNull field s: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/enum/emptyEnumValuesValueOf.txt b/compiler/testData/codegen/light-analysis/enum/emptyEnumValuesValueOf.txt index a3539fdc7bf..c9459250cbf 100644 --- a/compiler/testData/codegen/light-analysis/enum/emptyEnumValuesValueOf.txt +++ b/compiler/testData/codegen/light-analysis/enum/emptyEnumValuesValueOf.txt @@ -4,7 +4,6 @@ public enum class Empty { public static method values(): Empty[] } - public final class EmptyEnumValuesValueOfKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/enumInheritedFromTrait.txt b/compiler/testData/codegen/light-analysis/enum/enumInheritedFromTrait.txt index 27f889bafcd..f68f534bd45 100644 --- a/compiler/testData/codegen/light-analysis/enum/enumInheritedFromTrait.txt +++ b/compiler/testData/codegen/light-analysis/enum/enumInheritedFromTrait.txt @@ -2,7 +2,6 @@ public final class test/EnumInheritedFromTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract enum class test/MyEnum { public final static field E1: test.MyEnum public final static field E2: test.MyEnum @@ -13,21 +12,18 @@ public abstract enum class test/MyEnum { public static method values(): test.MyEnum[] } - final static class test/MyEnum/E1 { inner class test/MyEnum/E1 method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - final static class test/MyEnum/E2 { inner class test/MyEnum/E2 method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public interface test/T { public abstract @org.jetbrains.annotations.NotNull method f(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/enumShort.txt b/compiler/testData/codegen/light-analysis/enum/enumShort.txt index a0685058199..318d24f3f8e 100644 --- a/compiler/testData/codegen/light-analysis/enum/enumShort.txt +++ b/compiler/testData/codegen/light-analysis/enum/enumShort.txt @@ -9,7 +9,6 @@ public enum class Color { public static method values(): Color[] } - public final class EnumShortKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(): int diff --git a/compiler/testData/codegen/light-analysis/enum/enumWithLambdaParameter.txt b/compiler/testData/codegen/light-analysis/enum/enumWithLambdaParameter.txt index fc6900e2360..e3fa184ab66 100644 --- a/compiler/testData/codegen/light-analysis/enum/enumWithLambdaParameter.txt +++ b/compiler/testData/codegen/light-analysis/enum/enumWithLambdaParameter.txt @@ -2,7 +2,6 @@ public final class EnumWithLambdaParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Sign { private final @org.jetbrains.annotations.NotNull field func: kotlin.jvm.functions.Function2 public final static field mult: Sign @@ -16,7 +15,6 @@ public enum class Sign { public static method values(): Sign[] } - final static class Sign/mult { inner class Sign/mult method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/light-analysis/enum/inPackage.txt b/compiler/testData/codegen/light-analysis/enum/inPackage.txt index b69b11ca131..2a6f4b1f1ba 100644 --- a/compiler/testData/codegen/light-analysis/enum/inPackage.txt +++ b/compiler/testData/codegen/light-analysis/enum/inPackage.txt @@ -3,7 +3,6 @@ public final class test/InPackageKt { public final static @org.jetbrains.annotations.NotNull method foo(): test.Season } - public enum class test/Season { public final static field AUTUMN: test.Season public final static field SPRING: test.Season diff --git a/compiler/testData/codegen/light-analysis/enum/inclassobj.txt b/compiler/testData/codegen/light-analysis/enum/inclassobj.txt index 73f7954171c..d8806ff220e 100644 --- a/compiler/testData/codegen/light-analysis/enum/inclassobj.txt +++ b/compiler/testData/codegen/light-analysis/enum/inclassobj.txt @@ -4,7 +4,6 @@ public final class Context { public method (): void } - public final static class Context/Companion { inner class Context/Companion inner class Context/Companion/OsType @@ -12,7 +11,6 @@ public final static class Context/Companion { public final @org.jetbrains.annotations.NotNull method getOperatingSystemType(): Context.Companion.OsType } - public static enum class Context/Companion/OsType { public final static field LINUX: Context.Companion.OsType public final static field OTHER: Context.Companion.OsType @@ -23,7 +21,6 @@ public static enum class Context/Companion/OsType { public static method values(): Context.Companion.OsType[] } - public final class InclassobjKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/inner.txt b/compiler/testData/codegen/light-analysis/enum/inner.txt index 6aef6da6911..a7fe13a423c 100644 --- a/compiler/testData/codegen/light-analysis/enum/inner.txt +++ b/compiler/testData/codegen/light-analysis/enum/inner.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public static enum class A/E { public final static field OK: A.E inner class A/E @@ -12,7 +11,6 @@ public static enum class A/E { public static method values(): A.E[] } - public final class InnerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/innerWithExistingClassObject.txt b/compiler/testData/codegen/light-analysis/enum/innerWithExistingClassObject.txt index 00783398ce0..be8c7f1bb49 100644 --- a/compiler/testData/codegen/light-analysis/enum/innerWithExistingClassObject.txt +++ b/compiler/testData/codegen/light-analysis/enum/innerWithExistingClassObject.txt @@ -5,13 +5,11 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public static enum class A/E { public final static field OK: A.E inner class A/E @@ -20,7 +18,6 @@ public static enum class A/E { public static method values(): A.E[] } - public final class InnerWithExistingClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/kt1119.txt b/compiler/testData/codegen/light-analysis/enum/kt1119.txt index f2dff7dd5ad..dfb4d7b51c7 100644 --- a/compiler/testData/codegen/light-analysis/enum/kt1119.txt +++ b/compiler/testData/codegen/light-analysis/enum/kt1119.txt @@ -7,7 +7,6 @@ public abstract enum class Direction { public static method values(): Direction[] } - final static class Direction/NORTH { private final @org.jetbrains.annotations.NotNull field someSpecialValue: java.lang.String inner class Direction/NORTH @@ -16,7 +15,6 @@ final static class Direction/NORTH { public final @org.jetbrains.annotations.NotNull method getSomeSpecialValue(): java.lang.String } - public final class Kt1119Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/kt2350.txt b/compiler/testData/codegen/light-analysis/enum/kt2350.txt index 44698e64ffe..eaa2db4f3cf 100644 --- a/compiler/testData/codegen/light-analysis/enum/kt2350.txt +++ b/compiler/testData/codegen/light-analysis/enum/kt2350.txt @@ -9,14 +9,12 @@ public abstract enum class A { public static method values(): A[] } - final static class A/E1 { inner class A/E1 method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method t(): java.lang.String } - public final class Kt2350Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/kt9711.txt b/compiler/testData/codegen/light-analysis/enum/kt9711.txt index 31bc9e16149..88f57a4431e 100644 --- a/compiler/testData/codegen/light-analysis/enum/kt9711.txt +++ b/compiler/testData/codegen/light-analysis/enum/kt9711.txt @@ -2,7 +2,6 @@ public final class Kt9711Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract enum class X { public final static field B: X inner class X/B @@ -12,7 +11,6 @@ public abstract enum class X { public static method values(): X[] } - final static class X/B { private final @org.jetbrains.annotations.NotNull field value2: java.lang.String private final @org.jetbrains.annotations.NotNull field value: kotlin.jvm.functions.Function0 diff --git a/compiler/testData/codegen/light-analysis/enum/kt9711_2.txt b/compiler/testData/codegen/light-analysis/enum/kt9711_2.txt index 4cb9d9d7e03..9ff6b6ffd4d 100644 --- a/compiler/testData/codegen/light-analysis/enum/kt9711_2.txt +++ b/compiler/testData/codegen/light-analysis/enum/kt9711_2.txt @@ -7,7 +7,6 @@ public enum class IssueState { public static method values(): IssueState[] } - final static class IssueState/FIXED { inner class IssueState/FIXED inner class IssueState/FIXED/D @@ -16,7 +15,6 @@ final static class IssueState/FIXED { public final @org.jetbrains.annotations.NotNull method s(): java.lang.String } - public final static class IssueState/FIXED/D { private final @org.jetbrains.annotations.NotNull field k: java.lang.String inner class IssueState/FIXED @@ -25,7 +23,6 @@ public final static class IssueState/FIXED/D { public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String } - public final class Kt9711_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/modifierFlags.txt b/compiler/testData/codegen/light-analysis/enum/modifierFlags.txt index 1e76a0f866e..737f206431c 100644 --- a/compiler/testData/codegen/light-analysis/enum/modifierFlags.txt +++ b/compiler/testData/codegen/light-analysis/enum/modifierFlags.txt @@ -5,7 +5,6 @@ public enum class En { public static method values(): En[] } - public final class ModifierFlagsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/noClassForSimpleEnum.txt b/compiler/testData/codegen/light-analysis/enum/noClassForSimpleEnum.txt index 4fc7222044f..b0025f19d1b 100644 --- a/compiler/testData/codegen/light-analysis/enum/noClassForSimpleEnum.txt +++ b/compiler/testData/codegen/light-analysis/enum/noClassForSimpleEnum.txt @@ -2,7 +2,6 @@ public final class NoClassForSimpleEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class State { public final static field K: State public final static field O: State diff --git a/compiler/testData/codegen/light-analysis/enum/objectInEnum.txt b/compiler/testData/codegen/light-analysis/enum/objectInEnum.txt index 86f0aeb24ee..00834ed9df7 100644 --- a/compiler/testData/codegen/light-analysis/enum/objectInEnum.txt +++ b/compiler/testData/codegen/light-analysis/enum/objectInEnum.txt @@ -9,7 +9,6 @@ public enum class E { public static method values(): E[] } - public final class E/O { public final static field INSTANCE: E.O inner class E/O @@ -17,7 +16,6 @@ public final class E/O { public final method foo(): int } - final static class E/SUBCLASS { inner class E/SUBCLASS inner class E/SUBCLASS/O @@ -25,7 +23,6 @@ final static class E/SUBCLASS { public method bar(): int } - public final class E/SUBCLASS/O { public final static field INSTANCE: E.SUBCLASS.O inner class E/SUBCLASS @@ -34,7 +31,6 @@ public final class E/SUBCLASS/O { public final method foo(): int } - public final class ObjectInEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/ordinal.txt b/compiler/testData/codegen/light-analysis/enum/ordinal.txt index bb938bc328e..37ffe2b3bd5 100644 --- a/compiler/testData/codegen/light-analysis/enum/ordinal.txt +++ b/compiler/testData/codegen/light-analysis/enum/ordinal.txt @@ -2,7 +2,6 @@ public final class OrdinalKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class State { public final static field _0: State public final static field _1: State diff --git a/compiler/testData/codegen/light-analysis/enum/simple.txt b/compiler/testData/codegen/light-analysis/enum/simple.txt index 5a26660b79b..2f770b284a5 100644 --- a/compiler/testData/codegen/light-analysis/enum/simple.txt +++ b/compiler/testData/codegen/light-analysis/enum/simple.txt @@ -8,7 +8,6 @@ public enum class Season { public static method values(): Season[] } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): Season diff --git a/compiler/testData/codegen/light-analysis/enum/sortEnumEntries.txt b/compiler/testData/codegen/light-analysis/enum/sortEnumEntries.txt index 73fd4a213de..0cd12a3deb7 100644 --- a/compiler/testData/codegen/light-analysis/enum/sortEnumEntries.txt +++ b/compiler/testData/codegen/light-analysis/enum/sortEnumEntries.txt @@ -9,7 +9,6 @@ public enum class Game { public static method values(): Game[] } - public final class SortEnumEntriesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/superCallInEnumLiteral.txt b/compiler/testData/codegen/light-analysis/enum/superCallInEnumLiteral.txt index 0195018ca79..8d4d08e6e90 100644 --- a/compiler/testData/codegen/light-analysis/enum/superCallInEnumLiteral.txt +++ b/compiler/testData/codegen/light-analysis/enum/superCallInEnumLiteral.txt @@ -9,21 +9,18 @@ public enum class test/E { public static method values(): test.E[] } - final static class test/E/E1 { inner class test/E/E1 method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - final static class test/E/E2 { inner class test/E/E2 method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class test/SuperCallInEnumLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/toString.txt b/compiler/testData/codegen/light-analysis/enum/toString.txt index d9ab0b707da..a4f92e0153e 100644 --- a/compiler/testData/codegen/light-analysis/enum/toString.txt +++ b/compiler/testData/codegen/light-analysis/enum/toString.txt @@ -6,7 +6,6 @@ public enum class State { public static method values(): State[] } - public final class ToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/enum/valueof.txt b/compiler/testData/codegen/light-analysis/enum/valueof.txt index 6f7aacddf70..3ba12291b1e 100644 --- a/compiler/testData/codegen/light-analysis/enum/valueof.txt +++ b/compiler/testData/codegen/light-analysis/enum/valueof.txt @@ -6,7 +6,6 @@ public enum class Color { public static method values(): Color[] } - public final class ValueofKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method throwsOnGreen(): boolean diff --git a/compiler/testData/codegen/light-analysis/evaluate/char.txt b/compiler/testData/codegen/light-analysis/evaluate/char.txt index 5b646944a63..d03725950a3 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/char.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/char.txt @@ -4,7 +4,6 @@ public annotation class test/Ann { public abstract method c1(): int } - public final class test/CharKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/divide.txt b/compiler/testData/codegen/light-analysis/evaluate/divide.txt index 553300cd279..69342b3611c 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/divide.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/divide.txt @@ -7,7 +7,6 @@ public annotation class Ann { public abstract method s(): short } - public final class DivideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/intrinsics.txt b/compiler/testData/codegen/light-analysis/evaluate/intrinsics.txt index ffab54ef421..a371626150e 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/intrinsics.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/intrinsics.txt @@ -9,7 +9,6 @@ public annotation class Ann { public abstract method p6(): int } - public final class IntrinsicsKt { private final static field prop1: int private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/kt9443.txt b/compiler/testData/codegen/light-analysis/evaluate/kt9443.txt index 512dfd7e5c7..0cc4c06fcb8 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/kt9443.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/kt9443.txt @@ -5,14 +5,12 @@ public abstract class BaseClass { public final @org.jetbrains.annotations.NotNull method run(): kotlin.Pair } - public final class ImplClass { private final field menuId: int public method (): void protected method getMenuId(): int } - public final class Kt9443Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/maxValue.txt b/compiler/testData/codegen/light-analysis/evaluate/maxValue.txt index 28a3f0a3d97..426f90b14f1 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/maxValue.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/maxValue.txt @@ -9,7 +9,6 @@ public annotation class Ann { public abstract method p6(): long } - public final class MaxValueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/maxValueByte.txt b/compiler/testData/codegen/light-analysis/evaluate/maxValueByte.txt index 040d9049947..b88c37599e6 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/maxValueByte.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/maxValueByte.txt @@ -7,7 +7,6 @@ public annotation class Ann { public abstract method p5(): int } - public final class MaxValueByteKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/maxValueInt.txt b/compiler/testData/codegen/light-analysis/evaluate/maxValueInt.txt index 28b8b7e2b71..8b49665e634 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/maxValueInt.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/maxValueInt.txt @@ -7,7 +7,6 @@ public annotation class Ann { public abstract method p5(): int } - public final class MaxValueIntKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/evaluate/minus.txt b/compiler/testData/codegen/light-analysis/evaluate/minus.txt index cc1c1184ce4..4991e448d06 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/minus.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/minus.txt @@ -9,7 +9,6 @@ public annotation class Ann { public abstract method p6(): float } - public final class MinusKt { private final static field prop1: byte private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/mod.txt b/compiler/testData/codegen/light-analysis/evaluate/mod.txt index c9237554daa..811ed60623b 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/mod.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/mod.txt @@ -9,7 +9,6 @@ public annotation class Ann { public abstract method p6(): float } - public final class ModKt { private final static field prop1: byte private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/multiply.txt b/compiler/testData/codegen/light-analysis/evaluate/multiply.txt index bcefea4f858..1fab2adc73b 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/multiply.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/multiply.txt @@ -9,7 +9,6 @@ public annotation class Ann { public abstract method p6(): float } - public final class MultiplyKt { private final static field prop1: byte private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/parenthesized.txt b/compiler/testData/codegen/light-analysis/evaluate/parenthesized.txt index 7302d8323bd..f15d262cef8 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/parenthesized.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/parenthesized.txt @@ -14,7 +14,6 @@ public final class MyClass { public method (): void } - public final class ParenthesizedKt { private final static field prop1: byte private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/plus.txt b/compiler/testData/codegen/light-analysis/evaluate/plus.txt index 167dc731a09..da42fa39037 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/plus.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/plus.txt @@ -14,7 +14,6 @@ public final class MyClass { public method (): void } - public final class PlusKt { private final static field prop1: byte private final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/simpleCallBinary.txt b/compiler/testData/codegen/light-analysis/evaluate/simpleCallBinary.txt index 0d5917651d6..b298c19d048 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/simpleCallBinary.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/simpleCallBinary.txt @@ -13,7 +13,6 @@ public final class MyClass { public method (): void } - public final class SimpleCallBinaryKt { public final static field prop1: int public final static field prop2: int diff --git a/compiler/testData/codegen/light-analysis/evaluate/unaryMinus.txt b/compiler/testData/codegen/light-analysis/evaluate/unaryMinus.txt index a11951f7d88..e7da49b485b 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/unaryMinus.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/unaryMinus.txt @@ -14,7 +14,6 @@ public final class MyClass { public method (): void } - public final class UnaryMinusKt { public final static field prop1: byte public final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/evaluate/unaryPlus.txt b/compiler/testData/codegen/light-analysis/evaluate/unaryPlus.txt index d7d458e2572..c6b2c29f01a 100644 --- a/compiler/testData/codegen/light-analysis/evaluate/unaryPlus.txt +++ b/compiler/testData/codegen/light-analysis/evaluate/unaryPlus.txt @@ -14,7 +14,6 @@ public final class MyClass { public method (): void } - public final class UnaryPlusKt { public final static field prop1: byte public final static field prop2: short diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1061.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1061.txt index 004217fc585..733a2c39249 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1061.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1061.txt @@ -2,7 +2,6 @@ public final class Kt1061Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public final static field INSTANCE: X private final static @org.jetbrains.annotations.NotNull field doit: kotlin.jvm.functions.Function1 diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1249.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1249.txt index 865a9f2f477..5c983388f4d 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1249.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1249.txt @@ -2,7 +2,6 @@ public final class Kt1249Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TestClass { private final @org.jetbrains.annotations.NotNull field body: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1290.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1290.txt index 68cc2a48249..899973721a5 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1290.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1290.txt @@ -5,7 +5,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getFilter(): kotlin.jvm.functions.Function1 } - public final class Kt1290Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(): boolean diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1776.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1776.txt index 105257696c8..4b40aae43b8 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1776.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1776.txt @@ -3,19 +3,16 @@ public interface Expr { public abstract method ttFun(): int } - public final class Expr/DefaultImpls { inner class Expr/DefaultImpls public static method ttFun(p0: Expr): int } - public final class Kt1776Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method sometest(@org.jetbrains.annotations.NotNull p0: Expr): int } - public final class Num { private final field value: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1953_class.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1953_class.txt index 1207b8cff2e..ec88625ee72 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt1953_class.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt1953_class.txt @@ -5,7 +5,6 @@ public final class A { public final method unaryPlus(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt1953_classKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3285.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3285.txt index 80408c57c18..330e9b25bbd 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3285.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3285.txt @@ -3,7 +3,6 @@ public final class Doggy { public method play(): void } - public final class Kt3285Kt { private static @org.jetbrains.annotations.NotNull field sayResult: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -12,13 +11,11 @@ public final class Kt3285Kt { public final static method setSayResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class NoiseMaker { public method (): void public final method say(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public abstract class Pet { public method (): void public abstract method play(): void diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3298.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3298.txt index bd1a39e9a62..1f5c73317c0 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3298.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3298.txt @@ -5,7 +5,6 @@ public final class Foo { private final method unaryPlus(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Kt3298Kt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3646.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3646.txt index 91e6a209760..2195fca568b 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3646.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3646.txt @@ -4,7 +4,6 @@ public final class Foo { public final method getA(): int } - public final class Kt3646Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3969.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3969.txt index c01695c9481..a1723de0268 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt3969.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt3969.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class Kt3969Kt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt4228.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt4228.txt index f1a9b00863b..ffd8fd8e198 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt4228.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt4228.txt @@ -4,13 +4,11 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class Kt4228Kt { private final static @org.jetbrains.annotations.NotNull field foo: kotlin.jvm.functions.Function1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt606.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt606.txt index 12ca1844a28..d84e70d7fe0 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt606.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt606.txt @@ -2,23 +2,19 @@ public interface kt606/ChannelPipeline { public abstract method print(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public interface kt606/ChannelPipelineFactory { public abstract @org.jetbrains.annotations.NotNull method getPipeline(): kt606.ChannelPipeline } - public final class kt606/DefaultChannelPipeline { public method (): void public method print(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } - public final class kt606/Kt606Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class kt606/StandardPipelineFactory { private final @org.jetbrains.annotations.NotNull field config: kotlin.jvm.functions.Function1 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/kt865.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/kt865.txt index acbae5ac81f..a725c8aa2d4 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/kt865.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/kt865.txt @@ -2,7 +2,6 @@ public final class Kt865Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Template { private final @org.jetbrains.annotations.NotNull field collected: java.util.ArrayList public method (): void diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/thisMethodInObjectLiteral.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/thisMethodInObjectLiteral.txt index 757dd7a1e17..8b561b11f3f 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/thisMethodInObjectLiteral.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/thisMethodInObjectLiteral.txt @@ -4,7 +4,6 @@ public final class Test { private final method self(@org.jetbrains.annotations.NotNull p0: java.lang.Object): Test$self$1 } - public final class ThisMethodInObjectLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/extensionFunctions/virtual.txt b/compiler/testData/codegen/light-analysis/extensionFunctions/virtual.txt index 025f373d7ee..5a26798abc1 100644 --- a/compiler/testData/codegen/light-analysis/extensionFunctions/virtual.txt +++ b/compiler/testData/codegen/light-analysis/extensionFunctions/virtual.txt @@ -5,14 +5,12 @@ public final class Handler { public final method times(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function0): void } - public final class Request { private final @org.jetbrains.annotations.NotNull field path: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getPath(): java.lang.String } - public final class VirtualKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/accessorForPrivateSetter.txt b/compiler/testData/codegen/light-analysis/extensionProperties/accessorForPrivateSetter.txt index d064cd46725..12c20088f27 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/accessorForPrivateSetter.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/accessorForPrivateSetter.txt @@ -8,7 +8,6 @@ public final class A { public final method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class AccessorForPrivateSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/genericValForPrimitiveType.txt b/compiler/testData/codegen/light-analysis/extensionProperties/genericValForPrimitiveType.txt index a8e4e2ce7ff..473684712bb 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/genericValForPrimitiveType.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/genericValForPrimitiveType.txt @@ -19,7 +19,6 @@ public final class A { public final method invoke(): void } - public final class GenericValForPrimitiveTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getValProp(p0: java.lang.Object): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/genericVarForPrimitiveType.txt b/compiler/testData/codegen/light-analysis/extensionProperties/genericVarForPrimitiveType.txt index dc7b1ab4a6f..da8d40c7119 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/genericVarForPrimitiveType.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/genericVarForPrimitiveType.txt @@ -27,7 +27,6 @@ public final class A { public final method setShort(p0: short): void } - public final class GenericVarForPrimitiveTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getVarProp(p0: java.lang.Object): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClass.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClass.txt index 1621f900fe9..54ffe968ccc 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClass.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClass.txt @@ -2,7 +2,6 @@ public final class InClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final @org.jetbrains.annotations.NotNull method getFoo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClassLongTypeInReceiver.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClassLongTypeInReceiver.txt index 5fd74e0ccd3..4185144378c 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClassLongTypeInReceiver.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClassLongTypeInReceiver.txt @@ -2,7 +2,6 @@ public final class InClassLongTypeInReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private @org.jetbrains.annotations.NotNull field doubleStorage: java.lang.String private @org.jetbrains.annotations.NotNull field longStorage: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithGetter.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithGetter.txt index faaecb9d9c0..655e77aa9a8 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithGetter.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithGetter.txt @@ -2,7 +2,6 @@ public final class InClassWithGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final @org.jetbrains.annotations.NotNull method getFoo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateGetter.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateGetter.txt index fe199375783..5db38d8a1fb 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateGetter.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateGetter.txt @@ -2,7 +2,6 @@ public final class InClassWithPrivateGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void private final method getFoo(p0: int): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateSetter.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateSetter.txt index de04fda8341..ade5b484b60 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateSetter.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithPrivateSetter.txt @@ -2,7 +2,6 @@ public final class InClassWithPrivateSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private @org.jetbrains.annotations.NotNull field storage: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithSetter.txt b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithSetter.txt index 75d21020227..0e546ee3e7d 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithSetter.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/inClassWithSetter.txt @@ -2,7 +2,6 @@ public final class InClassWithSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private @org.jetbrains.annotations.NotNull field storage: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/extensionProperties/kt9897.txt b/compiler/testData/codegen/light-analysis/extensionProperties/kt9897.txt index 6e810cc0c82..1179b8e0e79 100644 --- a/compiler/testData/codegen/light-analysis/extensionProperties/kt9897.txt +++ b/compiler/testData/codegen/light-analysis/extensionProperties/kt9897.txt @@ -2,7 +2,6 @@ public final class Kt9897Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field INSTANCE: Test private static field l: long diff --git a/compiler/testData/codegen/light-analysis/external/jvmStaticExternal.txt b/compiler/testData/codegen/light-analysis/external/jvmStaticExternal.txt index 3165cdf8fb9..53f08ae722d 100644 --- a/compiler/testData/codegen/light-analysis/external/jvmStaticExternal.txt +++ b/compiler/testData/codegen/light-analysis/external/jvmStaticExternal.txt @@ -2,14 +2,12 @@ public final class foo/JvmStaticExternalKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class foo/ObjWithNative { public final static field INSTANCE: foo.ObjWithNative private method (): void public final static @kotlin.jvm.JvmStatic method bar(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String): double } - public final class foo/WithNative { public final static field Companion: foo.WithNative.Companion inner class foo/WithNative/Companion @@ -17,7 +15,6 @@ public final class foo/WithNative { public final static @kotlin.jvm.JvmStatic method bar(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String): double } - public final static class foo/WithNative/Companion { inner class foo/WithNative/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/external/jvmStaticExternalPrivate.txt b/compiler/testData/codegen/light-analysis/external/jvmStaticExternalPrivate.txt index 0a7fe3c215d..9760b97a3de 100644 --- a/compiler/testData/codegen/light-analysis/external/jvmStaticExternalPrivate.txt +++ b/compiler/testData/codegen/light-analysis/external/jvmStaticExternalPrivate.txt @@ -6,7 +6,6 @@ public final class C { private final static @kotlin.jvm.JvmStatic method foo(): void } - public final static class C/Companion { inner class C/Companion private method (): void @@ -14,7 +13,6 @@ public final static class C/Companion { private final @kotlin.jvm.JvmStatic method foo(): void } - public final class JvmStaticExternalPrivateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/external/withDefaultArg.txt b/compiler/testData/codegen/light-analysis/external/withDefaultArg.txt index 1e960c31fd1..1f745a19096 100644 --- a/compiler/testData/codegen/light-analysis/external/withDefaultArg.txt +++ b/compiler/testData/codegen/light-analysis/external/withDefaultArg.txt @@ -7,7 +7,6 @@ public final class foo/ObjWithNative { public final method foo(p0: int): double } - public final class foo/WithDefaultArgKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public synthetic static method topLevel$default(p0: int, p1: int, p2: java.lang.Object): double diff --git a/compiler/testData/codegen/light-analysis/fakeOverride/diamondFunction.txt b/compiler/testData/codegen/light-analysis/fakeOverride/diamondFunction.txt index 1d2d8d36941..a0a90344236 100644 --- a/compiler/testData/codegen/light-analysis/fakeOverride/diamondFunction.txt +++ b/compiler/testData/codegen/light-analysis/fakeOverride/diamondFunction.txt @@ -3,55 +3,44 @@ public class A { public method foo(): void } - public interface B - public final class C { public method (): void } - public final class D { public method (): void } - public final class DiamondFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class E { public method (): void } - public final class F { public method (): void } - public final class G { public method (): void } - public final class H { public method (): void } - public final class I { public method (): void } - public final class J { public method (): void } - public interface T { public abstract method foo(): void } diff --git a/compiler/testData/codegen/light-analysis/fakeOverride/function.txt b/compiler/testData/codegen/light-analysis/fakeOverride/function.txt index 96eb03167b0..aecd1b9e9af 100644 --- a/compiler/testData/codegen/light-analysis/fakeOverride/function.txt +++ b/compiler/testData/codegen/light-analysis/fakeOverride/function.txt @@ -3,65 +3,52 @@ public class A { public method foo(): void } - public final class B { public method (): void } - public final class C { public method (): void } - public final class D { public method (): void } - public final class E { public method (): void } - public final class F { public method (): void } - public final class FunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class G { public method (): void } - public final class H { public method (): void } - public final class I { public method (): void } - public final class J { public method (): void } - public final class K { public method (): void } - public interface T { public abstract method foo(): void } - public interface U diff --git a/compiler/testData/codegen/light-analysis/fakeOverride/propertyGetter.txt b/compiler/testData/codegen/light-analysis/fakeOverride/propertyGetter.txt index e09c0f2f134..3279614139f 100644 --- a/compiler/testData/codegen/light-analysis/fakeOverride/propertyGetter.txt +++ b/compiler/testData/codegen/light-analysis/fakeOverride/propertyGetter.txt @@ -4,65 +4,52 @@ public class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class B { public method (): void } - public final class C { public method (): void } - public final class D { public method (): void } - public final class E { public method (): void } - public final class F { public method (): void } - public final class G { public method (): void } - public final class H { public method (): void } - public final class I { public method (): void } - public final class J { public method (): void } - public final class K { public method (): void } - public final class PropertyGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public interface U diff --git a/compiler/testData/codegen/light-analysis/fakeOverride/propertySetter.txt b/compiler/testData/codegen/light-analysis/fakeOverride/propertySetter.txt index 47f61ef46d8..13c219d9ac0 100644 --- a/compiler/testData/codegen/light-analysis/fakeOverride/propertySetter.txt +++ b/compiler/testData/codegen/light-analysis/fakeOverride/propertySetter.txt @@ -4,22 +4,18 @@ public class A { public method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class B { public method (): void } - public final class C { public method (): void } - public final class PropertySetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { public abstract @org.jetbrains.annotations.NotNull method getResult(): java.lang.String public abstract method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/fieldRename/constructorAndClassObject.txt b/compiler/testData/codegen/light-analysis/fieldRename/constructorAndClassObject.txt index cfb3576df38..d0834eeb47e 100644 --- a/compiler/testData/codegen/light-analysis/fieldRename/constructorAndClassObject.txt +++ b/compiler/testData/codegen/light-analysis/fieldRename/constructorAndClassObject.txt @@ -2,7 +2,6 @@ public final class ConstructorAndClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field Companion: Test.Companion private final @org.jetbrains.annotations.NotNull field prop$1: java.lang.String @@ -12,7 +11,6 @@ public final class Test { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final static class Test/Companion { inner class Test/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt b/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt index a77d331cbe2..41979f8e505 100644 --- a/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt +++ b/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt @@ -2,12 +2,10 @@ public final class A { public method (): void } - public final class B { public method (): void } - public final class DelegatesKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field s$delegate$1: TestDelegate @@ -17,7 +15,6 @@ public final class DelegatesKt { public final static @org.jetbrains.annotations.NotNull method getS(@org.jetbrains.annotations.NotNull p0: B): java.lang.String } - public class TestDelegate { private final field initializer: kotlin.jvm.functions.Function0 private field value: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/fieldRename/genericPropertyWithItself.txt b/compiler/testData/codegen/light-analysis/fieldRename/genericPropertyWithItself.txt index 79950c0061a..ed24534047f 100644 --- a/compiler/testData/codegen/light-analysis/fieldRename/genericPropertyWithItself.txt +++ b/compiler/testData/codegen/light-analysis/fieldRename/genericPropertyWithItself.txt @@ -2,7 +2,6 @@ public final class GenericPropertyWithItselfKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MPair { private final field first: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/finally/finallyAndFinally.txt b/compiler/testData/codegen/light-analysis/finally/finallyAndFinally.txt index 2b5818ea2bb..2e34eb8faa3 100644 --- a/compiler/testData/codegen/light-analysis/finally/finallyAndFinally.txt +++ b/compiler/testData/codegen/light-analysis/finally/finallyAndFinally.txt @@ -3,7 +3,6 @@ public final class FinallyAndFinallyKt { public final static @org.jetbrains.annotations.NotNull method test1(): MyString } - public final class MyString { private @org.jetbrains.annotations.NotNull field s: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/finally/kt3894.txt b/compiler/testData/codegen/light-analysis/finally/kt3894.txt index 5802ada612c..094461bf503 100644 --- a/compiler/testData/codegen/light-analysis/finally/kt3894.txt +++ b/compiler/testData/codegen/light-analysis/finally/kt3894.txt @@ -3,7 +3,6 @@ public final class Kt3894Kt { public final static @org.jetbrains.annotations.NotNull method test1(): MyString } - public final class MyString { private @org.jetbrains.annotations.NotNull field s: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/finally/loopAndFinally.txt b/compiler/testData/codegen/light-analysis/finally/loopAndFinally.txt index 27b5345f02e..e6357d8e037 100644 --- a/compiler/testData/codegen/light-analysis/finally/loopAndFinally.txt +++ b/compiler/testData/codegen/light-analysis/finally/loopAndFinally.txt @@ -5,7 +5,6 @@ public final class LoopAndFinallyKt { public final static @org.jetbrains.annotations.NotNull method test3(): MyString } - public final class MyString { private @org.jetbrains.annotations.NotNull field s: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/finally/tryLoopTry.txt b/compiler/testData/codegen/light-analysis/finally/tryLoopTry.txt index e0c74239a40..af373b359f2 100644 --- a/compiler/testData/codegen/light-analysis/finally/tryLoopTry.txt +++ b/compiler/testData/codegen/light-analysis/finally/tryLoopTry.txt @@ -7,7 +7,6 @@ public final class MyString { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class TryLoopTryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test1(): MyString diff --git a/compiler/testData/codegen/light-analysis/fullJdk/native/nativePropertyAccessors.txt b/compiler/testData/codegen/light-analysis/fullJdk/native/nativePropertyAccessors.txt index f73a95c8f5d..8e33448b68b 100644 --- a/compiler/testData/codegen/light-analysis/fullJdk/native/nativePropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/fullJdk/native/nativePropertyAccessors.txt @@ -11,7 +11,6 @@ public final class C { public final method setDefaultSetter(p0: int): void } - public final static class C/Companion { inner class C/Companion private method (): void @@ -20,7 +19,6 @@ public final static class C/Companion { public final method setDefaultSetter(p0: int): void } - public final class NativePropertyAccessorsKt { private final static field defaultGetter: int private static field defaultSetter: int diff --git a/compiler/testData/codegen/light-analysis/fullJdk/native/simpleNative.txt b/compiler/testData/codegen/light-analysis/fullJdk/native/simpleNative.txt index 1a9f81473e4..f7a818f7e69 100644 --- a/compiler/testData/codegen/light-analysis/fullJdk/native/simpleNative.txt +++ b/compiler/testData/codegen/light-analysis/fullJdk/native/simpleNative.txt @@ -2,7 +2,6 @@ public final class foo/SimpleNativeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class foo/WithNative { public method (): void public final method foo(): void diff --git a/compiler/testData/codegen/light-analysis/fullJdk/regressions/kt1770.txt b/compiler/testData/codegen/light-analysis/fullJdk/regressions/kt1770.txt index 8a781852b9a..90a89ee3bf4 100644 --- a/compiler/testData/codegen/light-analysis/fullJdk/regressions/kt1770.txt +++ b/compiler/testData/codegen/light-analysis/fullJdk/regressions/kt1770.txt @@ -2,7 +2,6 @@ public final class Kt1770Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyElement { private synthetic final field $$delegate_0: org.w3c.dom.Element public method (@org.jetbrains.annotations.NotNull p0: org.w3c.dom.Element): void diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs.txt index b54235dda61..4dd75856c71 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs.txt @@ -4,12 +4,10 @@ public abstract class B { public final method foo(p0: int): int } - public final class C { public method (): void } - public final class DefaultargsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs2.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs2.txt index 4a3180f1320..8d86d91940d 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs2.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs2.txt @@ -4,7 +4,6 @@ public final class Defaultargs2Kt { public final static @org.jetbrains.annotations.NotNull method reformat(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean, p2: boolean, p3: boolean, @org.jetbrains.annotations.NotNull p4: java.lang.String): T4 } - public final class T4 { private final field c1: boolean private final field c2: boolean diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs3.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs3.txt index c2872c15e2b..fed66e37e2b 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs3.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs3.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method toMyPrefixedString(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String } - public final class Defaultargs3Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs4.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs4.txt index fa1b7dda86b..58e44532515 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs4.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs4.txt @@ -4,7 +4,6 @@ public interface A { public abstract method bar2(p0: int): int } - public final class A/DefaultImpls { inner class A/DefaultImpls public synthetic static method bar$default(p0: A, p1: int, p2: int, p3: java.lang.Object): int @@ -12,19 +11,16 @@ public final class A/DefaultImpls { public synthetic static method bar2$default(p0: A, p1: int, p2: int, p3: java.lang.Object): int } - public abstract class B { public method (): void public method bar(p0: int): int public method bar2(p0: int): int } - public final class C { public method (): void } - public final class Defaultargs4Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs5.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs5.txt index d9d967be3c0..a0cbdbfbb48 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs5.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs5.txt @@ -4,13 +4,11 @@ public abstract class B { public abstract method foo2(p0: int): int } - public final class C { public method (): void public method foo2(p0: int): int } - public final class Defaultargs5Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs6.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs6.txt index 10f1ca56c35..eeb760ad11d 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs6.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs6.txt @@ -3,20 +3,17 @@ public interface A { public abstract method foo(p0: int, p1: int, p2: int): int } - public final class A/DefaultImpls { inner class A/DefaultImpls public synthetic static method foo$default(p0: A, p1: int, p2: int, p3: int, p4: int, p5: java.lang.Object): int public static method foo(p0: A, p1: int, p2: int, p3: int): int } - public final class B { public method (): void public method foo(p0: int, p1: int, p2: int): int } - public final class Defaultargs6Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/defaultargs7.txt b/compiler/testData/codegen/light-analysis/functions/defaultargs7.txt index 8f8863e28b2..f79075c74c8 100644 --- a/compiler/testData/codegen/light-analysis/functions/defaultargs7.txt +++ b/compiler/testData/codegen/light-analysis/functions/defaultargs7.txt @@ -6,7 +6,6 @@ public final class A { public final method getExpected(): int } - public final class Defaultargs7Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/fakeDescriptorWithSeveralOverridenOne.txt b/compiler/testData/codegen/light-analysis/functions/fakeDescriptorWithSeveralOverridenOne.txt index 09fecde705c..e7b10b6ef7e 100644 --- a/compiler/testData/codegen/light-analysis/functions/fakeDescriptorWithSeveralOverridenOne.txt +++ b/compiler/testData/codegen/light-analysis/functions/fakeDescriptorWithSeveralOverridenOne.txt @@ -6,27 +6,21 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public interface ClassDescriptor - public final class ClassDescriptorImpl { public method (): void public @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public interface ClassifierDescriptor - public final class FakeDescriptorWithSeveralOverridenOneKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface MemberDescriptor - public interface Named { public abstract @org.jetbrains.annotations.NotNull method getName(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/functionExpression/functionExpression.txt b/compiler/testData/codegen/light-analysis/functions/functionExpression/functionExpression.txt index b04189f38e3..b80d8d089f4 100644 --- a/compiler/testData/codegen/light-analysis/functions/functionExpression/functionExpression.txt +++ b/compiler/testData/codegen/light-analysis/functions/functionExpression/functionExpression.txt @@ -1,7 +1,6 @@ @java.lang.annotation.Retention public annotation class A - public final class FunctionExpressionKt { private final static @org.jetbrains.annotations.NotNull field foo1: kotlin.jvm.functions.Function1 private final static @org.jetbrains.annotations.NotNull field foo2: kotlin.jvm.functions.Function2 diff --git a/compiler/testData/codegen/light-analysis/functions/functionExpression/functionLiteralExpression.txt b/compiler/testData/codegen/light-analysis/functions/functionExpression/functionLiteralExpression.txt index 47f8cce82fc..7aff1c98db8 100644 --- a/compiler/testData/codegen/light-analysis/functions/functionExpression/functionLiteralExpression.txt +++ b/compiler/testData/codegen/light-analysis/functions/functionExpression/functionLiteralExpression.txt @@ -6,7 +6,6 @@ public final class FunctionLiteralExpressionKt { public final static @org.jetbrains.annotations.NotNull method fooT2(p0: java.lang.Object): kotlin.jvm.functions.Function1 } - public final class t { public final static field INSTANCE: t private method (): void diff --git a/compiler/testData/codegen/light-analysis/functions/functionNtoStringGeneric.txt b/compiler/testData/codegen/light-analysis/functions/functionNtoStringGeneric.txt index 14f82d8db20..8ae229096f3 100644 --- a/compiler/testData/codegen/light-analysis/functions/functionNtoStringGeneric.txt +++ b/compiler/testData/codegen/light-analysis/functions/functionNtoStringGeneric.txt @@ -2,20 +2,17 @@ public final class Bar { public method (): void } - public final class Baz { public method (): void public final @org.jetbrains.annotations.NotNull method baz(p0: java.lang.Object): java.lang.String } - public class Foo { private final @org.jetbrains.annotations.NotNull field lambda: kotlin.jvm.functions.Function1 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void public final @org.jetbrains.annotations.NotNull method getLambda(): kotlin.jvm.functions.Function1 } - public final class FunctionNtoStringGenericKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/extensionInvokeOnExpr.txt b/compiler/testData/codegen/light-analysis/functions/invoke/extensionInvokeOnExpr.txt index af99e00019f..e4ff3063fe6 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/extensionInvokeOnExpr.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/extensionInvokeOnExpr.txt @@ -2,14 +2,12 @@ public final class A { public method (): void } - public final class B { public method (): void public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: A): java.lang.String public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: A, p1: int): java.lang.String } - public final class ExtensionInvokeOnExprKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): A diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/invoke.txt b/compiler/testData/codegen/light-analysis/functions/invoke/invoke.txt index 958bf2478e0..750a2bf38c7 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/invoke.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/invoke.txt @@ -8,13 +8,11 @@ public final class invoke/InvokeKt { public final static @org.jetbrains.annotations.NotNull method test5(@org.jetbrains.annotations.NotNull p0: invoke.Method2, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class invoke/Method { public method (): void public final method invoke(p0: int): int } - public final class invoke/Method2 { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/invokeOnExprByConvention.txt b/compiler/testData/codegen/light-analysis/functions/invoke/invokeOnExprByConvention.txt index 97c12c886db..6b4ff0a51ca 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/invokeOnExprByConvention.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/invokeOnExprByConvention.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method invoke(p0: int): java.lang.String } - public final class InvokeOnExprByConventionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): A diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3189.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3189.txt index 061915add75..6060caad925 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3189.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3189.txt @@ -6,7 +6,6 @@ public final class Bad { public final method test(): int } - public final class Kt3189Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3190.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3190.txt index 934d945f041..103c7b9f346 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3190.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3190.txt @@ -6,7 +6,6 @@ public final class Cached { public method invoke(p0: java.lang.Object): java.lang.Object } - public final class Kt3190Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getOrPut(@org.jetbrains.annotations.NotNull p0: java.util.Map, p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function0): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3450getAndInvoke.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3450getAndInvoke.txt index e195d908d1b..e7b8297f5a3 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3450getAndInvoke.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3450getAndInvoke.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String } - public final class Kt3450getAndInvokeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3772.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3772.txt index 0e00b0a84d2..db03275516c 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3772.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3772.txt @@ -3,23 +3,19 @@ public class A { public final method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int } - public final class B { public method (): void public final method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int } - public class C { public method (): void } - public class D { public method (): void } - public final class Kt3772Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getAttr(@org.jetbrains.annotations.NotNull p0: C): A diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3821invokeOnThis.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3821invokeOnThis.txt index 8231b3db5e5..ec6c357f018 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3821invokeOnThis.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3821invokeOnThis.txt @@ -4,7 +4,6 @@ public final class A { public final method invoke(): int } - public final class Kt3821invokeOnThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/invoke/kt3822invokeOnThis.txt b/compiler/testData/codegen/light-analysis/functions/invoke/kt3822invokeOnThis.txt index 85b9bedf07e..a66149ad628 100644 --- a/compiler/testData/codegen/light-analysis/functions/invoke/kt3822invokeOnThis.txt +++ b/compiler/testData/codegen/light-analysis/functions/invoke/kt3822invokeOnThis.txt @@ -5,7 +5,6 @@ public final class B { public synthetic method invoke(): java.lang.Object } - public final class Kt3822invokeOnThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/kt1038.txt b/compiler/testData/codegen/light-analysis/functions/kt1038.txt index 60e45b75566..bc4271c9c73 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1038.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1038.txt @@ -5,7 +5,6 @@ public final class Kt1038Kt { public final static @org.jetbrains.annotations.NotNull method where(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.Iterable } - public final class YieldingIterable { private final @org.jetbrains.annotations.NotNull field yielderFactory: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void @@ -13,7 +12,6 @@ public final class YieldingIterable { public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class YieldingIterator { private @org.jetbrains.annotations.Nullable field current: java.lang.Object private final @org.jetbrains.annotations.NotNull field yieldingFunction: kotlin.jvm.functions.Function0 diff --git a/compiler/testData/codegen/light-analysis/functions/kt1199.txt b/compiler/testData/codegen/light-analysis/functions/kt1199.txt index 9d49eb14fc5..dba2aca2757 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1199.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1199.txt @@ -3,7 +3,6 @@ public final class Kt1199Kt { public final static @org.jetbrains.annotations.NotNull method iterator(@org.jetbrains.annotations.Nullable p0: java.lang.Object): MyIterator } - public interface MyIterator { public abstract method hasNext(): boolean public abstract method next(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/functions/kt1413.txt b/compiler/testData/codegen/light-analysis/functions/kt1413.txt index 9fc6384d4a6..6cdaec1ee77 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1413.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1413.txt @@ -2,12 +2,10 @@ public interface t/I { public abstract method f(): void } - public final class t/Kt1413Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class t/Test { public method (): void public final method bar(): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt1649_1.txt b/compiler/testData/codegen/light-analysis/functions/kt1649_1.txt index 9ab6b65f8c1..8d9b333e253 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1649_1.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1649_1.txt @@ -2,14 +2,12 @@ public interface A { public abstract @org.jetbrains.annotations.Nullable method getMethod(): kotlin.jvm.functions.Function0 } - public final class B { private final @org.jetbrains.annotations.NotNull field method: kotlin.jvm.functions.Function0 public method (): void public @org.jetbrains.annotations.NotNull method getMethod(): kotlin.jvm.functions.Function0 } - public final class Kt1649_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt1649_2.txt b/compiler/testData/codegen/light-analysis/functions/kt1649_2.txt index 8591397c2e6..95b33d295c1 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1649_2.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1649_2.txt @@ -2,14 +2,12 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getMethod(): kotlin.jvm.functions.Function0 } - public final class B { private final @org.jetbrains.annotations.NotNull field method: kotlin.jvm.functions.Function0 public method (): void public @org.jetbrains.annotations.NotNull method getMethod(): kotlin.jvm.functions.Function0 } - public final class Kt1649_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt1739.txt b/compiler/testData/codegen/light-analysis/functions/kt1739.txt index 3f7b0d0accd..25ab8454f31 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt1739.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt1739.txt @@ -2,7 +2,6 @@ public final class Kt1739Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class RunnableFunctionWrapper { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt2270.txt b/compiler/testData/codegen/light-analysis/functions/kt2270.txt index bb7d28b079d..0b552434e3f 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt2270.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt2270.txt @@ -7,7 +7,6 @@ public final class A { public final method getJ(): int } - public final class Kt2270Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/kt2481.txt b/compiler/testData/codegen/light-analysis/functions/kt2481.txt index a76d030940e..6bfa302d892 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt2481.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt2481.txt @@ -3,13 +3,11 @@ public class A { public @org.jetbrains.annotations.NotNull method method(): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method method(): java.lang.String } - public final class Kt2481Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/kt2716.txt b/compiler/testData/codegen/light-analysis/functions/kt2716.txt index 81177a1bddd..fbc393c6199 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt2716.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt2716.txt @@ -2,7 +2,6 @@ public final class someTest/Kt2716Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class someTest/Some { public final static field Companion: someTest.Some.Companion private final @org.jetbrains.annotations.NotNull field v: java.lang.String @@ -11,7 +10,6 @@ public final class someTest/Some { public final @org.jetbrains.annotations.NotNull method getV(): java.lang.String } - public final static class someTest/Some/Companion { inner class someTest/Some/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt2739.txt b/compiler/testData/codegen/light-analysis/functions/kt2739.txt index 50dcd6d1907..84ef9ce6d11 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt2739.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt2739.txt @@ -3,7 +3,6 @@ public final class Kt2739Kt { public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.Object } - public final class Pair { public method (p0: java.lang.Object): void } diff --git a/compiler/testData/codegen/light-analysis/functions/kt3214.txt b/compiler/testData/codegen/light-analysis/functions/kt3214.txt index b027f7b967a..af67a132614 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt3214.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt3214.txt @@ -3,13 +3,11 @@ public final class A { public final method get(@org.jetbrains.annotations.NotNull p0: int[]): int } - public final class B { public method (): void public final method get(@org.jetbrains.annotations.NotNull p0: kotlin.Unit[]): int } - public final class Kt3214Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test1(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/functions/kt3573.txt b/compiler/testData/codegen/light-analysis/functions/kt3573.txt index 4226da6d5a3..d2b92afdd48 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt3573.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt3573.txt @@ -2,13 +2,11 @@ public final class Data { public method (): void } - public final class Kt3573Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method newInit(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Data } - public final class TestClass { private final @org.jetbrains.annotations.NotNull field test: Data public method (): void diff --git a/compiler/testData/codegen/light-analysis/functions/kt3724.txt b/compiler/testData/codegen/light-analysis/functions/kt3724.txt index 38cb0245166..4c00cd1b1ed 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt3724.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt3724.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class Comment { private @org.jetbrains.annotations.NotNull field article: java.lang.String public method (): void @@ -10,13 +9,11 @@ public final class Comment { public final method setArticle(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt3724Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method new(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): Comment } - public class Request { private final @org.jetbrains.annotations.NotNull field handler: kotlin.jvm.functions.Function1 private final @org.jetbrains.annotations.NotNull field s: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/functions/kt785.txt b/compiler/testData/codegen/light-analysis/functions/kt785.txt index 7ccbc682c43..cf9fba0d6d5 100644 --- a/compiler/testData/codegen/light-analysis/functions/kt785.txt +++ b/compiler/testData/codegen/light-analysis/functions/kt785.txt @@ -8,7 +8,6 @@ public final class A { public final method setZ(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } - public final class Kt785Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4783.txt b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4783.txt index 7625673409c..c21ec1997e6 100644 --- a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4783.txt +++ b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4783.txt @@ -3,7 +3,6 @@ public final class Kt4783Kt { public final static method local(): int } - public final class T { private final field value: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4784.txt b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4784.txt index a2f33005fb0..05578dcf6b4 100644 --- a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4784.txt +++ b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4784.txt @@ -3,7 +3,6 @@ public final class Kt4784Kt { public final static @org.jetbrains.annotations.NotNull method plusAssign(): T } - public class T { private field value: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4989.txt b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4989.txt index 4061930204e..8de8862d08b 100644 --- a/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4989.txt +++ b/compiler/testData/codegen/light-analysis/functions/localFunctions/kt4989.txt @@ -4,7 +4,6 @@ public final class It { public final @org.jetbrains.annotations.NotNull method getId(): java.lang.String } - public final class Kt4989Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/functions/localFunctions/localExtensionOnNullableParameter.txt b/compiler/testData/codegen/light-analysis/functions/localFunctions/localExtensionOnNullableParameter.txt index e7e31e327e6..1ceb94c9cae 100644 --- a/compiler/testData/codegen/light-analysis/functions/localFunctions/localExtensionOnNullableParameter.txt +++ b/compiler/testData/codegen/light-analysis/functions/localFunctions/localExtensionOnNullableParameter.txt @@ -3,7 +3,6 @@ public final class LocalExtensionOnNullableParameterKt { public final static @org.jetbrains.annotations.NotNull method localExtensionOnNullableParameter(): T } - public class T { private field value: int public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/functions/localFunctions/localFunctionInConstructor.txt b/compiler/testData/codegen/light-analysis/functions/localFunctions/localFunctionInConstructor.txt index 866c3c9ca90..7ac2db66f1f 100644 --- a/compiler/testData/codegen/light-analysis/functions/localFunctions/localFunctionInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/functions/localFunctions/localFunctionInConstructor.txt @@ -2,7 +2,6 @@ public final class LocalFunctionInConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private final field property: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/functions/recursiveCompareTo.txt b/compiler/testData/codegen/light-analysis/functions/recursiveCompareTo.txt index 6f05a214cbb..93c964c53b7 100644 --- a/compiler/testData/codegen/light-analysis/functions/recursiveCompareTo.txt +++ b/compiler/testData/codegen/light-analysis/functions/recursiveCompareTo.txt @@ -2,7 +2,6 @@ public final class C { public method (): void } - public final class RecursiveCompareToKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method compareTo(@org.jetbrains.annotations.NotNull p0: C, @org.jetbrains.annotations.NotNull p1: C): int diff --git a/compiler/testData/codegen/light-analysis/ieee754/dataClass.txt b/compiler/testData/codegen/light-analysis/ieee754/dataClass.txt index db41284cca9..d360c2867e9 100644 --- a/compiler/testData/codegen/light-analysis/ieee754/dataClass.txt +++ b/compiler/testData/codegen/light-analysis/ieee754/dataClass.txt @@ -2,7 +2,6 @@ public final class DataClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private final field z1: double private final @org.jetbrains.annotations.Nullable field z2: java.lang.Double diff --git a/compiler/testData/codegen/light-analysis/ieee754/generic.txt b/compiler/testData/codegen/light-analysis/ieee754/generic.txt index c9a46713c09..da7abbde07b 100644 --- a/compiler/testData/codegen/light-analysis/ieee754/generic.txt +++ b/compiler/testData/codegen/light-analysis/ieee754/generic.txt @@ -2,7 +2,6 @@ public final class BKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { private final field minus0: java.lang.Object private final field plus0: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/increment/classNaryGetSet.txt b/compiler/testData/codegen/light-analysis/increment/classNaryGetSet.txt index c256a5e74f6..f322e0527d3 100644 --- a/compiler/testData/codegen/light-analysis/increment/classNaryGetSet.txt +++ b/compiler/testData/codegen/light-analysis/increment/classNaryGetSet.txt @@ -8,7 +8,6 @@ public final class A { public final method setX(p0: int): void } - public final class ClassNaryGetSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/increment/classWithGetSet.txt b/compiler/testData/codegen/light-analysis/increment/classWithGetSet.txt index 01166558068..1fa64d96719 100644 --- a/compiler/testData/codegen/light-analysis/increment/classWithGetSet.txt +++ b/compiler/testData/codegen/light-analysis/increment/classWithGetSet.txt @@ -7,7 +7,6 @@ public final class AByte { public final method setValue(p0: byte): void } - public final class ADouble { private field value: double public method (p0: double): void @@ -17,7 +16,6 @@ public final class ADouble { public final method setValue(p0: double): void } - public final class AFloat { private field value: float public method (p0: float): void @@ -27,7 +25,6 @@ public final class AFloat { public final method setValue(p0: float): void } - public final class AInt { private field value: int public method (p0: int): void @@ -37,7 +34,6 @@ public final class AInt { public final method setValue(p0: int): void } - public final class ALong { private field value: long public method (p0: long): void @@ -47,7 +43,6 @@ public final class ALong { public final method setValue(p0: long): void } - public final class AShort { private field value: short public method (p0: short): void @@ -57,7 +52,6 @@ public final class AShort { public final method setValue(p0: short): void } - public final class ClassWithGetSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/increment/genericClassWithGetSet.txt b/compiler/testData/codegen/light-analysis/increment/genericClassWithGetSet.txt index acbf78671fa..041d7647a4f 100644 --- a/compiler/testData/codegen/light-analysis/increment/genericClassWithGetSet.txt +++ b/compiler/testData/codegen/light-analysis/increment/genericClassWithGetSet.txt @@ -7,7 +7,6 @@ public final class A { public final method setValue(p0: java.lang.Object): void } - public final class GenericClassWithGetSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/increment/memberExtOnLong.txt b/compiler/testData/codegen/light-analysis/increment/memberExtOnLong.txt index 89a6a065489..7d39e5812e3 100644 --- a/compiler/testData/codegen/light-analysis/increment/memberExtOnLong.txt +++ b/compiler/testData/codegen/light-analysis/increment/memberExtOnLong.txt @@ -5,7 +5,6 @@ public final class ExtProvider { public final method set(p0: long, p1: int, p2: long): void } - public final class MemberExtOnLongKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClass.txt b/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClass.txt index 8fc2a4b3166..187f619fd69 100644 --- a/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClass.txt +++ b/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClass.txt @@ -2,15 +2,12 @@ public final class Another { public method (): void } - public interface Base - public final class Derived { public method (): void } - public final class PostfixIncrementOnClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method inc(@org.jetbrains.annotations.NotNull p0: Base): Derived diff --git a/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClassSmartCast.txt b/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClassSmartCast.txt index 7121c5607a9..d4ecf4f306b 100644 --- a/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClassSmartCast.txt +++ b/compiler/testData/codegen/light-analysis/increment/postfixIncrementOnClassSmartCast.txt @@ -2,12 +2,10 @@ public class Base { public method (): void } - public final class Derived { public method (): void } - public final class PostfixIncrementOnClassSmartCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method inc(@org.jetbrains.annotations.NotNull p0: Derived): Derived diff --git a/compiler/testData/codegen/light-analysis/increment/postfixNullableClassIncrement.txt b/compiler/testData/codegen/light-analysis/increment/postfixNullableClassIncrement.txt index c6ff5784cf3..0924be03d1c 100644 --- a/compiler/testData/codegen/light-analysis/increment/postfixNullableClassIncrement.txt +++ b/compiler/testData/codegen/light-analysis/increment/postfixNullableClassIncrement.txt @@ -2,7 +2,6 @@ public final class MyClass { public method (): void } - public final class PostfixNullableClassIncrementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method inc(@org.jetbrains.annotations.Nullable p0: MyClass): MyClass diff --git a/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClass.txt b/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClass.txt index 94def62b55f..4bfc5b54263 100644 --- a/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClass.txt +++ b/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClass.txt @@ -2,15 +2,12 @@ public final class Another { public method (): void } - public interface Base - public final class Derived { public method (): void } - public final class PrefixIncrementOnClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method inc(@org.jetbrains.annotations.NotNull p0: Base): Derived diff --git a/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClassSmartCast.txt b/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClassSmartCast.txt index c9ccb6a3e7f..30ef2d32783 100644 --- a/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClassSmartCast.txt +++ b/compiler/testData/codegen/light-analysis/increment/prefixIncrementOnClassSmartCast.txt @@ -2,12 +2,10 @@ public class Base { public method (): void } - public final class Derived { public method (): void } - public final class PrefixIncrementOnClassSmartCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method inc(@org.jetbrains.annotations.NotNull p0: Derived): Derived diff --git a/compiler/testData/codegen/light-analysis/increment/prefixNullableClassIncrement.txt b/compiler/testData/codegen/light-analysis/increment/prefixNullableClassIncrement.txt index dced704f575..a224049c5c8 100644 --- a/compiler/testData/codegen/light-analysis/increment/prefixNullableClassIncrement.txt +++ b/compiler/testData/codegen/light-analysis/increment/prefixNullableClassIncrement.txt @@ -2,7 +2,6 @@ public final class MyClass { public method (): void } - public final class PrefixNullableClassIncrementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method inc(@org.jetbrains.annotations.Nullable p0: MyClass): MyClass diff --git a/compiler/testData/codegen/light-analysis/innerNested/createNestedClass.txt b/compiler/testData/codegen/light-analysis/innerNested/createNestedClass.txt index 23f9ed50b41..251e6cb1b9a 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/createNestedClass.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/createNestedClass.txt @@ -6,13 +6,11 @@ public final class A { public method (): void } - public final static class A/B1 { inner class A/B1 public method (): void } - public final static class A/B2 { private final field x: int inner class A/B2 @@ -20,7 +18,6 @@ public final static class A/B2 { public final method getX(): int } - public final static class A/B3 { private final field x: long private final field y: int @@ -30,7 +27,6 @@ public final static class A/B3 { public final method getY(): int } - public final static class A/B4 { private final @org.jetbrains.annotations.NotNull field str: java.lang.String inner class A/B4 @@ -38,7 +34,6 @@ public final static class A/B4 { public final @org.jetbrains.annotations.NotNull method getStr(): java.lang.String } - public final class CreateNestedClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/createdNestedInOuterMember.txt b/compiler/testData/codegen/light-analysis/innerNested/createdNestedInOuterMember.txt index 1c9b409a4db..f2c67e8b8dc 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/createdNestedInOuterMember.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/createdNestedInOuterMember.txt @@ -3,14 +3,12 @@ public final class CreatedNestedInOuterMemberKt { public final static method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): int } - public final class Outer { inner class Outer/Nested public method (): void public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final static class Outer/Nested { private final field y: int inner class Outer/Nested diff --git a/compiler/testData/codegen/light-analysis/innerNested/extensionFun.txt b/compiler/testData/codegen/light-analysis/innerNested/extensionFun.txt index a95e59517df..8e242095133 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/extensionFun.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/extensionFun.txt @@ -2,7 +2,6 @@ public final class ExtensionFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Inner inner class Outer/Nested @@ -13,14 +12,12 @@ public final class Outer { public final method foo(@org.jetbrains.annotations.NotNull p0: Outer.Inner): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner public method (p0: Outer): void } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/extensionToNested.txt b/compiler/testData/codegen/light-analysis/innerNested/extensionToNested.txt index 69f1fdbc654..0dde3487675 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/extensionToNested.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/extensionToNested.txt @@ -3,13 +3,11 @@ public final class ExtensionToNestedKt { public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Test.Nested): java.lang.String } - public final class Test { inner class Test/Nested public method (): void } - public final static class Test/Nested { private final @org.jetbrains.annotations.NotNull field value: java.lang.String inner class Test/Nested diff --git a/compiler/testData/codegen/light-analysis/innerNested/importNestedClass.txt b/compiler/testData/codegen/light-analysis/innerNested/importNestedClass.txt index 3dde2ff49f4..0a143be45cc 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/importNestedClass.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/importNestedClass.txt @@ -3,21 +3,18 @@ public final class A { public method (): void } - public final static class A/B { inner class A/B inner class A/B/C public method (): void } - public final static class A/B/C { inner class A/B inner class A/B/C public method (): void } - public final class ImportNestedClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/innerGeneric.txt b/compiler/testData/codegen/light-analysis/innerNested/innerGeneric.txt index 079ea0e5225..2cd4e87a2c4 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/innerGeneric.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/innerGeneric.txt @@ -2,13 +2,11 @@ public final class InnerGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Inner public method (): void } - public final class Outer/Inner { private final field t: java.lang.Object synthetic final field this$0: Outer diff --git a/compiler/testData/codegen/light-analysis/innerNested/innerGenericClassFromJava.txt b/compiler/testData/codegen/light-analysis/innerNested/innerGenericClassFromJava.txt index 148c77c71a7..b90b33762a2 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/innerGenericClassFromJava.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/innerGenericClassFromJava.txt @@ -2,7 +2,6 @@ public final class KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final field x: java.lang.Object inner class Outer/Inner @@ -10,7 +9,6 @@ public final class Outer { public final method getX(): java.lang.Object } - public final class Outer/Inner { synthetic final field this$0: Outer private final field y: java.lang.Object @@ -20,7 +18,6 @@ public final class Outer/Inner { public final method getY(): java.lang.Object } - public final class Test { public final static field INSTANCE: Test private method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/innerJavaClass.txt b/compiler/testData/codegen/light-analysis/innerNested/innerJavaClass.txt index 98f8a6164f0..bb62dfb9c07 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/innerJavaClass.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/innerJavaClass.txt @@ -2,14 +2,12 @@ public final class KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyWallpaperService { inner class MyWallpaperService/MyEngine public method (): void public @org.jetbrains.annotations.NotNull method onCreateInner(): JavaClass.InnerClass } - private final class MyWallpaperService/MyEngine { synthetic final field this$0: MyWallpaperService inner class MyWallpaperService/MyEngine diff --git a/compiler/testData/codegen/light-analysis/innerNested/innerLabeledThis.txt b/compiler/testData/codegen/light-analysis/innerNested/innerLabeledThis.txt index 2519d6b2837..17b873ac2ca 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/innerLabeledThis.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/innerLabeledThis.txt @@ -2,7 +2,6 @@ public final class InnerLabeledThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field O: java.lang.String inner class Outer/Inner @@ -11,7 +10,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - public final class Outer/Inner { private final @org.jetbrains.annotations.NotNull field K: java.lang.String synthetic final field this$0: Outer diff --git a/compiler/testData/codegen/light-analysis/innerNested/innerSimple.txt b/compiler/testData/codegen/light-analysis/innerNested/innerSimple.txt index dd560583a51..8651ecebfb9 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/innerSimple.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/innerSimple.txt @@ -2,13 +2,11 @@ public final class InnerSimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Inner public method (): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner diff --git a/compiler/testData/codegen/light-analysis/innerNested/kt3132.txt b/compiler/testData/codegen/light-analysis/innerNested/kt3132.txt index 5a3b6f6bb9e..06a73e7e68d 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/kt3132.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/kt3132.txt @@ -2,7 +2,6 @@ public final class Kt3132Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { inner class Test/Foo inner class Test/FooImplInner @@ -10,19 +9,16 @@ public final class Test { public method (): void } - public static interface Test/Foo { inner class Test/Foo } - public final class Test/FooImplInner { synthetic final field this$0: Test inner class Test/FooImplInner public method (p0: Test): void } - public final static class Test/FooImplNested { inner class Test/FooImplNested public method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/kt3927.txt b/compiler/testData/codegen/light-analysis/innerNested/kt3927.txt index 6b3625d7dcf..77ca765770b 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/kt3927.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/kt3927.txt @@ -3,7 +3,6 @@ public abstract class Base { public method (): void } - public final class Base/Inner { synthetic final field this$0: Base inner class Base/Inner @@ -12,12 +11,10 @@ public final class Base/Inner { public final @org.jetbrains.annotations.NotNull method o(): java.lang.String } - public final class Child { public method (): void } - public final class Kt3927Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/kt5363.txt b/compiler/testData/codegen/light-analysis/innerNested/kt5363.txt index 8dc63b60033..cfd2ea81737 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/kt5363.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/kt5363.txt @@ -2,7 +2,6 @@ public final class Kt5363Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { public final static field Companion: Outer.Companion inner class Outer/Companion @@ -10,14 +9,12 @@ public final class Outer { public method (): void } - public final static class Outer/Companion { inner class Outer/Companion private method (): void private final method extension(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/kt6804.txt b/compiler/testData/codegen/light-analysis/innerNested/kt6804.txt index fdd9b28e7b8..2fa1b65418d 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/kt6804.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/kt6804.txt @@ -2,7 +2,6 @@ public final class Kt6804Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { public final static field Companion: Outer.Companion private final static field s: java.lang.String @@ -11,14 +10,12 @@ public final class Outer { public method (): void } - public final static class Outer/Companion { inner class Outer/Companion private method (): void private final method getS(): java.lang.String } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedClassInObject.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedClassInObject.txt index dbf87761a03..d42a4fb0dc8 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedClassInObject.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedClassInObject.txt @@ -5,19 +5,16 @@ public final class A { private method (): void } - public final static class A/B { inner class A/B public method (): void } - public final static class A/C { inner class A/C public method (): void } - public final class NestedClassInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedClassObject.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedClassObject.txt index 603ed4163e5..c38f2545eeb 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedClassObject.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedClassObject.txt @@ -2,14 +2,12 @@ public final class NestedClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Nested public method (): void public final @org.jetbrains.annotations.NotNull method O(): java.lang.String } - public final static class Outer/Nested { public final static field Companion: Outer.Nested.Companion private final static @org.jetbrains.annotations.NotNull field K: java.lang.String @@ -19,7 +17,6 @@ public final static class Outer/Nested { public method (): void } - public final static class Outer/Nested/Companion { inner class Outer/Nested inner class Outer/Nested/Companion diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedEnumConstant.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedEnumConstant.txt index e4849f529d4..308bc1d84d8 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedEnumConstant.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedEnumConstant.txt @@ -2,13 +2,11 @@ public final class NestedEnumConstantKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Nested public method (): void } - public static enum class Outer/Nested { public final static field K: Outer.Nested public final static field O: Outer.Nested diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedGeneric.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedGeneric.txt index 12ec3106130..c545b531420 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedGeneric.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedGeneric.txt @@ -2,13 +2,11 @@ public final class NestedGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Nested public method (): void } - public final static class Outer/Nested { private final field t: java.lang.Object inner class Outer/Nested diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedInPackage.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedInPackage.txt index c2ac20e7082..e8c38701039 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedInPackage.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedInPackage.txt @@ -2,13 +2,11 @@ public final class Package/NestedInPackageKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Package/Outer { inner class Package/Outer/Nested public method (): void } - public final static class Package/Outer/Nested { private final @org.jetbrains.annotations.NotNull field K: java.lang.String private final @org.jetbrains.annotations.NotNull field O: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedObjects.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedObjects.txt index a95f4defa48..5e58268212b 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedObjects.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedObjects.txt @@ -4,7 +4,6 @@ public final class A { private method (): void } - public final class A/B { public final static field INSTANCE: A.B inner class A/B @@ -12,7 +11,6 @@ public final class A/B { private method (): void } - public final class A/B/C { public final static field INSTANCE: A.B.C private final static @org.jetbrains.annotations.NotNull field ok: java.lang.String @@ -22,7 +20,6 @@ public final class A/B/C { public final @org.jetbrains.annotations.NotNull method getOk(): java.lang.String } - public final class NestedObjectsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/nestedSimple.txt b/compiler/testData/codegen/light-analysis/innerNested/nestedSimple.txt index c5d80fca85b..3adc8217a11 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/nestedSimple.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/nestedSimple.txt @@ -2,13 +2,11 @@ public final class NestedSimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Nested public method (): void } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClass.txt b/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClass.txt index 6b85b59fc00..600812d5e2b 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClass.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClass.txt @@ -3,14 +3,12 @@ public abstract class a/A { public method (): void } - protected final static class a/A/C { inner class a/A/C public method (): void public final @org.jetbrains.annotations.NotNull method result(): java.lang.String } - public final class b/B { private final @org.jetbrains.annotations.NotNull field c: a.A.C public method (): void @@ -18,7 +16,6 @@ public final class b/B { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class b/BKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClassFromJava.txt b/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClassFromJava.txt index 78a914ba286..f1b2a0e1a89 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClassFromJava.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/protectedNestedClassFromJava.txt @@ -3,13 +3,11 @@ public class com/company/Test { public method (): void } - protected final static class com/company/Test/ProtectedClass { inner class com/company/Test/ProtectedClass public method (): void } - public final class com/company/TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/deepInnerHierarchy.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/deepInnerHierarchy.txt index f1cab042637..55a565e8e84 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/deepInnerHierarchy.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/deepInnerHierarchy.txt @@ -9,42 +9,36 @@ public class A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public class A/B { synthetic final field this$0: A inner class A/B public method (@java.lang.Synthetic p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public class A/C { synthetic final field this$0: A inner class A/C public method (@java.lang.Synthetic p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String, p2: double): void } - public class A/D { synthetic final field this$0: A inner class A/D public method (@java.lang.Synthetic p0: A, p1: int, p2: long, @org.jetbrains.annotations.NotNull p3: java.lang.String): void } - public class A/E { synthetic final field this$0: A inner class A/E public method (p0: A): void } - public final class A/F { synthetic final field this$0: A inner class A/F public method (p0: A): void } - public final class DeepInnerHierarchyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.txt index 57854121c4b..2c5a675d7ec 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.txt @@ -6,7 +6,6 @@ public class Father { public final @org.jetbrains.annotations.NotNull method getParam(): java.lang.String } - public final class Father/Child { synthetic final field this$0: Father inner class Father/Child @@ -14,7 +13,6 @@ public final class Father/Child { public method (@java.lang.Synthetic p0: Father, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class Father/Child/Child2 { synthetic final field this$0: Father.Child inner class Father/Child @@ -22,7 +20,6 @@ public final class Father/Child/Child2 { public method (p0: Father.Child): void } - public abstract class Father/InClass { synthetic final field this$0: Father inner class Father/InClass @@ -30,7 +27,6 @@ public abstract class Father/InClass { public final @org.jetbrains.annotations.NotNull method work(): java.lang.String } - public final class InnerExtendsInnerViaSecondaryConstuctorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.txt index 72ee806ef4b..8f0ba005d92 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.txt @@ -6,7 +6,6 @@ public class Father { public final @org.jetbrains.annotations.NotNull method getParam(): java.lang.String } - public final class Father/Child { synthetic final field this$0: Father inner class Father/Child @@ -14,7 +13,6 @@ public final class Father/Child { public method (@java.lang.Synthetic p0: Father, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class Father/Child/Child2 { synthetic final field this$0: Father.Child inner class Father/Child @@ -22,7 +20,6 @@ public final class Father/Child/Child2 { public method (p0: Father.Child): void } - public abstract class Father/InClass { synthetic final field this$0: Father inner class Father/InClass @@ -30,7 +27,6 @@ public abstract class Father/InClass { public final @org.jetbrains.annotations.NotNull method work(): java.lang.String } - public final class InnerExtendsInnerWithProperOuterCaptureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsOuter.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsOuter.txt index 878bfecb0c3..5a90d2de1b5 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsOuter.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/innerExtendsOuter.txt @@ -2,7 +2,6 @@ public final class InnerExtendsOuterKt { public final static method box(): java.lang.String } - public class Outer { private final @org.jetbrains.annotations.NotNull field chars: char[] inner class Outer/Inner @@ -11,7 +10,6 @@ public class Outer { public final method value(): java.lang.String } - public class Outer/Inner { private final @org.jetbrains.annotations.NotNull field s: java.lang.String synthetic final field this$0: Outer diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_1.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_1.txt index 0a7cc196300..229f2cb4308 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_1.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_1.txt @@ -4,13 +4,11 @@ public final class Child { public final @org.jetbrains.annotations.NotNull method getChildInClass(): Father.InClass } - public abstract class Father { inner class Father/InClass public method (): void } - public abstract class Father/InClass { synthetic final field this$0: Father inner class Father/InClass @@ -18,7 +16,6 @@ public abstract class Father/InClass { public abstract @org.jetbrains.annotations.NotNull method work(): java.lang.String } - public final class Kt11833_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_2.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_2.txt index 2efc150b6c0..60655004008 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_2.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/kt11833_2.txt @@ -3,13 +3,11 @@ public final class Child { public final @org.jetbrains.annotations.NotNull method test(): Father.InClass } - public abstract class Father { inner class Father/InClass public method (): void } - public abstract class Father/InClass { synthetic final field this$0: Father inner class Father/InClass @@ -17,7 +15,6 @@ public abstract class Father/InClass { public abstract @org.jetbrains.annotations.NotNull method work(): java.lang.String } - public final class Kt11833_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.txt index a95ae94c691..8fc45f2a057 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.txt @@ -5,14 +5,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class A/Inner { synthetic final field this$0: A inner class A/Inner public method (p0: A): void } - public final class LocalClassOuterDiffersFromInnerOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localExtendsInner.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localExtendsInner.txt index 32be79efed4..b505c12ef13 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localExtendsInner.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/localExtendsInner.txt @@ -6,7 +6,6 @@ public class Father { public final @org.jetbrains.annotations.NotNull method getParam(): java.lang.String } - public final class Father/Child { synthetic final field this$0: Father inner class Father/Child @@ -14,7 +13,6 @@ public final class Father/Child { public final @org.jetbrains.annotations.NotNull method test(): Father.InClass } - public abstract class Father/InClass { synthetic final field this$0: Father inner class Father/InClass @@ -22,7 +20,6 @@ public abstract class Father/InClass { public final @org.jetbrains.annotations.NotNull method work(): java.lang.String } - public final class LocalExtendsInnerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.txt index 1adea75dc40..87c462039f8 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.txt @@ -6,7 +6,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class ObjectExtendsClassDefaultArgumentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassVararg.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassVararg.txt index 5e60d70f079..7578d36639a 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassVararg.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsClassVararg.txt @@ -2,7 +2,6 @@ public final class ObjectExtendsClassVarargKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class SomeClass { private final @org.jetbrains.annotations.NotNull field args: java.lang.String[] private final field other: int diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInner.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInner.txt index 22adc103b6a..2ecb12f89ae 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInner.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInner.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class A/Inner { private final @org.jetbrains.annotations.NotNull field result: java.lang.String synthetic final field this$0: A @@ -13,7 +12,6 @@ public class A/Inner { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class ObjectExtendsInnerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.txt index cd40a766991..df89c107dd0 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class A/Inner { private final field int: int private final @org.jetbrains.annotations.NotNull field result: java.lang.String @@ -16,7 +15,6 @@ public class A/Inner { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class ObjectExtendsInnerDefaultArgumentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.txt index 6d533c42f0e..30a36601b4e 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.txt @@ -4,7 +4,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class ObjectExtendsLocalCaptureInSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.txt b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.txt index abcc85d5a89..40f58f9c3ff 100644 --- a/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.txt +++ b/compiler/testData/codegen/light-analysis/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.txt @@ -5,14 +5,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class A/Inner { synthetic final field this$0: A inner class A/Inner public method (p0: A): void } - public final class ObjectOuterDiffersFromInnerOuterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/javaInterop/generics/allWildcardsOnClass.txt b/compiler/testData/codegen/light-analysis/javaInterop/generics/allWildcardsOnClass.txt index 0c6d04c3903..d1534f5732b 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/generics/allWildcardsOnClass.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/generics/allWildcardsOnClass.txt @@ -4,25 +4,21 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): OutPair } - public abstract class B { public method (): void public @org.jetbrains.annotations.NotNull method bar(): In public @org.jetbrains.annotations.NotNull method foo(): OutPair } - public final class In { public method (): void public final @org.jetbrains.annotations.NotNull method make(p0: java.lang.Object): java.lang.String } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class OutPair { private final field x: java.lang.Object private final field y: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.txt b/compiler/testData/codegen/light-analysis/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.txt index f64d41a597e..fecd203468d 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.txt @@ -3,25 +3,21 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): OutPair } - public abstract class B { public method (): void public @org.jetbrains.annotations.NotNull method bar(): In public @org.jetbrains.annotations.NotNull method foo(): OutPair } - public final class In { public method (): void public final @org.jetbrains.annotations.NotNull method make(p0: java.lang.Object): java.lang.String } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class OutPair { private final field x: java.lang.Object private final field y: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/javaInterop/generics/invariantArgumentsNoWildcard.txt b/compiler/testData/codegen/light-analysis/javaInterop/generics/invariantArgumentsNoWildcard.txt index 99c74539c8e..5e9949d5140 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/generics/invariantArgumentsNoWildcard.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/generics/invariantArgumentsNoWildcard.txt @@ -4,14 +4,12 @@ public final class Inv { public final method getX(): java.lang.Object } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: Inv): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): Inv } - public final class Pair { private final field x: java.lang.Object private final field y: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsConstructor.txt b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsConstructor.txt index 254fbda0e5e..522555f6e71 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsConstructor.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsConstructor.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class CloneCallsConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuper.txt b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuper.txt index 6d9d832fe08..4d1528a6d31 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuper.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuper.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class CloneCallsSuperKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuperAndModifies.txt b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuperAndModifies.txt index 1c78ee5397b..74f23cdabec 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuperAndModifies.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneCallsSuperAndModifies.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class CloneCallsSuperAndModifiesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneHierarchy.txt b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneHierarchy.txt index 1ddf97b63f6..0fe6cefb0d3 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneHierarchy.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneHierarchy.txt @@ -4,7 +4,6 @@ public class A { public synthetic method clone(): java.lang.Object } - public class B { private @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -15,7 +14,6 @@ public class B { public final method setS(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class C { private @org.jetbrains.annotations.NotNull field l: java.util.ArrayList public method (@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.util.ArrayList): void @@ -27,7 +25,6 @@ public class C { public final method setL(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): void } - public final class CloneHierarchyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneableClassWithoutClone.txt b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneableClassWithoutClone.txt index 019ee043c02..d3af95a0687 100644 --- a/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneableClassWithoutClone.txt +++ b/compiler/testData/codegen/light-analysis/javaInterop/objectMethods/cloneableClassWithoutClone.txt @@ -12,7 +12,6 @@ public final class A { public method toString(): java.lang.String } - public final class CloneableClassWithoutCloneKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jdk/kt1397.txt b/compiler/testData/codegen/light-analysis/jdk/kt1397.txt index cc72d34d6fd..92cbe4faa8f 100644 --- a/compiler/testData/codegen/light-analysis/jdk/kt1397.txt +++ b/compiler/testData/codegen/light-analysis/jdk/kt1397.txt @@ -16,7 +16,6 @@ public final class IntArrayList { public final method size(): int } - public final class Kt1397Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/captureClassFields.txt b/compiler/testData/codegen/light-analysis/jvmField/captureClassFields.txt index 45d53c05099..5a327752f0c 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/captureClassFields.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/captureClassFields.txt @@ -6,7 +6,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class CaptureClassFieldsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/checkNoAccessors.txt b/compiler/testData/codegen/light-analysis/jvmField/checkNoAccessors.txt index 1797f1ea6f3..17662a3e49e 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/checkNoAccessors.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/checkNoAccessors.txt @@ -6,20 +6,17 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class CheckNoAccessorsKt { public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field field: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkNoAccessors(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void } - public final class Object { public final static field INSTANCE: Object public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field field: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmField/classFieldReference.txt b/compiler/testData/codegen/light-analysis/jvmField/classFieldReference.txt index 2f4c6cbbf50..4b1aa460081 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/classFieldReference.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/classFieldReference.txt @@ -9,7 +9,6 @@ public final class zzz/A { public final method testAccessors(): void } - public final class zzz/ClassFieldReferenceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkAccessor(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KProperty1, p1: java.lang.Object, p2: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/jvmField/classFieldReflection.txt b/compiler/testData/codegen/light-analysis/jvmField/classFieldReflection.txt index 90d6764f89e..024d68d0127 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/classFieldReflection.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/classFieldReflection.txt @@ -9,7 +9,6 @@ public final class zzz/A { public final method testAccessors(): void } - public final class zzz/AWithCompanion { public final static field Companion: zzz.AWithCompanion.Companion public static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field internalField: java.lang.String @@ -18,14 +17,12 @@ public final class zzz/AWithCompanion { public method (): void } - public final static class zzz/AWithCompanion/Companion { inner class zzz/AWithCompanion/Companion private method (): void public final method testAccessors(): void } - public final class zzz/ClassFieldReflectionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkAccessor(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KMutableProperty1, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/jvmField/constructorProperty.txt b/compiler/testData/codegen/light-analysis/jvmField/constructorProperty.txt index 8bccfae00b3..4de0c2f086b 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/constructorProperty.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/constructorProperty.txt @@ -3,7 +3,6 @@ public final class C { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/publicField.txt b/compiler/testData/codegen/light-analysis/jvmField/publicField.txt index cf64c8d4525..dc7fc66f665 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/publicField.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/publicField.txt @@ -6,20 +6,17 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class Object { public final static field INSTANCE: Object public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field field: java.lang.String private method (): void } - public final class PublicFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/simpleMemberProperty.txt b/compiler/testData/codegen/light-analysis/jvmField/simpleMemberProperty.txt index 74b9d73b98a..dc51b0f4d21 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/simpleMemberProperty.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/simpleMemberProperty.txt @@ -3,7 +3,6 @@ public final class C { public method (): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/superCall.txt b/compiler/testData/codegen/light-analysis/jvmField/superCall.txt index 71f369f96d7..1af7f4d6a2e 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/superCall.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/superCall.txt @@ -5,13 +5,11 @@ public class A { public method (): void } - public final class B { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class SuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/superCall2.txt b/compiler/testData/codegen/light-analysis/jvmField/superCall2.txt index 013e93a5ac0..de23a46a515 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/superCall2.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/superCall2.txt @@ -5,18 +5,15 @@ public class A { public method (): void } - public class B { public method (): void } - public class C { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class SuperCall2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmField/visibility.txt b/compiler/testData/codegen/light-analysis/jvmField/visibility.txt index 9af5d4c59a1..5b5e65c7e2d 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/visibility.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/visibility.txt @@ -6,7 +6,6 @@ public final class A { public final method testVisibilities(): void } - public final class AWithCompanion { public final static field Companion: AWithCompanion.Companion public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field internalField: java.lang.String @@ -16,7 +15,6 @@ public final class AWithCompanion { public method (): void } - public final static class AWithCompanion/Companion { inner class AWithCompanion/Companion private method (): void @@ -24,7 +22,6 @@ public final static class AWithCompanion/Companion { public final method testVisibilities(): void } - public final class Object { public final static field INSTANCE: Object public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field internalField: java.lang.String @@ -34,7 +31,6 @@ public final class Object { public final method testVisibilities(): void } - public final class VisibilityKt { public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field internalField: java.lang.String public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field publicField: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmField/writeFieldReference.txt b/compiler/testData/codegen/light-analysis/jvmField/writeFieldReference.txt index 667b3eb7119..fb4001328b0 100644 --- a/compiler/testData/codegen/light-analysis/jvmField/writeFieldReference.txt +++ b/compiler/testData/codegen/light-analysis/jvmField/writeFieldReference.txt @@ -9,7 +9,6 @@ public final class zzz/A { public final method testAccessors(): void } - public final class zzz/WriteFieldReferenceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkAccessor(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KMutableProperty1, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/jvmName/classMembers.txt b/compiler/testData/codegen/light-analysis/jvmName/classMembers.txt index 96847cb1228..c817c743f40 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/classMembers.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/classMembers.txt @@ -18,13 +18,11 @@ public final class C { public final @kotlin.jvm.JvmName method set_rwProperty(p0: int): void } - public final static class C/Inner { inner class C/Inner public method (): void } - public final class ClassMembersKt { private final static @org.jetbrains.annotations.NotNull field ints: java.util.List private final static @org.jetbrains.annotations.NotNull field strs: java.util.List diff --git a/compiler/testData/codegen/light-analysis/jvmName/fileFacades/differentFiles.txt b/compiler/testData/codegen/light-analysis/jvmName/fileFacades/differentFiles.txt index ecab165cafb..b0530f92822 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/fileFacades/differentFiles.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/fileFacades/differentFiles.txt @@ -8,7 +8,6 @@ public final class Foo { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmName/fileFacades/simple.txt b/compiler/testData/codegen/light-analysis/jvmName/fileFacades/simple.txt index fb723dd193f..c6a96096845 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/fileFacades/simple.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/fileFacades/simple.txt @@ -3,7 +3,6 @@ public final class Foo { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmName/multifileClass.txt b/compiler/testData/codegen/light-analysis/jvmName/multifileClass.txt index 87d3c8ec700..e0127f6410a 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/multifileClass.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/multifileClass.txt @@ -5,7 +5,6 @@ public final class test/Test { public final static @org.jetbrains.annotations.NotNull method qux(): java.lang.String } - synthetic final class test/Test__MultifileClassKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalClass.txt b/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalClass.txt index 5cc8d1b39b0..f4773564c63 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalClass.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalClass.txt @@ -4,7 +4,6 @@ public final class test/Test { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class test/Test__MultifileClassWithLocalClassKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalGeneric.txt b/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalGeneric.txt index 6c1518f5df9..96537ca9586 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalGeneric.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/multifileClassWithLocalGeneric.txt @@ -4,7 +4,6 @@ public final class test/Test { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class test/Test__MultifileClassWithLocalGenericKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt b/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt index 6112503f1ec..30776d4a5d3 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt @@ -5,12 +5,10 @@ public final class Delegate { public final method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Object, p2: boolean): void } - public final class PropertyAccessorsUseSiteKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TestIt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private field isFries: boolean diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt index c25fea23f3f..c34cb84ef6d 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt @@ -6,7 +6,6 @@ public final class C { public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final static class C/Companion { inner class C/Companion private method (): void @@ -15,7 +14,6 @@ public final static class C/Companion { public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class CompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt index 4e809ca1e28..c477fdc3a8f 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt @@ -6,7 +6,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(p0: int, p1: int): java.lang.String } - public final class DefaultsNotAtEndKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt index c921a47f6af..233deedf97b 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt @@ -5,7 +5,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String } - public final class DoubleParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt index 6e09b5cd0c8..92e7ed933d0 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt @@ -2,7 +2,6 @@ public final class C { public method (): void } - public final class ExtensionMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt index 1d6b814daed..c83ec08c55d 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt @@ -5,7 +5,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class GenericsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt index 52b0e058967..3ff42551335 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt @@ -2,13 +2,11 @@ public final class InnerClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { inner class Outer/Inner public method (): void } - public final class Outer/Inner { private final @org.jetbrains.annotations.NotNull field s1: java.lang.String private final @org.jetbrains.annotations.NotNull field s2: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt index f8ceb9870a7..c5ffe35b4fd 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt @@ -6,7 +6,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class MultipleDefaultParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt index c1af99fcf0c..a82fa5109c3 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt @@ -5,7 +5,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class NonDefaultParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/primaryConstructor.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/primaryConstructor.txt index 4e40b50b640..15a100d7171 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/primaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/primaryConstructor.txt @@ -6,7 +6,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getStatus(): java.lang.String } - public final class PrimaryConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt index 2d5a3c893d3..30ce435c58a 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt @@ -12,7 +12,6 @@ final class C { public method toString(): java.lang.String } - public final class PrivateClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/secondaryConstructor.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/secondaryConstructor.txt index 9407717dba0..6f496e681ec 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/secondaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/secondaryConstructor.txt @@ -10,7 +10,6 @@ public final class C { public final method setStatus(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class SecondaryConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt index 8b0782605b4..d51c2f93478 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt @@ -5,7 +5,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt index 093b31f5715..a5a1bffa354 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt @@ -6,7 +6,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt index 3ccdeb6f216..27cc73ef1b0 100644 --- a/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt +++ b/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt @@ -5,7 +5,6 @@ public final class C { public final @kotlin.jvm.JvmOverloads method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String[]): void } - public final class VarargsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/annotations.txt b/compiler/testData/codegen/light-analysis/jvmStatic/annotations.txt index 4e721212830..7cc91cbe232 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/annotations.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/annotations.txt @@ -6,7 +6,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @testAnnotation @org.jetbrains.annotations.NotNull method test1(): java.lang.String } - public final static class A/Companion { inner class A/Companion private method (): void @@ -14,7 +13,6 @@ public final static class A/Companion { public final @kotlin.jvm.JvmStatic @testAnnotation @org.jetbrains.annotations.NotNull method test1(): java.lang.String } - public final class B { public final static field INSTANCE: B private final static @org.jetbrains.annotations.NotNull field b: java.lang.String @@ -23,7 +21,6 @@ public final class B { public final static @kotlin.jvm.JvmStatic @testAnnotation @org.jetbrains.annotations.NotNull method test1(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/closure.txt b/compiler/testData/codegen/light-analysis/jvmStatic/closure.txt index c17802f8b3e..ef7922adc40 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/closure.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/closure.txt @@ -14,7 +14,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test6(): java.lang.String } - public final class ClosureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/companionObject.txt b/compiler/testData/codegen/light-analysis/jvmStatic/companionObject.txt index f5496d629e3..2dab8c49336 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/companionObject.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/companionObject.txt @@ -10,7 +10,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test3(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final static class A/Companion { inner class A/Companion private method (): void @@ -22,7 +21,6 @@ public final static class A/Companion { public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test3(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class SimpleCompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/convention.txt b/compiler/testData/codegen/light-analysis/jvmStatic/convention.txt index 3233605aa71..f44932b0c5f 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/convention.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/convention.txt @@ -5,7 +5,6 @@ public final class A { public final method test1(@org.jetbrains.annotations.NotNull p0: B): void } - public final class B { private field s: int public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -15,7 +14,6 @@ public final class B { public final method setS(p0: int): void } - public final class ConventionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/default.txt b/compiler/testData/codegen/light-analysis/jvmStatic/default.txt index 1097e919dbe..3c73ce7d698 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/default.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/default.txt @@ -5,7 +5,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class DefaultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/enumCompanion.txt b/compiler/testData/codegen/light-analysis/jvmStatic/enumCompanion.txt index a4e281e06a2..9619c594dc3 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/enumCompanion.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/enumCompanion.txt @@ -11,7 +11,6 @@ public enum class A { public static method values(): A[] } - public final static class A/Companion { inner class A/Companion private method (): void @@ -20,7 +19,6 @@ public final static class A/Companion { public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String } - public final class EnumCompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/explicitObject.txt b/compiler/testData/codegen/light-analysis/jvmStatic/explicitObject.txt index e40f639de20..304cdd0426b 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/explicitObject.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/explicitObject.txt @@ -10,7 +10,6 @@ public final class AX { public final @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String } - public final class ExplicitObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/funAccess.txt b/compiler/testData/codegen/light-analysis/jvmStatic/funAccess.txt index 9f849a7b6e5..365009505a8 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/funAccess.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/funAccess.txt @@ -4,7 +4,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method a(): java.lang.String } - public final class FunAccessKt { private static @org.jetbrains.annotations.NotNull field holder: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/importStaticMemberFromObject.txt b/compiler/testData/codegen/light-analysis/jvmStatic/importStaticMemberFromObject.txt index d4faa2aeae8..a2f43ec940a 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/importStaticMemberFromObject.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/importStaticMemberFromObject.txt @@ -7,7 +7,6 @@ public final class C { public final static method getP1(): int } - public final static class C/Companion { inner class C/Companion private method (): void @@ -16,12 +15,10 @@ public final static class C/Companion { private synthetic deprecated static @kotlin.jvm.JvmStatic method p1$annotations(): void } - public final class ImportStaticMemberFromObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field INSTANCE: O private final static field p: int diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/inline.txt b/compiler/testData/codegen/light-analysis/jvmStatic/inline.txt index 166b6807939..e514ae53988 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/inline.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/inline.txt @@ -5,7 +5,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class InlineKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/inlinePropertyAccessors.txt b/compiler/testData/codegen/light-analysis/jvmStatic/inlinePropertyAccessors.txt index ad98f9e8001..c2658b77dfd 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/inlinePropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/inlinePropertyAccessors.txt @@ -6,7 +6,6 @@ public final class Foo { public final method foo(): void } - public final class InlinePropertyAccessorsKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/kt9897_static.txt b/compiler/testData/codegen/light-analysis/jvmStatic/kt9897_static.txt index c3e6bad0ec0..a1378f2b2d5 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/kt9897_static.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/kt9897_static.txt @@ -2,7 +2,6 @@ public final class Kt9897_staticKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field INSTANCE: Test private static field l: long diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/object.txt b/compiler/testData/codegen/light-analysis/jvmStatic/object.txt index 13f8cd48a31..4749f44d1aa 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/object.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/object.txt @@ -11,7 +11,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test3(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class SimpleObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/postfixInc.txt b/compiler/testData/codegen/light-analysis/jvmStatic/postfixInc.txt index febaca77ae2..e8ca7403db8 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/postfixInc.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/postfixInc.txt @@ -13,7 +13,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic method setC(p0: int): void } - public final class PostfixIncKt { private static @org.jetbrains.annotations.NotNull field holder: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/prefixInc.txt b/compiler/testData/codegen/light-analysis/jvmStatic/prefixInc.txt index 808cd583efe..8ff04ca4e55 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/prefixInc.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/prefixInc.txt @@ -13,7 +13,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic method setC(p0: int): void } - public final class PrefixIncKt { private static @org.jetbrains.annotations.NotNull field holder: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/privateMethod.txt b/compiler/testData/codegen/light-analysis/jvmStatic/privateMethod.txt index c9921f19219..f0bb868b0d0 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/privateMethod.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/privateMethod.txt @@ -5,7 +5,6 @@ public final class A { private final static @kotlin.jvm.JvmStatic method a(): java.lang.String } - public final class A/Z { public final static field INSTANCE: A.Z private final static @org.jetbrains.annotations.NotNull field p: java.lang.String @@ -14,7 +13,6 @@ public final class A/Z { public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String } - public final class PrivateMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/privateSetter.txt b/compiler/testData/codegen/light-analysis/jvmStatic/privateSetter.txt index 5d994e5f960..39316152a65 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/privateSetter.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/privateSetter.txt @@ -2,7 +2,6 @@ public final class KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class TestApp { public final static field Companion: TestApp.Companion private static @org.jetbrains.annotations.NotNull field value: java.lang.String @@ -12,7 +11,6 @@ public class TestApp { private final static method setValue(p0: java.lang.String): void } - public final static class TestApp/Companion { inner class TestApp/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccess.txt b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccess.txt index d19d6847fc2..cecc1d48bed 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccess.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccess.txt @@ -13,7 +13,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic method setC(p0: int): void } - public final class PropertyAccessKt { private static @org.jetbrains.annotations.NotNull field holder: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsCompanion.txt b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsCompanion.txt index 8aae191fea5..1e6ea60ac27 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsCompanion.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsCompanion.txt @@ -10,7 +10,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getC(): java.lang.Runnable } - public final static class Foo/Companion { inner class Foo/Companion private method (): void @@ -19,7 +18,6 @@ public final static class Foo/Companion { private final method getA(): java.lang.String } - public final class PropertyAccessorsCompanionKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsObject.txt b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsObject.txt index 770f4368387..e7764b911ed 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsObject.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAccessorsObject.txt @@ -9,7 +9,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getC(): java.lang.Runnable } - public final class PropertyAccessorsObjectKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAsDefault.txt b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAsDefault.txt index 8f175c291a5..8b13c50c950 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/propertyAsDefault.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/propertyAsDefault.txt @@ -2,7 +2,6 @@ public final class PropertyAsDefaultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { public final static field INSTANCE: X private final static @org.jetbrains.annotations.NotNull field x: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/simple.txt b/compiler/testData/codegen/light-analysis/jvmStatic/simple.txt index 7e568c6f689..35f86299d8a 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/simple.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/simple.txt @@ -13,7 +13,6 @@ public final class A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test5(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/jvmStatic/syntheticAccessor.txt b/compiler/testData/codegen/light-analysis/jvmStatic/syntheticAccessor.txt index 99c0e0d426e..c519cc15c16 100644 --- a/compiler/testData/codegen/light-analysis/jvmStatic/syntheticAccessor.txt +++ b/compiler/testData/codegen/light-analysis/jvmStatic/syntheticAccessor.txt @@ -6,7 +6,6 @@ public final class C { private final static @kotlin.jvm.JvmStatic method foo(): java.lang.String } - public final static class C/Companion { inner class C/Companion private method (): void @@ -14,7 +13,6 @@ public final static class C/Companion { private final @kotlin.jvm.JvmStatic method foo(): java.lang.String } - public final class SyntheticAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/labels/labeledDeclarations.txt b/compiler/testData/codegen/light-analysis/labels/labeledDeclarations.txt index 4226b2acd8e..9454cecdc78 100644 --- a/compiler/testData/codegen/light-analysis/labels/labeledDeclarations.txt +++ b/compiler/testData/codegen/light-analysis/labels/labeledDeclarations.txt @@ -13,7 +13,6 @@ public final class A { public method toString(): java.lang.String } - public final class LabeledDeclarationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/labels/propertyAccessorObject.txt b/compiler/testData/codegen/light-analysis/labels/propertyAccessorObject.txt index 0034525a01a..261bc7104ce 100644 --- a/compiler/testData/codegen/light-analysis/labels/propertyAccessorObject.txt +++ b/compiler/testData/codegen/light-analysis/labels/propertyAccessorObject.txt @@ -2,7 +2,6 @@ public interface Base { public abstract method foo(): int } - public final class PropertyAccessorObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getGetter(p0: int): int diff --git a/compiler/testData/codegen/light-analysis/labels/propertyInClassAccessor.txt b/compiler/testData/codegen/light-analysis/labels/propertyInClassAccessor.txt index 1d4b0e4b855..bd070d2382b 100644 --- a/compiler/testData/codegen/light-analysis/labels/propertyInClassAccessor.txt +++ b/compiler/testData/codegen/light-analysis/labels/propertyInClassAccessor.txt @@ -2,7 +2,6 @@ public final class PropertyInClassAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final method getInnerGetter(p0: int): int diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/exceptionInFieldInitializer.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/exceptionInFieldInitializer.txt index fe7879e9bdb..74816ac74a5 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/exceptionInFieldInitializer.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/exceptionInFieldInitializer.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field p: java.lang.String private final @org.jetbrains.annotations.NotNull field prop: java.lang.String @@ -15,7 +14,6 @@ public final class B { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class ExceptionInFieldInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/ifElse.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/ifElse.txt index 278a3e405a1..c81f93d57f0 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/ifElse.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/ifElse.txt @@ -18,7 +18,6 @@ public final class A { public final method setCond2(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class IfElseKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/increment.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/increment.txt index 6bc0a3265e5..aa35547cde7 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/increment.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/increment.txt @@ -8,7 +8,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: A): void } - public final class IncrementKt { private static @org.jetbrains.annotations.NotNull field globalA: A private static @org.jetbrains.annotations.NotNull field holder: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/optimizations/noOptimization.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/optimizations/noOptimization.txt index 85bedc95597..ed07ac9bca9 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/optimizations/noOptimization.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/optimizations/noOptimization.txt @@ -2,12 +2,10 @@ public final class A { public method (): void } - public final class B { public method (): void } - public final class NoOptimizationKt { private static field holder: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssign.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssign.txt index ac6cd403711..771f98dfbef 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssign.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssign.txt @@ -2,7 +2,6 @@ public final class SafeAssignKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Shape { private @org.jetbrains.annotations.NotNull field result: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssignComplex.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssignComplex.txt index f0686516977..5c0182e0767 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssignComplex.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/safeAssignComplex.txt @@ -10,7 +10,6 @@ public final class SafeAssignComplexKt { public final static method setMainShape(@org.jetbrains.annotations.Nullable p0: Shape): void } - public final class Shape { private @org.jetbrains.annotations.Nullable field innerShape: Shape private @org.jetbrains.annotations.NotNull field result: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/safeCallAndArray.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/safeCallAndArray.txt index d6c46d18308..96699c86023 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/safeCallAndArray.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/safeCallAndArray.txt @@ -3,7 +3,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method calc(): java.lang.String } - public final class SafeCallAndArrayKt { public final static @org.jetbrains.annotations.Nullable method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/toString.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/toString.txt index 9a6067a0087..1c5200b12f5 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/toString.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/toString.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method get_kind(): java.lang.String } - public final class ToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/tryCatchExpression.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/tryCatchExpression.txt index 7708046b07f..85a77f8ab8c 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/tryCatchExpression.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/tryCatchExpression.txt @@ -4,7 +4,6 @@ public final class A { public final method getP(): int } - public final class TryCatchExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/lazyCodegen/when.txt b/compiler/testData/codegen/light-analysis/lazyCodegen/when.txt index 1359e12775c..60bd9635427 100644 --- a/compiler/testData/codegen/light-analysis/lazyCodegen/when.txt +++ b/compiler/testData/codegen/light-analysis/lazyCodegen/when.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method get_kind(): java.lang.String } - public final class WhenKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInInitializer.txt b/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInInitializer.txt index 89f7c3e1348..68fc4471d03 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInInitializer.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInInitializer.txt @@ -5,7 +5,6 @@ public final class A { public final method setA(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class AnonymousObjectInInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInParameterInitializer.txt b/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInParameterInitializer.txt index 165e19cc665..4b9117dce78 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInParameterInitializer.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/anonymousObjectInParameterInitializer.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class AnonymousObjectInParameterInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/inExtensionFunction.txt b/compiler/testData/codegen/light-analysis/localClasses/inExtensionFunction.txt index 792d4948f2a..8039725b155 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/inExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/inExtensionFunction.txt @@ -4,7 +4,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class test/InExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method a(@org.jetbrains.annotations.NotNull p0: test.A): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/localClasses/inExtensionProperty.txt b/compiler/testData/codegen/light-analysis/localClasses/inExtensionProperty.txt index 6b9969fffb6..10e2115c3fb 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/inExtensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/inExtensionProperty.txt @@ -4,7 +4,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class test/InExtensionPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getA(@org.jetbrains.annotations.NotNull p0: test.A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionFunction.txt b/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionFunction.txt index 11aeca3693a..0369d4b1703 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionFunction.txt @@ -4,7 +4,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class test/C { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -13,7 +12,6 @@ public final class test/C { public final @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: test.A): java.lang.String } - public final class test/InLocalExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionProperty.txt b/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionProperty.txt index f6e6b08ee58..31d0ab4f5b8 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/inLocalExtensionProperty.txt @@ -4,7 +4,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class test/C { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -13,7 +12,6 @@ public final class test/C { public final @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: test.A): java.lang.String } - public final class test/InLocalExtensionPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/innerClassInLocalClass.txt b/compiler/testData/codegen/light-analysis/localClasses/innerClassInLocalClass.txt index 12124f29d49..c96d2979b66 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/innerClassInLocalClass.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/innerClassInLocalClass.txt @@ -5,7 +5,6 @@ public final class A { public final method getA(): int } - public final class InnerClassInLocalClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/kt2700.txt b/compiler/testData/codegen/light-analysis/localClasses/kt2700.txt index dc4df945716..dcdcac241cb 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/kt2700.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/kt2700.txt @@ -3,13 +3,11 @@ public final class a/b/Kt2700Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface a/b/Test { inner class a/b/Test/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method invoke(): java.lang.String } - public final class a/b/Test/DefaultImpls { inner class a/b/Test/DefaultImpls public static @org.jetbrains.annotations.NotNull method invoke(p0: a.b.Test): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/localClasses/kt3210.txt b/compiler/testData/codegen/light-analysis/localClasses/kt3210.txt index 645810e8a5c..335263de5ba 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/kt3210.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/kt3210.txt @@ -2,20 +2,16 @@ public interface org/example/KotlinCallback { public abstract method on(p0: java.lang.Object): void } - public interface org/example/KotlinProcessor { public abstract method execute(@org.jetbrains.annotations.Nullable p0: org.example.KotlinCallback): void } - public final class org/example/Kt3210Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface org/example/SomeTrait - public final class org/example/Test { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method execute(@org.jetbrains.annotations.Nullable p0: org.example.KotlinCallback): void diff --git a/compiler/testData/codegen/light-analysis/localClasses/kt3389.txt b/compiler/testData/codegen/light-analysis/localClasses/kt3389.txt index 8b489c872ed..c3aa5c3dc31 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/kt3389.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/kt3389.txt @@ -2,7 +2,6 @@ public final class t/Kt3389Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class t/Reproduce { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/localClasses/kt4174.txt b/compiler/testData/codegen/light-analysis/localClasses/kt4174.txt index 4f227de94e2..fe2b53ef7d8 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/kt4174.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/kt4174.txt @@ -7,7 +7,6 @@ public final class B { public final method setX(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class C { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -15,7 +14,6 @@ public class C { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class Kt4174Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/localClass.txt b/compiler/testData/codegen/light-analysis/localClasses/localClass.txt index d3ecff5dc48..6dc41830c00 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/localClass.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/localClass.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method a(): java.lang.String } - public final class LocalClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/localClassCaptureExtensionReceiver.txt b/compiler/testData/codegen/light-analysis/localClasses/localClassCaptureExtensionReceiver.txt index 02753a33ebd..e666696471c 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/localClassCaptureExtensionReceiver.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/localClassCaptureExtensionReceiver.txt @@ -2,7 +2,6 @@ public final class LocalClassCaptureExtensionReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { public method (): void public final @org.jetbrains.annotations.NotNull method id(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/localClasses/localClassInInitializer.txt b/compiler/testData/codegen/light-analysis/localClasses/localClassInInitializer.txt index f80a220be13..febcfce1ec1 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/localClassInInitializer.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/localClassInInitializer.txt @@ -5,7 +5,6 @@ public final class A { public final method setA(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class LocalClassInInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/localClassInParameterInitializer.txt b/compiler/testData/codegen/light-analysis/localClasses/localClassInParameterInitializer.txt index a8c9aa1e0a9..95220c44aa3 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/localClassInParameterInitializer.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/localClassInParameterInitializer.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class LocalClassInParameterInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/localClasses/localExtendsInnerAndReferencesOuterMember.txt b/compiler/testData/codegen/light-analysis/localClasses/localExtendsInnerAndReferencesOuterMember.txt index f7316bf815e..0bb360adef9 100644 --- a/compiler/testData/codegen/light-analysis/localClasses/localExtendsInnerAndReferencesOuterMember.txt +++ b/compiler/testData/codegen/light-analysis/localClasses/localExtendsInnerAndReferencesOuterMember.txt @@ -5,14 +5,12 @@ public final class A { public final method foo(): int } - public class A/Inner { synthetic final field this$0: A inner class A/Inner public method (p0: A): void } - public final class LocalExtendsInnerAndReferencesOuterMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/mangling/field.txt b/compiler/testData/codegen/light-analysis/mangling/field.txt index 5118b994de8..825d6e0a4d7 100644 --- a/compiler/testData/codegen/light-analysis/mangling/field.txt +++ b/compiler/testData/codegen/light-analysis/mangling/field.txt @@ -4,7 +4,6 @@ public final class test/FieldKt { public final static method getNoMangling(): int } - public final class test/Z { private field noMangling: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/mangling/fun.txt b/compiler/testData/codegen/light-analysis/mangling/fun.txt index 1722eff3e81..bed74425e57 100644 --- a/compiler/testData/codegen/light-analysis/mangling/fun.txt +++ b/compiler/testData/codegen/light-analysis/mangling/fun.txt @@ -3,7 +3,6 @@ public final class test/FunKt { public final static method noMangling(): int } - public final class test/Z { public method (): void public final method mangled$test_module(): int diff --git a/compiler/testData/codegen/light-analysis/mangling/internalOverride.txt b/compiler/testData/codegen/light-analysis/mangling/internalOverride.txt index 76e4fcf1968..3d83c9f4213 100644 --- a/compiler/testData/codegen/light-analysis/mangling/internalOverride.txt +++ b/compiler/testData/codegen/light-analysis/mangling/internalOverride.txt @@ -5,13 +5,11 @@ public class A { public @org.jetbrains.annotations.NotNull method test$test_module(): java.lang.String } - public final class InternalOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method invokeOnA(@org.jetbrains.annotations.NotNull p0: A): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/mangling/internalOverrideSuperCall.txt b/compiler/testData/codegen/light-analysis/mangling/internalOverrideSuperCall.txt index 52faeeafc4f..77f894a0022 100644 --- a/compiler/testData/codegen/light-analysis/mangling/internalOverrideSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/mangling/internalOverrideSuperCall.txt @@ -5,12 +5,10 @@ public class A { public @org.jetbrains.annotations.NotNull method test$test_module(): java.lang.String } - public final class InternalOverrideSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/mangling/noOverrideWithJava.txt b/compiler/testData/codegen/light-analysis/mangling/noOverrideWithJava.txt index ff7fd5f9029..43374b98196 100644 --- a/compiler/testData/codegen/light-analysis/mangling/noOverrideWithJava.txt +++ b/compiler/testData/codegen/light-analysis/mangling/noOverrideWithJava.txt @@ -3,7 +3,6 @@ public class A { public @org.jetbrains.annotations.NotNull method test$test_module(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/mangling/publicOverride.txt b/compiler/testData/codegen/light-analysis/mangling/publicOverride.txt index 93ae1dd9952..c896b6d3039 100644 --- a/compiler/testData/codegen/light-analysis/mangling/publicOverride.txt +++ b/compiler/testData/codegen/light-analysis/mangling/publicOverride.txt @@ -5,13 +5,11 @@ public class A { public @org.jetbrains.annotations.NotNull method test$test_module(): java.lang.String } - public final class PublicOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method invokeOnA(@org.jetbrains.annotations.NotNull p0: A): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/mangling/publicOverrideSuperCall.txt b/compiler/testData/codegen/light-analysis/mangling/publicOverrideSuperCall.txt index 92d7dc75ae4..73a05426b80 100644 --- a/compiler/testData/codegen/light-analysis/mangling/publicOverrideSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/mangling/publicOverrideSuperCall.txt @@ -5,12 +5,10 @@ public class A { public @org.jetbrains.annotations.NotNull method test$test_module(): java.lang.String } - public final class PublicOverrideSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field field: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/multiDecl/ComplexInitializer.txt b/compiler/testData/codegen/light-analysis/multiDecl/ComplexInitializer.txt index 0403a1cc933..8e9678393fa 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/ComplexInitializer.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/ComplexInitializer.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class ComplexInitializerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getA(@org.jetbrains.annotations.NotNull p0: A): A diff --git a/compiler/testData/codegen/light-analysis/multiDecl/SimpleVals.txt b/compiler/testData/codegen/light-analysis/multiDecl/SimpleVals.txt index cf2568edd97..732291bffc1 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/SimpleVals.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/SimpleVals.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class SimpleValsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/SimpleValsExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/SimpleValsExtensions.txt index 8862ac52c1c..359b34515af 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/SimpleValsExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/SimpleValsExtensions.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class SimpleValsExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/multiDecl/SimpleVarsExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/SimpleVarsExtensions.txt index b135e4a6951..71e550ccfbd 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/SimpleVarsExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/SimpleVarsExtensions.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class SimpleVarsExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/UnderscoreNames.txt b/compiler/testData/codegen/light-analysis/multiDecl/UnderscoreNames.txt index 084cd891ac4..b22dd3ef474 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/UnderscoreNames.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/UnderscoreNames.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class UnderscoreNamesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInFunctionLiteral.txt b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInFunctionLiteral.txt index 05388eefa3e..94d38177a77 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInFunctionLiteral.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInFunctionLiteral.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class ValCapturedInFunctionLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInLocalFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInLocalFunction.txt index 46b77c62342..99aa599cfc9 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInLocalFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInLocalFunction.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class ValCapturedInLocalFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInObjectLiteral.txt b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInObjectLiteral.txt index 632060a10cc..35eee4e22d2 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInObjectLiteral.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/ValCapturedInObjectLiteral.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class ValCapturedInObjectLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInFunctionLiteral.txt b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInFunctionLiteral.txt index f4ebf2203be..4334c04e95d 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInFunctionLiteral.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInFunctionLiteral.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class VarCapturedInFunctionLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInLocalFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInLocalFunction.txt index 6933125a705..75d2bca68c3 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInLocalFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInLocalFunction.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class VarCapturedInLocalFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInObjectLiteral.txt b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInObjectLiteral.txt index 0c7131afc4f..1a933589a55 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInObjectLiteral.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/VarCapturedInObjectLiteral.txt @@ -4,7 +4,6 @@ public final class A { public final method component2(): int } - public final class VarCapturedInObjectLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/component.txt b/compiler/testData/codegen/light-analysis/multiDecl/component.txt index 5aa4cdd471a..2e97f1e732f 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/component.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/component.txt @@ -3,7 +3,6 @@ public final class ComponentKt { public final static @org.jetbrains.annotations.NotNull method component3(@org.jetbrains.annotations.NotNull p0: S): java.lang.String } - public final class S { private final @org.jetbrains.annotations.NotNull field a: java.lang.String private final @org.jetbrains.annotations.NotNull field b: java.lang.String @@ -14,7 +13,6 @@ public final class S { public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String } - public final class Tester { public method (): void public final @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclFor.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclFor.txt index c6ee1c3453a..049c344dc7d 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclFor.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclFor.txt @@ -6,7 +6,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentExtensions.txt index c2bc46b0a03..2fba01fd42b 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentExtensions.txt @@ -4,7 +4,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: C): int diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.txt index 0f63b8f3146..c4e3967003e 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.txt @@ -4,7 +4,6 @@ public final class C { public final method getI(): int } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -12,7 +11,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index e1eabfb0960..5adf161c569 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,14 +4,12 @@ public final class C { public final method getI(): int } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int public final method component2(@org.jetbrains.annotations.NotNull p0: C): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M, @org.jetbrains.annotations.NotNull p1: java.util.ArrayList): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForValCaptured.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForValCaptured.txt index 057f2456ecb..748b9cb70e9 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForValCaptured.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/MultiDeclForValCaptured.txt @@ -6,7 +6,6 @@ public final class C { public final method getI(): int } - public final class MultiDeclForValCapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.txt index f6abfd2f29f..09b0677b570 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: java.util.ArrayList): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 8066496b9e6..c8b87b0296a 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: long): long } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M, @org.jetbrains.annotations.NotNull p1: java.util.ArrayList): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclFor.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclFor.txt index dab58bd70d0..1e3d9f1ad16 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclFor.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclFor.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentExtensions.txt index ae4701c3cdf..b881d16376c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,7 +25,6 @@ public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensions.txt index 8be36357751..d2a04fdd1d2 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,12 +25,10 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 104f90395ea..aa8d693bbba 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,20 +18,17 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int public final method component2(@org.jetbrains.annotations.NotNull p0: C): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForValCaptured.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForValCaptured.txt index 184cae2be0f..9c5f4f33e29 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForValCaptured.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/MultiDeclForValCaptured.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForValCapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNames.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNames.txt index 2bb97d4c6d6..619e0abe1ce 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNames.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNames.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,7 +20,6 @@ public final class It { public final method setC(p0: int): void } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C @@ -31,7 +29,6 @@ public final class Range { public final @org.jetbrains.annotations.NotNull method iterator(): It } - public final class UnderscoreNamesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNamesDontCallComponent.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNamesDontCallComponent.txt index 60483679e77..5b41df28283 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNamesDontCallComponent.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/UnderscoreNamesDontCallComponent.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method component3(): java.lang.String } - public final class UnderscoreNamesDontCallComponentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclFor.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclFor.txt index dab58bd70d0..1e3d9f1ad16 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclFor.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclFor.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.txt index ae4701c3cdf..b881d16376c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,7 +25,6 @@ public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.txt index 8be36357751..d2a04fdd1d2 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,12 +25,10 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 104f90395ea..aa8d693bbba 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,20 +18,17 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int public final method component2(@org.jetbrains.annotations.NotNull p0: C): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.txt index 184cae2be0f..9c5f4f33e29 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForValCapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.txt index b5de9fe367b..b6079038b9b 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index c16fffbd315..e6edcc3cf5c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: int): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.txt index 878ee0947d6..2fd6e9e4d2a 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 828f74118fb..e97028c3ec8 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: long): long } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.txt index dab58bd70d0..1e3d9f1ad16 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.txt index ae4701c3cdf..b881d16376c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,7 +25,6 @@ public final class MultiDeclForComponentExtensionsKt { public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.txt index 8be36357751..d2a04fdd1d2 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,7 +18,6 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int @@ -27,12 +25,10 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 104f90395ea..aa8d693bbba 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -19,20 +18,17 @@ public final class It { public final method setC(p0: int): void } - public final class M { public method (): void public final method component1(@org.jetbrains.annotations.NotNull p0: C): int public final method component2(@org.jetbrains.annotations.NotNull p0: C): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.txt index 184cae2be0f..9c5f4f33e29 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: C): Range } - public final class It { private field c: int private final @org.jetbrains.annotations.NotNull field from: C @@ -21,13 +20,11 @@ public final class It { public final method setC(p0: int): void } - public final class MultiDeclForValCapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class Range { private final @org.jetbrains.annotations.NotNull field from: C private final @org.jetbrains.annotations.NotNull field to: C diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.txt index b5de9fe367b..b6079038b9b 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index c16fffbd315..e6edcc3cf5c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: int): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.txt index 878ee0947d6..2fd6e9e4d2a 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 828f74118fb..e97028c3ec8 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: long): long } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.txt index b5de9fe367b..b6079038b9b 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index c16fffbd315..e6edcc3cf5c 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: int): int } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.txt index 878ee0947d6..2fd6e9e4d2a 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.txt @@ -5,7 +5,6 @@ public final class M { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class MultiDeclForComponentMemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt b/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt index 828f74118fb..e97028c3ec8 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.txt @@ -4,7 +4,6 @@ public final class M { public final method component2(p0: long): long } - public final class MultiDeclForComponentMemberExtensionsInExtensionFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doTest(@org.jetbrains.annotations.NotNull p0: M): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multiDecl/returnInElvis.txt b/compiler/testData/codegen/light-analysis/multiDecl/returnInElvis.txt index e03ca938a2d..0a36c5af3ef 100644 --- a/compiler/testData/codegen/light-analysis/multiDecl/returnInElvis.txt +++ b/compiler/testData/codegen/light-analysis/multiDecl/returnInElvis.txt @@ -4,7 +4,6 @@ public final class ReturnInElvisKt { public final static @org.jetbrains.annotations.NotNull method test(p0: boolean): java.lang.String } - public final class Z { private final @org.jetbrains.annotations.NotNull field k: java.lang.String private final @org.jetbrains.annotations.NotNull field p: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/callMultifileClassMemberFromOtherPackage.txt b/compiler/testData/codegen/light-analysis/multifileClasses/callMultifileClassMemberFromOtherPackage.txt index 3e0bfbdc6a2..f8178c95160 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/callMultifileClassMemberFromOtherPackage.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/callMultifileClassMemberFromOtherPackage.txt @@ -2,17 +2,14 @@ public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class a/MultifileClass__MultifileClassKt { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class b/CallerKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class test/BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/callsToMultifileClassFromOtherPackage.txt b/compiler/testData/codegen/light-analysis/multifileClasses/callsToMultifileClassFromOtherPackage.txt index 260073c53db..7199a70bdca 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/callsToMultifileClassFromOtherPackage.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/callsToMultifileClassFromOtherPackage.txt @@ -2,7 +2,6 @@ public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull field constOK: java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String @@ -11,7 +10,6 @@ public final class a/MultifileClass { public final static method setVarOK(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - synthetic final class a/MultifileClass___2Kt { private final static @org.jetbrains.annotations.NotNull field valOK: java.lang.String private static @org.jetbrains.annotations.NotNull field varOK: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/constPropertyReferenceFromMultifileClass.txt b/compiler/testData/codegen/light-analysis/multifileClasses/constPropertyReferenceFromMultifileClass.txt index a47f7470300..c297aaa44a1 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/constPropertyReferenceFromMultifileClass.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/constPropertyReferenceFromMultifileClass.txt @@ -5,11 +5,9 @@ public final class _1Kt { @java.lang.annotation.Retention public annotation class a/A - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull field OK: java.lang.String private synthetic deprecated static @a.A method OK$annotations(): void } - synthetic final class a/MultifileClass___2Kt diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/inlineMultifileClassMemberFromOtherPackage.txt b/compiler/testData/codegen/light-analysis/multifileClasses/inlineMultifileClassMemberFromOtherPackage.txt index 9b7e41463b3..b365caaebc2 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/inlineMultifileClassMemberFromOtherPackage.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/inlineMultifileClassMemberFromOtherPackage.txt @@ -3,17 +3,14 @@ public final class a/A { public final static @org.jetbrains.annotations.NotNull method zee(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - synthetic final class a/A__FooKt { public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String } - synthetic final class a/A__ZeeKt { public final static @org.jetbrains.annotations.NotNull method zee(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class test/BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassPartsInitialization.txt b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassPartsInitialization.txt index 1ed3358a2ae..065d8dd6c57 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassPartsInitialization.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassPartsInitialization.txt @@ -2,7 +2,6 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getK(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String @@ -10,25 +9,21 @@ public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getX(): java.lang.Void } - synthetic final class a/MultifileClass__IrrelevantKt { private final static @org.jetbrains.annotations.NotNull field X: java.lang.Void public final static @org.jetbrains.annotations.NotNull method getX(): java.lang.Void } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field O: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - synthetic final class a/MultifileClass__Part2Kt { private final static @org.jetbrains.annotations.NotNull field K: java.lang.String public final static @org.jetbrains.annotations.NotNull method getK(): java.lang.String } - synthetic final class a/MultifileClass__Part3Kt { private final static @org.jetbrains.annotations.NotNull field OK: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWith2Files.txt b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWith2Files.txt index da1515027b6..ebaf8013dd0 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWith2Files.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWith2Files.txt @@ -2,18 +2,15 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Util { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class Util__BarKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - synthetic final class Util__FooKt { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithCrossCall.txt b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithCrossCall.txt index ac956e2be1d..62a29c3c922 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithCrossCall.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithCrossCall.txt @@ -2,7 +2,6 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Util { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method barx(): java.lang.String @@ -10,13 +9,11 @@ public final class Util { public final static @org.jetbrains.annotations.NotNull method foox(): java.lang.String } - synthetic final class Util__BarKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foox(): java.lang.String } - synthetic final class Util__FooKt { public final static @org.jetbrains.annotations.NotNull method barx(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithPrivate.txt b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithPrivate.txt index 4a418bd6b28..1d91144cadf 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithPrivate.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/multifileClassWithPrivate.txt @@ -2,19 +2,16 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Util { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class Util__BarKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String private final static method barx$Util__BarKt(): java.lang.String } - synthetic final class Util__FooKt { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String private final static method foox$Util__FooKt(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToFun.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToFun.txt index 47cf1020d57..4047f6c9d68 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToFun.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToFun.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToInternalValInline.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToInternalValInline.txt index 7a98743113d..ed7e45e56ff 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToInternalValInline.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToInternalValInline.txt @@ -2,13 +2,11 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getOk(): java.lang.String public final static @org.jetbrains.annotations.NotNull method okInline(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field ok: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOk(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToPrivateVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToPrivateVal.txt index 21667c33aac..77fd50bb4fb 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToPrivateVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToPrivateVal.txt @@ -2,13 +2,11 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static field ok: java.lang.String private final static method getOk$MultifileClass__Part1Kt(): java.lang.String } - public final class a/OK { public final static field INSTANCE: a.OK private final static @org.jetbrains.annotations.NotNull field okRef: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToVal.txt index 96eef1bb07a..242395a1ecb 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/callableRefToVal.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field OK: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/calls.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/calls.txt index ac956e2be1d..62a29c3c922 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/calls.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/calls.txt @@ -2,7 +2,6 @@ public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Util { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method barx(): java.lang.String @@ -10,13 +9,11 @@ public final class Util { public final static @org.jetbrains.annotations.NotNull method foox(): java.lang.String } - synthetic final class Util__BarKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foox(): java.lang.String } - synthetic final class Util__FooKt { public final static @org.jetbrains.annotations.NotNull method barx(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/deferredStaticInitialization.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/deferredStaticInitialization.txt index ebfff2771ad..cbe8dbf0b3d 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/deferredStaticInitialization.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/deferredStaticInitialization.txt @@ -2,7 +2,6 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull field K: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String @@ -11,28 +10,23 @@ public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getX2(): java.lang.Void } - synthetic final class a/MultifileClass__IrrelevantPartKt { private final static @org.jetbrains.annotations.NotNull field X1: java.lang.Void public final static @org.jetbrains.annotations.NotNull method getX1(): java.lang.Void } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field O: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - synthetic final class a/MultifileClass__Part2Kt - synthetic final class a/MultifileClass__Part3Kt { private final static @org.jetbrains.annotations.NotNull field OK: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String } - synthetic final class a/MultifileClass__ReallyIrrelevantPartKt { private final static @org.jetbrains.annotations.NotNull field X2: java.lang.Void public final static @org.jetbrains.annotations.NotNull method getX2(): java.lang.Void diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt index 2df52f68fd0..8156a5a3ad3 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field OK$delegate: kotlin.Lazy diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePrivateVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePrivateVal.txt index a0ec985ff82..58b15379ae2 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePrivateVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePrivateVal.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static field OK: java.lang.String private final static method getOK$MultifileClass__Part1Kt(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePublicVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePublicVal.txt index 96eef1bb07a..242395a1ecb 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePublicVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/initializePublicVal.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field OK: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingFuns.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingFuns.txt index 5619f73127c..459201e469f 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingFuns.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingFuns.txt @@ -2,23 +2,19 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static method overlapping$MultifileClass__Part1Kt(): java.lang.String } - synthetic final class a/MultifileClass__Part2Kt { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String private final static method overlapping$MultifileClass__Part2Kt(): java.lang.String } - synthetic final class a/MultifileClass__Part3Kt { private final static method overlapping$MultifileClass__Part3Kt(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingVals.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingVals.txt index 248864205a1..43267d78316 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingVals.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/overlappingVals.txt @@ -2,25 +2,21 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static field overlapping: java.lang.String private final static method getOverlapping$MultifileClass__Part1Kt(): java.lang.String } - synthetic final class a/MultifileClass__Part2Kt { private final static field overlapping: java.lang.String private final static method getOverlapping$MultifileClass__Part2Kt(): java.lang.String public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MultifileClass__Part3Kt { private final static field overlapping: java.lang.String private final static method getOverlapping$MultifileClass__Part3Kt(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlineFunCalledFromJava.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlineFunCalledFromJava.txt index f5388d70321..73ddef87044 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlineFunCalledFromJava.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlineFunCalledFromJava.txt @@ -2,14 +2,12 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MC { public final static @org.jetbrains.annotations.NotNull field K: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String public final static @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - synthetic final class a/MC__Part1Kt { private final static @org.jetbrains.annotations.NotNull field O: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlinedToDifferentPackage.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlinedToDifferentPackage.txt index a41c0e407f1..b1b151fb6ce 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlinedToDifferentPackage.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valAccessFromInlinedToDifferentPackage.txt @@ -2,14 +2,12 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/MultifileClass { public final static @org.jetbrains.annotations.NotNull field K: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String public final static @org.jetbrains.annotations.NotNull method ok(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static @org.jetbrains.annotations.NotNull field O: java.lang.String public final static @org.jetbrains.annotations.NotNull method getO(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valWithAccessor.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valWithAccessor.txt index 586b6a79d93..f9e4b48c617 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valWithAccessor.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/valWithAccessor.txt @@ -2,13 +2,11 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - synthetic final class a/MultifileClass__Part1Kt { private final static field reallyOk: java.lang.String private final static method getReallyOk$MultifileClass__Part1Kt(): java.lang.String } - public final class a/OK { private final @org.jetbrains.annotations.NotNull field ok: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/privateConstVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/privateConstVal.txt index b5d45e85b13..3233e06c9f5 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/privateConstVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/privateConstVal.txt @@ -2,19 +2,16 @@ public final class test/TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class test/Util { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class test/Util__BarKt { private final static field x: java.lang.String public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - synthetic final class test/Util__FooKt { private final static field x: java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/samePartNameDifferentFacades.txt b/compiler/testData/codegen/light-analysis/multifileClasses/samePartNameDifferentFacades.txt index b59d50294e8..da0f40ee10c 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/samePartNameDifferentFacades.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/samePartNameDifferentFacades.txt @@ -2,22 +2,18 @@ public final class test/Bar { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - synthetic final class test/Bar__PartKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class test/BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class test/Foo { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - synthetic final class test/Foo__PartKt { public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/nonLocalReturns/kt6895.txt b/compiler/testData/codegen/light-analysis/nonLocalReturns/kt6895.txt index be660cd18d9..0db012c0d1f 100644 --- a/compiler/testData/codegen/light-analysis/nonLocalReturns/kt6895.txt +++ b/compiler/testData/codegen/light-analysis/nonLocalReturns/kt6895.txt @@ -2,7 +2,6 @@ public final class Kt6895Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class UpdateableThing { private final field lock: java.util.concurrent.locks.ReentrantReadWriteLock private field updateCount: int diff --git a/compiler/testData/codegen/light-analysis/nonLocalReturns/use.txt b/compiler/testData/codegen/light-analysis/nonLocalReturns/use.txt index 7c8a994a86d..d71fea86071 100644 --- a/compiler/testData/codegen/light-analysis/nonLocalReturns/use.txt +++ b/compiler/testData/codegen/light-analysis/nonLocalReturns/use.txt @@ -6,12 +6,10 @@ public final class Holder { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyException { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class TestLocal { private @org.jetbrains.annotations.NotNull field status: Holder public method (): void @@ -29,7 +27,6 @@ public final class TestLocal { private final method underMutexFun(): void } - public final class UseKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/nonLocalReturns/useWithException.txt b/compiler/testData/codegen/light-analysis/nonLocalReturns/useWithException.txt index 47fe260213f..d40210e1c09 100644 --- a/compiler/testData/codegen/light-analysis/nonLocalReturns/useWithException.txt +++ b/compiler/testData/codegen/light-analysis/nonLocalReturns/useWithException.txt @@ -6,12 +6,10 @@ public final class Holder { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyException { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class TestLocal { private @org.jetbrains.annotations.NotNull field status: Holder public method (): void @@ -29,7 +27,6 @@ public final class TestLocal { private final method underMutexFun(): void } - public final class UseWithExceptionKt { public final static method assertError(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/anonymousObjectPropertyInitialization.txt b/compiler/testData/codegen/light-analysis/objects/anonymousObjectPropertyInitialization.txt index f86614d7447..e70634c2df7 100644 --- a/compiler/testData/codegen/light-analysis/objects/anonymousObjectPropertyInitialization.txt +++ b/compiler/testData/codegen/light-analysis/objects/anonymousObjectPropertyInitialization.txt @@ -4,7 +4,6 @@ public final class AnonymousObjectPropertyInitializationKt { public final static @org.jetbrains.annotations.NotNull method getO(): T } - public interface T { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/classCallsProtectedInheritedByCompanion.txt b/compiler/testData/codegen/light-analysis/objects/classCallsProtectedInheritedByCompanion.txt index 32ecfed0c76..90b820d1945 100644 --- a/compiler/testData/codegen/light-analysis/objects/classCallsProtectedInheritedByCompanion.txt +++ b/compiler/testData/codegen/light-analysis/objects/classCallsProtectedInheritedByCompanion.txt @@ -3,7 +3,6 @@ public class A { protected final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B { public final static field Companion: B.Companion inner class B/Companion @@ -11,13 +10,11 @@ public final class B { public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final static class B/Companion { inner class B/Companion private method (): void } - public final class ClassCallsProtectedInheritedByCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/flist.txt b/compiler/testData/codegen/light-analysis/objects/flist.txt index 2322c1b2ac0..8329359ddf3 100644 --- a/compiler/testData/codegen/light-analysis/objects/flist.txt +++ b/compiler/testData/codegen/light-analysis/objects/flist.txt @@ -9,14 +9,12 @@ public abstract class FList { public final @org.jetbrains.annotations.NotNull method plus(p0: java.lang.Object): FList } - public final static class FList/Companion { inner class FList/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getEmptyFList(): FList } - public final class FlistKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method emptyFList(): FList diff --git a/compiler/testData/codegen/light-analysis/objects/initializationOrder.txt b/compiler/testData/codegen/light-analysis/objects/initializationOrder.txt index ea71394dc8a..8531dc9cc7e 100644 --- a/compiler/testData/codegen/light-analysis/objects/initializationOrder.txt +++ b/compiler/testData/codegen/light-analysis/objects/initializationOrder.txt @@ -5,7 +5,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -14,7 +13,6 @@ public final static class A/Companion { public final method setZ(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class InitializationOrderKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/kt1047.txt b/compiler/testData/codegen/light-analysis/objects/kt1047.txt index 261f7556cd4..b58efdce3c8 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt1047.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt1047.txt @@ -2,7 +2,6 @@ public final class Kt1047Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Test { public final static field Companion: Test.Companion private final static field hello: java.lang.String @@ -11,7 +10,6 @@ public class Test { public method test(): void } - public final static class Test/Companion { inner class Test/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/objects/kt11117.txt b/compiler/testData/codegen/light-analysis/objects/kt11117.txt index f5d54123ea7..cc1ce081187 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt11117.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt11117.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public final class Kt11117Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/kt1136.txt b/compiler/testData/codegen/light-analysis/objects/kt1136.txt index 650246de61a..9f91b1a1413 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt1136.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt1136.txt @@ -2,7 +2,6 @@ public final class Kt1136Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class SomeClass { private final field list: java.util.ArrayList private @org.jetbrains.annotations.Nullable field status: java.lang.Throwable @@ -13,7 +12,6 @@ public final class SomeClass { public final method setStatus(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void } - public final class SomeClass/Inner { private final @org.jetbrains.annotations.NotNull field copy: java.util.ArrayList synthetic final field this$0: SomeClass @@ -22,7 +20,6 @@ public final class SomeClass/Inner { public final @org.jetbrains.annotations.NotNull method getCopy(): java.util.ArrayList } - public final class SomeObject { public final static field INSTANCE: SomeObject private final static field workerThread: SomeObject$workerThread$1 diff --git a/compiler/testData/codegen/light-analysis/objects/kt1186.txt b/compiler/testData/codegen/light-analysis/objects/kt1186.txt index c0a722bec3d..17a9a434036 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt1186.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt1186.txt @@ -9,7 +9,6 @@ public enum class Color { public static method values(): Color[] } - public enum class Direction { public final static field EAST: Direction public final static field NORTH: Direction @@ -20,7 +19,6 @@ public enum class Direction { public static method values(): Direction[] } - public final class Kt1186Kt { public final static method bar(@org.jetbrains.annotations.NotNull p0: Color): int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/kt1600.txt b/compiler/testData/codegen/light-analysis/objects/kt1600.txt index d246eb7fcf7..3cd16fe5831 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt1600.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt1600.txt @@ -2,13 +2,11 @@ public final class Bar { public method (): void } - public abstract class Foo { public method (): void public final @org.jetbrains.annotations.NotNull method hello(p0: java.lang.Object): java.lang.String } - public final class Kt1600Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt2398.txt b/compiler/testData/codegen/light-analysis/objects/kt2398.txt index 67cd4b1e63e..f763243e538 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt2398.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt2398.txt @@ -3,7 +3,6 @@ public final class C { public method (): void } - public final class C/Obj { public final static field INSTANCE: C.Obj private final static @org.jetbrains.annotations.NotNull field o: java.lang.String @@ -14,7 +13,6 @@ public final class C/Obj { public final @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - public final static class C/Obj/D { private final @org.jetbrains.annotations.NotNull field ko: java.lang.String inner class C/Obj @@ -23,7 +21,6 @@ public final static class C/Obj/D { public final @org.jetbrains.annotations.NotNull method getKo(): java.lang.String } - public final class C/Obj/InnerObj { public final static field INSTANCE: C.Obj.InnerObj inner class C/Obj @@ -32,7 +29,6 @@ public final class C/Obj/InnerObj { public final @org.jetbrains.annotations.NotNull method k(): java.lang.String } - public final class Kt2398Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt2675.txt b/compiler/testData/codegen/light-analysis/objects/kt2675.txt index 8f08727367d..560e3bc13b7 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt2675.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt2675.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method ok(): java.lang.String } - private final class A/Foo { public final static field INSTANCE: A.Foo private final static @org.jetbrains.annotations.NotNull field foov: java.lang.String @@ -15,7 +14,6 @@ private final class A/Foo { public final @org.jetbrains.annotations.NotNull method getFoov(): java.lang.String } - public final class A/Foo/Bar { public final static field INSTANCE: A.Foo.Bar private final static @org.jetbrains.annotations.NotNull field barv: java.lang.String @@ -26,7 +24,6 @@ public final class A/Foo/Bar { public final @org.jetbrains.annotations.NotNull method getBarv(): java.lang.String } - public final class Kt2675Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt2719.txt b/compiler/testData/codegen/light-analysis/objects/kt2719.txt index 46ec23a78d9..1fdc553b7eb 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt2719.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt2719.txt @@ -5,14 +5,12 @@ public final class Clazz { public method (): void } - public final static class Clazz/Companion { inner class Clazz/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getA(): java.lang.Object } - public final class Kt2719Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt2822.txt b/compiler/testData/codegen/light-analysis/objects/kt2822.txt index a8abffe3af4..f5ed7a76110 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt2822.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt2822.txt @@ -3,7 +3,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Kt2822Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt3238.txt b/compiler/testData/codegen/light-analysis/objects/kt3238.txt index 7f055dacd5d..776663c7278 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt3238.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt3238.txt @@ -2,14 +2,12 @@ public final class Kt3238Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Obj { public final static field INSTANCE: Obj inner class Obj/Inner private method (): void } - public final static class Obj/Inner { inner class Obj/Inner public method (): void diff --git a/compiler/testData/codegen/light-analysis/objects/kt3684.txt b/compiler/testData/codegen/light-analysis/objects/kt3684.txt index b047957b7ea..31759ae64b2 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt3684.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt3684.txt @@ -2,7 +2,6 @@ public final class Kt3684Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class X { private final field n: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/objects/kt4086.txt b/compiler/testData/codegen/light-analysis/objects/kt4086.txt index 929154d1ce9..18be7f0f356 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt4086.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt4086.txt @@ -2,15 +2,12 @@ public class Base { public method (@org.jetbrains.annotations.NotNull p0: N): void } - public final class Derived { public method (): void } - public final class Kt4086Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface N diff --git a/compiler/testData/codegen/light-analysis/objects/kt535.txt b/compiler/testData/codegen/light-analysis/objects/kt535.txt index 152d53428b7..69142713baa 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt535.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt535.txt @@ -6,14 +6,12 @@ public final class Identifier { public final @org.jetbrains.annotations.Nullable method getName(): java.lang.Object } - public final static class Identifier/Companion { inner class Identifier/Companion private method (): void public @org.jetbrains.annotations.NotNull method init(@org.jetbrains.annotations.Nullable p0: java.lang.Object): Identifier } - public final class Kt535Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt560.txt b/compiler/testData/codegen/light-analysis/objects/kt560.txt index 59bfa8ae493..62989d7688e 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt560.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt560.txt @@ -4,14 +4,12 @@ public class while_bug_1/AllEvenNum { public method (): void } - public final static class while_bug_1/AllEvenNum/Companion { inner class while_bug_1/AllEvenNum/Companion private method (): void public method main(@org.jetbrains.annotations.Nullable p0: java.lang.String[]): void } - public final class while_bug_1/Kt560Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/kt694.txt b/compiler/testData/codegen/light-analysis/objects/kt694.txt index 05e08466463..d7c524d54bf 100644 --- a/compiler/testData/codegen/light-analysis/objects/kt694.txt +++ b/compiler/testData/codegen/light-analysis/objects/kt694.txt @@ -3,7 +3,6 @@ public final class Kt694Kt { public final static method checkA(@org.jetbrains.annotations.NotNull p0: Test): boolean } - public enum class Test { public final static field A: Test public final static field B: Test diff --git a/compiler/testData/codegen/light-analysis/objects/localFunctionInObjectInitializer_kt4516.txt b/compiler/testData/codegen/light-analysis/objects/localFunctionInObjectInitializer_kt4516.txt index f64a62301f3..280c89f7750 100644 --- a/compiler/testData/codegen/light-analysis/objects/localFunctionInObjectInitializer_kt4516.txt +++ b/compiler/testData/codegen/light-analysis/objects/localFunctionInObjectInitializer_kt4516.txt @@ -2,7 +2,6 @@ public final class LocalFunctionInObjectInitializer_kt4516Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field INSTANCE: O private final static @org.jetbrains.annotations.NotNull field mmmap: java.util.HashMap diff --git a/compiler/testData/codegen/light-analysis/objects/methodOnObject.txt b/compiler/testData/codegen/light-analysis/objects/methodOnObject.txt index d97bba9963b..08b21610871 100644 --- a/compiler/testData/codegen/light-analysis/objects/methodOnObject.txt +++ b/compiler/testData/codegen/light-analysis/objects/methodOnObject.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method result(): java.lang.String } - public final class MethodOnObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/nestedDerivedClassCallsProtectedFromCompanion.txt b/compiler/testData/codegen/light-analysis/objects/nestedDerivedClassCallsProtectedFromCompanion.txt index cff13506a82..3732e491c85 100644 --- a/compiler/testData/codegen/light-analysis/objects/nestedDerivedClassCallsProtectedFromCompanion.txt +++ b/compiler/testData/codegen/light-analysis/objects/nestedDerivedClassCallsProtectedFromCompanion.txt @@ -5,21 +5,18 @@ public class A { public method (): void } - public final static class A/B { inner class A/B public method (): void public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final static class A/Companion { inner class A/Companion private method (): void protected final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class NestedDerivedClassCallsProtectedFromCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/nestedObjectWithSuperclass.txt b/compiler/testData/codegen/light-analysis/objects/nestedObjectWithSuperclass.txt index 382deb807ae..55a55279e87 100644 --- a/compiler/testData/codegen/light-analysis/objects/nestedObjectWithSuperclass.txt +++ b/compiler/testData/codegen/light-analysis/objects/nestedObjectWithSuperclass.txt @@ -5,19 +5,16 @@ public class A { public final method getS(): int } - public final class NestedObjectWithSuperclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { public final static field INSTANCE: Outer inner class Outer/O private method (): void } - public final class Outer/O { public final static field INSTANCE: Outer.O inner class Outer/O diff --git a/compiler/testData/codegen/light-analysis/objects/objectExtendsInnerAndReferencesOuterMember.txt b/compiler/testData/codegen/light-analysis/objects/objectExtendsInnerAndReferencesOuterMember.txt index fc78a15ed65..5ac0866100d 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectExtendsInnerAndReferencesOuterMember.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectExtendsInnerAndReferencesOuterMember.txt @@ -5,14 +5,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.Object } - public class A/Inner { synthetic final field this$0: A inner class A/Inner public method (p0: A): void } - public final class ObjectExtendsInnerAndReferencesOuterMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/objectInitialization_kt5523.txt b/compiler/testData/codegen/light-analysis/objects/objectInitialization_kt5523.txt index 77c7d6de18c..b94f5b8c34a 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectInitialization_kt5523.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectInitialization_kt5523.txt @@ -7,7 +7,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getB(): java.lang.String } - public final class ObjectInitialization_kt5523Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/objectLiteral.txt b/compiler/testData/codegen/light-analysis/objects/objectLiteral.txt index 60ca955c921..8e44d87b40f 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectLiteral.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectLiteral.txt @@ -7,7 +7,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method initChild(p0: int): java.lang.Object } - public final class ObjectLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/objectLiteralInClosure.txt b/compiler/testData/codegen/light-analysis/objects/objectLiteralInClosure.txt index 9fb7e22388e..8d0a7581972 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectLiteralInClosure.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectLiteralInClosure.txt @@ -6,7 +6,6 @@ final class p/C { public final method getY(): int } - public final class p/ObjectLiteralInClosureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/objectVsClassInitialization_kt5291.txt b/compiler/testData/codegen/light-analysis/objects/objectVsClassInitialization_kt5291.txt index 359e23b256a..ff3c0849e24 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectVsClassInitialization_kt5291.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectVsClassInitialization_kt5291.txt @@ -6,7 +6,6 @@ public final class Cls { public final @org.jetbrains.annotations.NotNull method getString(): java.lang.String } - public final class Obj { public final static field INSTANCE: Obj private final static @org.jetbrains.annotations.NotNull field buffer: java.lang.StringBuilder @@ -16,7 +15,6 @@ public final class Obj { public final @org.jetbrains.annotations.NotNull method getString(): java.lang.String } - public final class ObjectVsClassInitialization_kt5291Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method with(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/objects/objectWithSuperclass.txt b/compiler/testData/codegen/light-analysis/objects/objectWithSuperclass.txt index 5cdc1056461..f202c208a79 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectWithSuperclass.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectWithSuperclass.txt @@ -3,14 +3,12 @@ public class A { public method foo(): int } - public final class O { public final static field INSTANCE: O private method (): void public method foo(): int } - public final class ObjectWithSuperclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/objectWithSuperclassAndTrait.txt b/compiler/testData/codegen/light-analysis/objects/objectWithSuperclassAndTrait.txt index 5fc86415225..8fcaad714f5 100644 --- a/compiler/testData/codegen/light-analysis/objects/objectWithSuperclassAndTrait.txt +++ b/compiler/testData/codegen/light-analysis/objects/objectWithSuperclassAndTrait.txt @@ -3,25 +3,21 @@ public class A { public method foo(): int } - public final class O { public final static field INSTANCE: O private method (): void public method foo(): int } - public final class ObjectWithSuperclassAndTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { inner class T/DefaultImpls public abstract method foo(): int } - public final class T/DefaultImpls { inner class T/DefaultImpls public static method foo(p0: T): int diff --git a/compiler/testData/codegen/light-analysis/objects/privateExtensionFromInitializer_kt4543.txt b/compiler/testData/codegen/light-analysis/objects/privateExtensionFromInitializer_kt4543.txt index 6fe4ab180cf..5cfb557386b 100644 --- a/compiler/testData/codegen/light-analysis/objects/privateExtensionFromInitializer_kt4543.txt +++ b/compiler/testData/codegen/light-analysis/objects/privateExtensionFromInitializer_kt4543.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class C { public final static field INSTANCE: C private final static @org.jetbrains.annotations.NotNull field g: java.lang.String @@ -13,7 +12,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getG(): java.lang.String } - public final class PrivateExtensionFromInitializer_kt4543Kt { public final static @org.jetbrains.annotations.NotNull method a(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/privateFunctionFromClosureInInitializer_kt5582.txt b/compiler/testData/codegen/light-analysis/objects/privateFunctionFromClosureInInitializer_kt5582.txt index bd2e5b2dbbb..c4cf3a096ae 100644 --- a/compiler/testData/codegen/light-analysis/objects/privateFunctionFromClosureInInitializer_kt5582.txt +++ b/compiler/testData/codegen/light-analysis/objects/privateFunctionFromClosureInInitializer_kt5582.txt @@ -8,17 +8,14 @@ public final class Foo { public final method getResult(): int } - private final class Foo/O { public final static field INSTANCE: Foo.O inner class Foo/O private method (): void } - public final class PrivateFunctionFromClosureInInitializer_kt5582Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T diff --git a/compiler/testData/codegen/light-analysis/objects/receiverInConstructor.txt b/compiler/testData/codegen/light-analysis/objects/receiverInConstructor.txt index 4c139da6868..d56e5f1e017 100644 --- a/compiler/testData/codegen/light-analysis/objects/receiverInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/objects/receiverInConstructor.txt @@ -4,7 +4,6 @@ public class A { public @org.jetbrains.annotations.NotNull method getV(): java.lang.String } - public final class ReceiverInConstructorKt { public final static @org.jetbrains.annotations.NotNull method a(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): A public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/safeAccess.txt b/compiler/testData/codegen/light-analysis/objects/safeAccess.txt index ba4c4206e19..cc5105b7a5d 100644 --- a/compiler/testData/codegen/light-analysis/objects/safeAccess.txt +++ b/compiler/testData/codegen/light-analysis/objects/safeAccess.txt @@ -2,7 +2,6 @@ public final class SafeAccessKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field INSTANCE: Test private final static @org.jetbrains.annotations.NotNull field a: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/objects/simpleObject.txt b/compiler/testData/codegen/light-analysis/objects/simpleObject.txt index 10b3922fb4e..fc6279af71e 100644 --- a/compiler/testData/codegen/light-analysis/objects/simpleObject.txt +++ b/compiler/testData/codegen/light-analysis/objects/simpleObject.txt @@ -5,7 +5,6 @@ public final class A { public final method getX(): int } - public final class SimpleObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/thisInConstructor.txt b/compiler/testData/codegen/light-analysis/objects/thisInConstructor.txt index 5124a8894a9..0c9f2dd4ce2 100644 --- a/compiler/testData/codegen/light-analysis/objects/thisInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/objects/thisInConstructor.txt @@ -4,7 +4,6 @@ public class A { public @org.jetbrains.annotations.NotNull method getV(): java.lang.String } - public class B { private final @org.jetbrains.annotations.NotNull field v: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -12,7 +11,6 @@ public class B { public @org.jetbrains.annotations.NotNull method getV(): java.lang.String } - public final class ThisInConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/useImportedMember.txt b/compiler/testData/codegen/light-analysis/objects/useImportedMember.txt index 0c70e6b325f..ea69158cd28 100644 --- a/compiler/testData/codegen/light-analysis/objects/useImportedMember.txt +++ b/compiler/testData/codegen/light-analysis/objects/useImportedMember.txt @@ -3,7 +3,6 @@ public class BaseClass { public final method getFromClass(p0: java.lang.Object): java.lang.Object } - public final class C { public final static field INSTANCE: C private static field p: int @@ -21,21 +20,18 @@ public final class C { public final method setP(p0: int): void } - public interface I { inner class I/DefaultImpls public abstract method fromInterface(p0: java.lang.Object): java.lang.Object public abstract method genericFromSuper(p0: java.lang.Object): java.lang.Object } - public final class I/DefaultImpls { inner class I/DefaultImpls public static method fromInterface(p0: I, p1: java.lang.Object): java.lang.Object public static method genericFromSuper(p0: I, p1: java.lang.Object): java.lang.Object } - public final class UseImportedMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/objects/useImportedMemberFromCompanion.txt b/compiler/testData/codegen/light-analysis/objects/useImportedMemberFromCompanion.txt index 4f438741dab..71ca5313176 100644 --- a/compiler/testData/codegen/light-analysis/objects/useImportedMemberFromCompanion.txt +++ b/compiler/testData/codegen/light-analysis/objects/useImportedMemberFromCompanion.txt @@ -3,7 +3,6 @@ public class BaseClass { public final method getFromClass(p0: java.lang.Object): java.lang.Object } - public final class Class { public final static field C: Class.C private static field p: int @@ -11,7 +10,6 @@ public final class Class { public method (): void } - public final static class Class/C { inner class Class/C private method (): void @@ -28,21 +26,18 @@ public final static class Class/C { public final method setP(p0: int): void } - public interface I { inner class I/DefaultImpls public abstract method fromInterface(p0: java.lang.Object): java.lang.Object public abstract method genericFromSuper(p0: java.lang.Object): java.lang.Object } - public final class I/DefaultImpls { inner class I/DefaultImpls public static method fromInterface(p0: I, p1: java.lang.Object): java.lang.Object public static method genericFromSuper(p0: I, p1: java.lang.Object): java.lang.Object } - public final class UseImportedMemberFromCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/assignmentOperations.txt b/compiler/testData/codegen/light-analysis/operatorConventions/assignmentOperations.txt index de9295de7fe..8c319024556 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/assignmentOperations.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/assignmentOperations.txt @@ -5,7 +5,6 @@ public final class A { public final method setX(p0: int): void } - public final class AssignmentOperationsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method divAssign(@org.jetbrains.annotations.NotNull p0: A, p1: int): void diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/comparable.txt b/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/comparable.txt index 3fe495b258d..387a023297f 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/comparable.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/comparable.txt @@ -1,6 +1,5 @@ public interface A - public final class B { private final field x: int public method (p0: int): void @@ -9,7 +8,6 @@ public final class B { public final method getX(): int } - public final class ComparableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method checkLess(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/extensionObject.txt b/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/extensionObject.txt index 7b1e4155a21..d3c46ce7160 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/extensionObject.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/compareTo/extensionObject.txt @@ -4,7 +4,6 @@ public final class A { public final method getX(): int } - public final class ExtensionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method checkLess(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: A): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/incDecOnObject.txt b/compiler/testData/codegen/light-analysis/operatorConventions/incDecOnObject.txt index cc05d072fc8..3de99c5b9ce 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/incDecOnObject.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/incDecOnObject.txt @@ -4,7 +4,6 @@ public final class IncDecOnObjectKt { public final static @org.jetbrains.annotations.NotNull method inc(@org.jetbrains.annotations.NotNull p0: X): X } - public final class X { private field value: long public method (p0: long): void @@ -12,7 +11,6 @@ public final class X { public final method setValue(p0: long): void } - public final class Z { private field counter: int private @org.jetbrains.annotations.NotNull field prop: X diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/kt14201.txt b/compiler/testData/codegen/light-analysis/operatorConventions/kt14201.txt index 18b0491157d..72fecb8ce6f 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/kt14201.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/kt14201.txt @@ -6,12 +6,10 @@ public final class ClassB { public final @org.jetbrains.annotations.NotNull method getX(): kotlin.jvm.functions.Function0 } - public interface Intf { public abstract @org.jetbrains.annotations.NotNull method getAValue(): java.lang.String } - public final class Kt14201Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/kt14201_2.txt b/compiler/testData/codegen/light-analysis/operatorConventions/kt14201_2.txt index 1385cd2abec..7187ceff504 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/kt14201_2.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/kt14201_2.txt @@ -4,13 +4,11 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class B { public method (): void public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: A): java.lang.String } - public final class ClassB { private final @org.jetbrains.annotations.NotNull field x: A public method (): void @@ -19,7 +17,6 @@ public final class ClassB { public final @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: B): java.lang.String } - public final class Kt14201_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/nestedMaps.txt b/compiler/testData/codegen/light-analysis/operatorConventions/nestedMaps.txt index 991a0a55b72..8068c299021 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/nestedMaps.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/nestedMaps.txt @@ -4,7 +4,6 @@ public final class Map1 { public final @org.jetbrains.annotations.NotNull method get(p0: int, p1: int): Map2 } - public final class Map2 { public final static field INSTANCE: Map2 private method (): void @@ -12,7 +11,6 @@ public final class Map2 { public final method set(p0: int, p1: int, p2: int): void } - public final class NestedMapsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/operatorSetLambda.txt b/compiler/testData/codegen/light-analysis/operatorConventions/operatorSetLambda.txt index 51aa35fcced..bc579a46485 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/operatorSetLambda.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/operatorSetLambda.txt @@ -10,7 +10,6 @@ public final class Obj { public final method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class OperatorSetLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/overloadedSet.txt b/compiler/testData/codegen/light-analysis/operatorConventions/overloadedSet.txt index 14794463af8..16f4b21ad28 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/overloadedSet.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/overloadedSet.txt @@ -6,7 +6,6 @@ public final class A { public final method set(p0: int, p1: int): void } - public final class OverloadedSetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/remAssignmentOperation.txt b/compiler/testData/codegen/light-analysis/operatorConventions/remAssignmentOperation.txt index 97855b429e2..faebf6abc32 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/remAssignmentOperation.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/remAssignmentOperation.txt @@ -5,7 +5,6 @@ public final class A { public final method setX(p0: int): void } - public final class RemAssignmentOperationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method modAssign(@org.jetbrains.annotations.NotNull p0: A, p1: int): void diff --git a/compiler/testData/codegen/light-analysis/operatorConventions/remOverModOperation.txt b/compiler/testData/codegen/light-analysis/operatorConventions/remOverModOperation.txt index c8cc02a32c7..8b3d2ae1ae5 100644 --- a/compiler/testData/codegen/light-analysis/operatorConventions/remOverModOperation.txt +++ b/compiler/testData/codegen/light-analysis/operatorConventions/remOverModOperation.txt @@ -7,7 +7,6 @@ public final class A { public final method setX(p0: int): void } - public final class RemOverModOperationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/package/checkCast.txt b/compiler/testData/codegen/light-analysis/package/checkCast.txt index 5f98df896d2..e2a27dd2890 100644 --- a/compiler/testData/codegen/light-analysis/package/checkCast.txt +++ b/compiler/testData/codegen/light-analysis/package/checkCast.txt @@ -5,7 +5,6 @@ public final class C { public final method getX(): int } - public final class CheckCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/package/incrementProperty.txt b/compiler/testData/codegen/light-analysis/package/incrementProperty.txt index ad26b858e11..4f35ad7c80f 100644 --- a/compiler/testData/codegen/light-analysis/package/incrementProperty.txt +++ b/compiler/testData/codegen/light-analysis/package/incrementProperty.txt @@ -2,7 +2,6 @@ public final class IncrementPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Slot { private field vitality: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/package/invokespecial.txt b/compiler/testData/codegen/light-analysis/package/invokespecial.txt index 5741f26e13e..93571642568 100644 --- a/compiler/testData/codegen/light-analysis/package/invokespecial.txt +++ b/compiler/testData/codegen/light-analysis/package/invokespecial.txt @@ -4,21 +4,18 @@ public final class A { public final method foo(): void } - public final class B { private final field foo: int public method (): void public final method foo(): void } - public final class C { private field foo: int public method (): void public final method foo(): void } - public final class D { private field foo: int public method (): void @@ -27,7 +24,6 @@ public final class D { private final method setFoo(p0: int): void } - public final class InvokespecialKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/package/mainInFiles.txt b/compiler/testData/codegen/light-analysis/package/mainInFiles.txt index 21e54960c3b..9b4140e3f46 100644 --- a/compiler/testData/codegen/light-analysis/package/mainInFiles.txt +++ b/compiler/testData/codegen/light-analysis/package/mainInFiles.txt @@ -2,17 +2,14 @@ public final class pkg/AKt { public final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void } - public final class pkg/BKt { public final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void } - public final class test/A { public method (): void } - public final class test/_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getMain(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.reflect.Method diff --git a/compiler/testData/codegen/light-analysis/package/packageLocalClassNotImportedWithDefaultImport.txt b/compiler/testData/codegen/light-analysis/package/packageLocalClassNotImportedWithDefaultImport.txt index a9ad6f2382c..66c1ed0d94c 100644 --- a/compiler/testData/codegen/light-analysis/package/packageLocalClassNotImportedWithDefaultImport.txt +++ b/compiler/testData/codegen/light-analysis/package/packageLocalClassNotImportedWithDefaultImport.txt @@ -2,17 +2,14 @@ public final class a/BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/X { public method (): void } - final class kotlin/jvm/SomeClass { public method (): void } - public class pack/SomeClass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/primitiveTypes/kt2251.txt b/compiler/testData/codegen/light-analysis/primitiveTypes/kt2251.txt index 6992259694e..012a332095e 100644 --- a/compiler/testData/codegen/light-analysis/primitiveTypes/kt2251.txt +++ b/compiler/testData/codegen/light-analysis/primitiveTypes/kt2251.txt @@ -6,7 +6,6 @@ public final class A { public final method setB(p0: byte): void } - public final class Kt2251Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/primitiveTypes/kt3576.txt b/compiler/testData/codegen/light-analysis/primitiveTypes/kt3576.txt index f204d953d74..69266798cc5 100644 --- a/compiler/testData/codegen/light-analysis/primitiveTypes/kt3576.txt +++ b/compiler/testData/codegen/light-analysis/primitiveTypes/kt3576.txt @@ -2,7 +2,6 @@ public final class Kt3576Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TestObject { public final static field INSTANCE: TestObject private final static field otherFloat: float diff --git a/compiler/testData/codegen/light-analysis/primitiveTypes/kt887.txt b/compiler/testData/codegen/light-analysis/primitiveTypes/kt887.txt index 3c56506452a..94851662810 100644 --- a/compiler/testData/codegen/light-analysis/primitiveTypes/kt887.txt +++ b/compiler/testData/codegen/light-analysis/primitiveTypes/kt887.txt @@ -6,7 +6,6 @@ public final class Book { public final @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public final class Kt887Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/primitiveTypes/number.txt b/compiler/testData/codegen/light-analysis/primitiveTypes/number.txt index e80e0301f52..515d44215cd 100644 --- a/compiler/testData/codegen/light-analysis/primitiveTypes/number.txt +++ b/compiler/testData/codegen/light-analysis/primitiveTypes/number.txt @@ -15,7 +15,6 @@ public final class FortyTwo { public method toShort(): short } - public final class FortyTwoExtractorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/primitiveTypes/substituteIntForGeneric.txt b/compiler/testData/codegen/light-analysis/primitiveTypes/substituteIntForGeneric.txt index da9063b5e09..6c06209968f 100644 --- a/compiler/testData/codegen/light-analysis/primitiveTypes/substituteIntForGeneric.txt +++ b/compiler/testData/codegen/light-analysis/primitiveTypes/substituteIntForGeneric.txt @@ -5,7 +5,6 @@ public final class L { public final method setA(p0: java.lang.Object): void } - public final class SubstituteIntForGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(): int diff --git a/compiler/testData/codegen/light-analysis/private/arrayConvention.txt b/compiler/testData/codegen/light-analysis/private/arrayConvention.txt index a33b90ed488..afaee041275 100644 --- a/compiler/testData/codegen/light-analysis/private/arrayConvention.txt +++ b/compiler/testData/codegen/light-analysis/private/arrayConvention.txt @@ -7,7 +7,6 @@ public final class ArrayConventionKt { public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class X { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/private/kt9855.txt b/compiler/testData/codegen/light-analysis/private/kt9855.txt index 6423840fb8e..7184ad8eccd 100644 --- a/compiler/testData/codegen/light-analysis/private/kt9855.txt +++ b/compiler/testData/codegen/light-analysis/private/kt9855.txt @@ -4,13 +4,11 @@ public final class Greeter { public final @org.jetbrains.annotations.NotNull method sayHello(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Kt9855Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method plus(@org.jetbrains.annotations.NotNull p0: MyString, p1: java.lang.String): MyString } - public final class MyString { private @org.jetbrains.annotations.NotNull field content: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/base.txt b/compiler/testData/codegen/light-analysis/privateConstructors/base.txt index 45c98d4a770..e5a48fe3907 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/base.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/base.txt @@ -2,13 +2,11 @@ public final class BaseKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Outer { inner class Outer/Inner private method (): void } - public final static class Outer/Inner { inner class Outer/Inner public method (): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/captured.txt b/compiler/testData/codegen/light-analysis/privateConstructors/captured.txt index bf1290e74e2..c57f5b67fc9 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/captured.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/captured.txt @@ -2,7 +2,6 @@ public final class CapturedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Outer { public final static field Companion: Outer.Companion private final @org.jetbrains.annotations.NotNull field s: java.lang.String @@ -11,7 +10,6 @@ public class Outer { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final static class Outer/Companion { inner class Outer/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/companion.txt b/compiler/testData/codegen/light-analysis/privateConstructors/companion.txt index 6f6bbb05588..f937553be7b 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/companion.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/companion.txt @@ -2,14 +2,12 @@ public final class CompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Outer { public final static field Companion: Outer.Companion inner class Outer/Companion private method (): void } - public final static class Outer/Companion { inner class Outer/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/inline.txt b/compiler/testData/codegen/light-analysis/privateConstructors/inline.txt index 2701601f983..72b08b652ca 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/inline.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/inline.txt @@ -2,14 +2,12 @@ public final class InlineKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Outer { public final static field Companion: Outer.Companion inner class Outer/Companion private method (): void } - public final static class Outer/Companion { inner class Outer/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/inner.txt b/compiler/testData/codegen/light-analysis/privateConstructors/inner.txt index 4368c45f928..18ee108cd04 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/inner.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/inner.txt @@ -2,7 +2,6 @@ public final class InnerKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Outer { private final @org.jetbrains.annotations.NotNull field s: java.lang.String inner class Outer/Inner @@ -12,7 +11,6 @@ public class Outer { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner @@ -20,7 +18,6 @@ public final class Outer/Inner { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/kt4860.txt b/compiler/testData/codegen/light-analysis/privateConstructors/kt4860.txt index 30ea7e29bef..92ebe1c7fbc 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/kt4860.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/kt4860.txt @@ -5,19 +5,16 @@ public class A { private method (): void } - public final static class A/B { inner class A/B public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class Kt4860Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/secondary.txt b/compiler/testData/codegen/light-analysis/privateConstructors/secondary.txt index 97eccf481e9..e975c84efd4 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/secondary.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/secondary.txt @@ -5,7 +5,6 @@ public class Outer { public final method getX(): int } - public final class SecondaryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/synthetic.txt b/compiler/testData/codegen/light-analysis/privateConstructors/synthetic.txt index f6aee3b0bf0..d631619d923 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/synthetic.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/synthetic.txt @@ -3,7 +3,6 @@ public final class PrivateConstructor { private method (): void } - public final static class PrivateConstructor/Nested { private final @org.jetbrains.annotations.NotNull field a: PrivateConstructor inner class PrivateConstructor/Nested @@ -11,7 +10,6 @@ public final static class PrivateConstructor/Nested { public final @org.jetbrains.annotations.NotNull method getA(): PrivateConstructor } - public final class SyntheticKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/withArguments.txt b/compiler/testData/codegen/light-analysis/privateConstructors/withArguments.txt index 8deaac31c6d..d70a7e01d65 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/withArguments.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/withArguments.txt @@ -10,25 +10,21 @@ public class Outer { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final static class Outer/Another { inner class Outer/Another public method (): void } - public final static class Outer/Inner { inner class Outer/Inner public method (): void } - public final static class Outer/Other { inner class Outer/Other public method (): void } - public final class WithArgumentsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/withDefault.txt b/compiler/testData/codegen/light-analysis/privateConstructors/withDefault.txt index cbc098c9c5e..902a7d23b72 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/withDefault.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/withDefault.txt @@ -7,19 +7,16 @@ public class Outer { public final method getX(): int } - public final static class Outer/Inner { inner class Outer/Inner public method (): void } - public final static class Outer/Other { inner class Outer/Other public method (): void } - public final class WithDefaultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedClasses.txt b/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedClasses.txt index eef3b15ec44..a12db71e20f 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedClasses.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedClasses.txt @@ -6,14 +6,12 @@ public class Outer { public final @org.jetbrains.annotations.Nullable method getP(): Outer } - public final class Outer/First { public final static field INSTANCE: Outer.First inner class Outer/First private method (): void } - public final static class Outer/Other { inner class Outer/Other public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -21,7 +19,6 @@ public final static class Outer/Other { public synthetic method (p0: Outer, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class WithLinkedClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedObjects.txt b/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedObjects.txt index d006c3fcb64..7169f663936 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedObjects.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/withLinkedObjects.txt @@ -7,28 +7,24 @@ public class Outer { public final @org.jetbrains.annotations.Nullable method getP(): Outer } - public final class Outer/Another { public final static field INSTANCE: Outer.Another inner class Outer/Another private method (): void } - public final class Outer/Inner { public final static field INSTANCE: Outer.Inner inner class Outer/Inner private method (): void } - public final class Outer/Other { public final static field INSTANCE: Outer.Other inner class Outer/Other private method (): void } - public final class WithLinkedObjectsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/privateConstructors/withVarargs.txt b/compiler/testData/codegen/light-analysis/privateConstructors/withVarargs.txt index fbca3a01562..327c608c83f 100644 --- a/compiler/testData/codegen/light-analysis/privateConstructors/withVarargs.txt +++ b/compiler/testData/codegen/light-analysis/privateConstructors/withVarargs.txt @@ -7,25 +7,21 @@ public class Outer { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final static class Outer/Another { inner class Outer/Another public method (): void } - public final static class Outer/Inner { inner class Outer/Inner public method (): void } - public final static class Outer/Other { inner class Outer/Other public method (): void } - public final class WithVarargsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/accessToPrivateProperty.txt b/compiler/testData/codegen/light-analysis/properties/accessToPrivateProperty.txt index 02a79990c73..289181af446 100644 --- a/compiler/testData/codegen/light-analysis/properties/accessToPrivateProperty.txt +++ b/compiler/testData/codegen/light-analysis/properties/accessToPrivateProperty.txt @@ -5,26 +5,22 @@ public final class A { private final method getFoo(): int } - public final class AccessToPrivatePropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class B { private final field foo: int public method (): void public final method foo(): void } - public final class C { private field foo: int public method (): void public final method foo(): void } - public final class D { private field foo: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/accessToPrivateSetter.txt b/compiler/testData/codegen/light-analysis/properties/accessToPrivateSetter.txt index ec9d51fee03..120d142e5cb 100644 --- a/compiler/testData/codegen/light-analysis/properties/accessToPrivateSetter.txt +++ b/compiler/testData/codegen/light-analysis/properties/accessToPrivateSetter.txt @@ -2,7 +2,6 @@ public final class AccessToPrivateSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class D { private field foo: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/augmentedAssignmentsAndIncrements.txt b/compiler/testData/codegen/light-analysis/properties/augmentedAssignmentsAndIncrements.txt index 0c0ccee4c4e..114160c7016 100644 --- a/compiler/testData/codegen/light-analysis/properties/augmentedAssignmentsAndIncrements.txt +++ b/compiler/testData/codegen/light-analysis/properties/augmentedAssignmentsAndIncrements.txt @@ -4,7 +4,6 @@ public final class A { public final method setC(p0: int): void } - public final class AugmentedAssignmentsAndIncrementsKt { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static field a: int @@ -22,7 +21,6 @@ public final class AugmentedAssignmentsAndIncrementsKt { public final static method setF(p0: int): void } - public final class SimpleDelegate { public final static field INSTANCE: SimpleDelegate private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/classArtificialFieldInsideNested.txt b/compiler/testData/codegen/light-analysis/properties/classArtificialFieldInsideNested.txt index 845d3c4db1c..47b6f441b1b 100644 --- a/compiler/testData/codegen/light-analysis/properties/classArtificialFieldInsideNested.txt +++ b/compiler/testData/codegen/light-analysis/properties/classArtificialFieldInsideNested.txt @@ -2,7 +2,6 @@ public final class ClassArtificialFieldInsideNestedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private final @org.jetbrains.annotations.NotNull field back: java.lang.String public method (): void @@ -10,7 +9,6 @@ public final class My { public final @org.jetbrains.annotations.NotNull method getMy(): java.lang.String } - public abstract class Your { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/classFieldInsideLambda.txt b/compiler/testData/codegen/light-analysis/properties/classFieldInsideLambda.txt index 7571e9f6dda..bf8e23c9f52 100644 --- a/compiler/testData/codegen/light-analysis/properties/classFieldInsideLambda.txt +++ b/compiler/testData/codegen/light-analysis/properties/classFieldInsideLambda.txt @@ -2,7 +2,6 @@ public final class ClassFieldInsideLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private final @org.jetbrains.annotations.NotNull field my: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/classFieldInsideLocalInSetter.txt b/compiler/testData/codegen/light-analysis/properties/classFieldInsideLocalInSetter.txt index 747a5bd4bad..e9000f639d0 100644 --- a/compiler/testData/codegen/light-analysis/properties/classFieldInsideLocalInSetter.txt +++ b/compiler/testData/codegen/light-analysis/properties/classFieldInsideLocalInSetter.txt @@ -2,7 +2,6 @@ public final class ClassFieldInsideLocalInSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private @org.jetbrains.annotations.NotNull field my: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/classFieldInsideNested.txt b/compiler/testData/codegen/light-analysis/properties/classFieldInsideNested.txt index cf13645610c..011e7fbd8f1 100644 --- a/compiler/testData/codegen/light-analysis/properties/classFieldInsideNested.txt +++ b/compiler/testData/codegen/light-analysis/properties/classFieldInsideNested.txt @@ -2,14 +2,12 @@ public final class ClassFieldInsideNestedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private final @org.jetbrains.annotations.NotNull field my: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method getMy(): java.lang.String } - public abstract class Your { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/classObjectProperties.txt b/compiler/testData/codegen/light-analysis/properties/classObjectProperties.txt index b63e457107b..84926e0eb0c 100644 --- a/compiler/testData/codegen/light-analysis/properties/classObjectProperties.txt +++ b/compiler/testData/codegen/light-analysis/properties/classObjectProperties.txt @@ -2,7 +2,6 @@ public final class ClassObjectPropertiesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field Companion: Test.Companion private final static field prop1: int @@ -15,7 +14,6 @@ public final class Test { public method (): void } - public final static class Test/Companion { inner class Test/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/classPrivateArtificialFieldInsideNested.txt b/compiler/testData/codegen/light-analysis/properties/classPrivateArtificialFieldInsideNested.txt index 2ffa3ec6218..8ac6d08afa4 100644 --- a/compiler/testData/codegen/light-analysis/properties/classPrivateArtificialFieldInsideNested.txt +++ b/compiler/testData/codegen/light-analysis/properties/classPrivateArtificialFieldInsideNested.txt @@ -2,14 +2,12 @@ public final class ClassPrivateArtificialFieldInsideNestedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private final field back: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method getMy(): java.lang.String } - public abstract class Your { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/collectionSize.txt b/compiler/testData/codegen/light-analysis/properties/collectionSize.txt index 66f2ff3cb91..229d0bf3ba0 100644 --- a/compiler/testData/codegen/light-analysis/properties/collectionSize.txt +++ b/compiler/testData/codegen/light-analysis/properties/collectionSize.txt @@ -12,7 +12,6 @@ public final class OurTest { public method removeAt(p0: int): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/commonPropertiesKJK.txt b/compiler/testData/codegen/light-analysis/properties/commonPropertiesKJK.txt index 79a1a89b880..0835d3146c7 100644 --- a/compiler/testData/codegen/light-analysis/properties/commonPropertiesKJK.txt +++ b/compiler/testData/codegen/light-analysis/properties/commonPropertiesKJK.txt @@ -10,7 +10,6 @@ public class A { public method setVarProp(p0: int): void } - public final class B { private final field valProp: int public method (): void @@ -21,7 +20,6 @@ public final class B { public method setVarProp(p0: int): void } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/companionFieldInsideLambda.txt b/compiler/testData/codegen/light-analysis/properties/companionFieldInsideLambda.txt index 7f355269b6d..ebc1115a691 100644 --- a/compiler/testData/codegen/light-analysis/properties/companionFieldInsideLambda.txt +++ b/compiler/testData/codegen/light-analysis/properties/companionFieldInsideLambda.txt @@ -2,7 +2,6 @@ public final class CompanionFieldInsideLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { public final static field Companion: My.Companion private final static @org.jetbrains.annotations.NotNull field my: java.lang.String @@ -10,7 +9,6 @@ public final class My { public method (): void } - public final static class My/Companion { inner class My/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/companionObjectAccessor.txt b/compiler/testData/codegen/light-analysis/properties/companionObjectAccessor.txt index 50120a3e930..176a55e09b8 100644 --- a/compiler/testData/codegen/light-analysis/properties/companionObjectAccessor.txt +++ b/compiler/testData/codegen/light-analysis/properties/companionObjectAccessor.txt @@ -6,7 +6,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -14,7 +13,6 @@ public final static class A/Companion { public final method getI2(): int } - public final class B { public final static field Named: B.Named private final static field i1: int @@ -23,7 +21,6 @@ public final class B { public method (): void } - public final static class B/Named { inner class B/Named private method (): void @@ -31,7 +28,6 @@ public final static class B/Named { public final method getI2(): int } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/companionObjectPropertiesFromJava.txt b/compiler/testData/codegen/light-analysis/properties/companionObjectPropertiesFromJava.txt index 3956a0bdbbd..96034262845 100644 --- a/compiler/testData/codegen/light-analysis/properties/companionObjectPropertiesFromJava.txt +++ b/compiler/testData/codegen/light-analysis/properties/companionObjectPropertiesFromJava.txt @@ -8,13 +8,11 @@ public enum class Enoom { public static method values(): Enoom[] } - public final static class Enoom/Companion { inner class Enoom/Companion private method (): void } - public final class Klass { public final static field Companion: Klass.Companion public final static @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field JVM_NAME: java.lang.String @@ -23,25 +21,21 @@ public final class Klass { public method (): void } - public final static class Klass/Companion { inner class Klass/Companion private method (): void } - public final class TestKt { public final static method box(): java.lang.String } - public interface Trait { public final static field Companion: Trait.Companion public final static @org.jetbrains.annotations.NotNull field NAME: java.lang.String inner class Trait/Companion } - public final static class Trait/Companion { public final static @org.jetbrains.annotations.NotNull field NAME: java.lang.String inner class Trait/Companion diff --git a/compiler/testData/codegen/light-analysis/properties/companionPrivateField.txt b/compiler/testData/codegen/light-analysis/properties/companionPrivateField.txt index 1df6ab7564e..4a4ef8e7661 100644 --- a/compiler/testData/codegen/light-analysis/properties/companionPrivateField.txt +++ b/compiler/testData/codegen/light-analysis/properties/companionPrivateField.txt @@ -2,7 +2,6 @@ public final class CompanionPrivateFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { public final static field Companion: My.Companion private final static field my: java.lang.String @@ -10,7 +9,6 @@ public final class My { public method (): void } - public final static class My/Companion { inner class My/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/companionPrivateFieldInsideLambda.txt b/compiler/testData/codegen/light-analysis/properties/companionPrivateFieldInsideLambda.txt index 5f4cd56a00b..859aa918d56 100644 --- a/compiler/testData/codegen/light-analysis/properties/companionPrivateFieldInsideLambda.txt +++ b/compiler/testData/codegen/light-analysis/properties/companionPrivateFieldInsideLambda.txt @@ -2,7 +2,6 @@ public final class CompanionPrivateFieldInsideLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { public final static field Companion: My.Companion private final static field my: java.lang.String @@ -10,7 +9,6 @@ public final class My { public method (): void } - public final static class My/Companion { inner class My/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/const/constFlags.txt b/compiler/testData/codegen/light-analysis/properties/const/constFlags.txt index a7a76dcdbfe..583df1b970e 100644 --- a/compiler/testData/codegen/light-analysis/properties/const/constFlags.txt +++ b/compiler/testData/codegen/light-analysis/properties/const/constFlags.txt @@ -5,7 +5,6 @@ public final class A { private method (): void } - public final class B { public final static field Companion: B.Companion private final static field privateConst: int @@ -15,7 +14,6 @@ public final class B { public method (): void } - public final static class B/Companion { inner class B/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/const/constValInAnnotationDefault.txt b/compiler/testData/codegen/light-analysis/properties/const/constValInAnnotationDefault.txt index b504af52625..949146d901f 100644 --- a/compiler/testData/codegen/light-analysis/properties/const/constValInAnnotationDefault.txt +++ b/compiler/testData/codegen/light-analysis/properties/const/constValInAnnotationDefault.txt @@ -3,7 +3,6 @@ public annotation class A { public abstract method value(): java.lang.String } - public final class ConstValInAnnotationDefaultKt { public final static @org.jetbrains.annotations.NotNull field z: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/const/interfaceCompanion.txt b/compiler/testData/codegen/light-analysis/properties/const/interfaceCompanion.txt index 0386fdae111..a853aa048d5 100644 --- a/compiler/testData/codegen/light-analysis/properties/const/interfaceCompanion.txt +++ b/compiler/testData/codegen/light-analysis/properties/const/interfaceCompanion.txt @@ -2,7 +2,6 @@ public final class InterfaceCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface KInt { public final static field Companion: KInt.Companion public final static @org.jetbrains.annotations.NotNull field a: java.lang.String @@ -10,7 +9,6 @@ public interface KInt { inner class KInt/Companion } - public final static class KInt/Companion { public final static @org.jetbrains.annotations.NotNull field a: java.lang.String public final static @org.jetbrains.annotations.NotNull field b: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/fieldInClass.txt b/compiler/testData/codegen/light-analysis/properties/fieldInClass.txt index 19c0c2c60cb..9f9ab662a9d 100644 --- a/compiler/testData/codegen/light-analysis/properties/fieldInClass.txt +++ b/compiler/testData/codegen/light-analysis/properties/fieldInClass.txt @@ -2,7 +2,6 @@ public final class FieldInClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class My { private final @org.jetbrains.annotations.NotNull field my: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/fieldInsideField.txt b/compiler/testData/codegen/light-analysis/properties/fieldInsideField.txt index 6b4b05e0ce3..456d226a7eb 100644 --- a/compiler/testData/codegen/light-analysis/properties/fieldInsideField.txt +++ b/compiler/testData/codegen/light-analysis/properties/fieldInsideField.txt @@ -4,7 +4,6 @@ public final class FieldInsideFieldKt { public final static @org.jetbrains.annotations.NotNull method getMy(): java.lang.String } - public abstract class Your { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/fieldInsideNested.txt b/compiler/testData/codegen/light-analysis/properties/fieldInsideNested.txt index 3f6876249df..c644b289ba7 100644 --- a/compiler/testData/codegen/light-analysis/properties/fieldInsideNested.txt +++ b/compiler/testData/codegen/light-analysis/properties/fieldInsideNested.txt @@ -4,7 +4,6 @@ public final class FieldInsideNestedKt { public final static @org.jetbrains.annotations.NotNull method getMy(): java.lang.String } - public abstract class Your { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/generalAccess.txt b/compiler/testData/codegen/light-analysis/properties/generalAccess.txt index c3e28683f2c..3ac3c471302 100644 --- a/compiler/testData/codegen/light-analysis/properties/generalAccess.txt +++ b/compiler/testData/codegen/light-analysis/properties/generalAccess.txt @@ -14,7 +14,6 @@ public class As/A { public final method setBackingField(p0: int): void } - public class As/B { private final @org.jetbrains.annotations.NotNull field property: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -23,7 +22,6 @@ public class As/B { public final @org.jetbrains.annotations.NotNull method getWithBackingFieldProperty(): java.lang.String } - public final class As/GeneralAccessKt { private final static @org.jetbrains.annotations.NotNull field staticProperty: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/kt10715.txt b/compiler/testData/codegen/light-analysis/properties/kt10715.txt index bdec84ff8ee..36478762aae 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt10715.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt10715.txt @@ -5,7 +5,6 @@ public final class Base { public final method setCount(p0: int): void } - public final class Kt10715Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt10729.txt b/compiler/testData/codegen/light-analysis/properties/kt10729.txt index a76d005356c..9c840583ae5 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt10729.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt10729.txt @@ -5,7 +5,6 @@ public final class IntentionsBundle { public method (): void } - public final static class IntentionsBundle/Companion { inner class IntentionsBundle/Companion private method (): void @@ -13,7 +12,6 @@ public final static class IntentionsBundle/Companion { public final @org.jetbrains.annotations.NotNull method message2(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Kt10729Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt1159.txt b/compiler/testData/codegen/light-analysis/properties/kt1159.txt index 1b491d6e8c1..642e6a2d79b 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1159.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1159.txt @@ -2,7 +2,6 @@ public final class Kt1159Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class RefreshQueue { public final static field INSTANCE: RefreshQueue private final static field any: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/properties/kt1165.txt b/compiler/testData/codegen/light-analysis/properties/kt1165.txt index 43d417d355e..6be91fa2adc 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1165.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1165.txt @@ -2,13 +2,11 @@ public final class Kt1165Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class PhysicalVirtualFile { public method (): void public method getSize(): long } - public abstract class VirtualFile { public method (): void public abstract method getSize(): long diff --git a/compiler/testData/codegen/light-analysis/properties/kt1168.txt b/compiler/testData/codegen/light-analysis/properties/kt1168.txt index 58bb9544100..38b9eba9c05 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1168.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1168.txt @@ -6,12 +6,10 @@ public abstract class BaseClass { protected @org.jetbrains.annotations.NotNull method getKind2(): java.lang.String } - public final class Kt1168Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Subclass { private final @org.jetbrains.annotations.NotNull field kind2: java.lang.String private final @org.jetbrains.annotations.NotNull field kind: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/kt1170.txt b/compiler/testData/codegen/light-analysis/properties/kt1170.txt index 877bac26432..0699dedd152 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1170.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1170.txt @@ -5,12 +5,10 @@ public abstract class BaseClass { public final @org.jetbrains.annotations.NotNull method getKindValue(): java.lang.String } - public final class Kt1170Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Subclass { private final @org.jetbrains.annotations.NotNull field kind: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt12200.txt b/compiler/testData/codegen/light-analysis/properties/kt12200.txt index 89061c19afd..1aa6d553428 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt12200.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt12200.txt @@ -2,21 +2,18 @@ public final class Kt12200Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class ThingTemplate { private final field prop: int public method (): void public final method getProp(): int } - public final class ThingVal { private final field prop: int public method (@org.jetbrains.annotations.NotNull p0: ThingTemplate): void public final method getProp(): int } - public final class ThingVar { private field prop: int public method (@org.jetbrains.annotations.NotNull p0: ThingTemplate): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt12200Const.txt b/compiler/testData/codegen/light-analysis/properties/kt12200Const.txt deleted file mode 100644 index b39d57ec661..00000000000 --- a/compiler/testData/codegen/light-analysis/properties/kt12200Const.txt +++ /dev/null @@ -1,25 +0,0 @@ -public final class Kt12200ConstKt { - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String -} - - -public final class ThingTemplate { - public final static field INSTANCE: ThingTemplate - public final static field prop: int - private method (): void -} - - -public final class ThingVal { - private final field prop: int - public method (): void - public final method getProp(): int -} - - -public final class ThingVar { - private field prop: int - public method (): void - public final method getProp(): int - public final method setProp(p0: int): void -} diff --git a/compiler/testData/codegen/light-analysis/properties/kt1398.txt b/compiler/testData/codegen/light-analysis/properties/kt1398.txt index 907dc174d32..533a4c88c1f 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1398.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1398.txt @@ -4,13 +4,11 @@ public class Base { public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String } - public final class Foo { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final method something(): java.lang.String } - public final class Kt1398Kt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt1417.txt b/compiler/testData/codegen/light-analysis/properties/kt1417.txt index 773862e7787..b8ee97b50b4 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1417.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1417.txt @@ -4,13 +4,11 @@ public class pack/A { public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String } - public final class pack/B { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class pack/Kt1417Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt1482_2279.txt b/compiler/testData/codegen/light-analysis/properties/kt1482_2279.txt index 5497f93d6be..c99338db7dc 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1482_2279.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1482_2279.txt @@ -7,14 +7,12 @@ public abstract class ClassValAbstract { public abstract method setA(p0: int): void } - public final static class ClassValAbstract/Companion { inner class ClassValAbstract/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getMethods(): java.lang.reflect.Method[] } - public final class Kt1482_2279Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt1714.txt b/compiler/testData/codegen/light-analysis/properties/kt1714.txt index 909d1e160a4..567c4bf53df 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1714.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1714.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getTest(): java.lang.Integer } - public final class AImpl { private final @org.jetbrains.annotations.Nullable field method: kotlin.jvm.functions.Function0 private final @org.jetbrains.annotations.NotNull field test: java.lang.Integer @@ -12,7 +11,6 @@ public final class AImpl { public @org.jetbrains.annotations.NotNull method getTest(): java.lang.Integer } - public final class Kt1714Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: A): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt1714_minimal.txt b/compiler/testData/codegen/light-analysis/properties/kt1714_minimal.txt index 0f5ef01ef6e..5c98e19a25d 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt1714_minimal.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt1714_minimal.txt @@ -2,14 +2,12 @@ public interface A { public abstract method getV(): int } - public final class AImpl { private final field v: int public method (): void public method getV(): int } - public final class Kt1714_minimalKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt2331.txt b/compiler/testData/codegen/light-analysis/properties/kt2331.txt index a490a9a84c5..0e2d1fb5f8a 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt2331.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt2331.txt @@ -2,7 +2,6 @@ public final class Kt2331Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class P { private field x: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt257.txt b/compiler/testData/codegen/light-analysis/properties/kt257.txt index 39e5aadb34f..d737239ac22 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt257.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt257.txt @@ -5,14 +5,12 @@ public final class A { public final method setT(p0: java.lang.Object): void } - public final class B { private final field r: java.lang.Object public method (p0: java.lang.Object): void public final method getR(): java.lang.Object } - public final class Kt257Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt2655.txt b/compiler/testData/codegen/light-analysis/properties/kt2655.txt index 07d393028de..ae4de9afe22 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt2655.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt2655.txt @@ -2,7 +2,6 @@ public final class Kt2655Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class SimpleTextField { private field text2: java.lang.String public method (): void @@ -10,13 +9,11 @@ public final class SimpleTextField { public method setText(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface TextField { public abstract @org.jetbrains.annotations.NotNull method getText(): java.lang.String public abstract method setText(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class TextFieldWrapper { private synthetic final field $$delegate_0: TextField public method (@org.jetbrains.annotations.NotNull p0: TextField): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt2786.txt b/compiler/testData/codegen/light-analysis/properties/kt2786.txt index 56ce26e3232..672fd2ea5cd 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt2786.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt2786.txt @@ -5,19 +5,16 @@ public final class DelegateTest { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class FooDelegate { private final @org.jetbrains.annotations.NotNull field propertyTest: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getPropertyTest(): java.lang.String } - public interface FooTrait { public abstract @org.jetbrains.annotations.NotNull method getPropertyTest(): java.lang.String } - public final class Kt2786Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt2892.txt b/compiler/testData/codegen/light-analysis/properties/kt2892.txt index 87832646742..079c39ee33c 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt2892.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt2892.txt @@ -2,18 +2,15 @@ public class A { public method (): void } - public final class B { public method (): void public final method foo(): int } - public final class Kt2892Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private final @org.jetbrains.annotations.NotNull field a: A public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt3118.txt b/compiler/testData/codegen/light-analysis/properties/kt3118.txt index ee4ae255865..712083d22ea 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt3118.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt3118.txt @@ -2,7 +2,6 @@ public final class testing/Kt3118Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class testing/Test { public method (): void private final method getHello(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/kt3551.txt b/compiler/testData/codegen/light-analysis/properties/kt3551.txt index 8e52e069327..61f9134c2fd 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt3551.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt3551.txt @@ -7,14 +7,12 @@ public final class Identifier { private final method setMyNullable(p0: boolean): void } - public final static class Identifier/Companion { inner class Identifier/Companion private method (): void public final @org.jetbrains.annotations.NotNull method init(p0: boolean): Identifier } - public final class Kt3551Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt3556.txt b/compiler/testData/codegen/light-analysis/properties/kt3556.txt index 37ac9f8b8f3..26e682c2f56 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt3556.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt3556.txt @@ -2,7 +2,6 @@ public final class Kt3556Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { private final @org.jetbrains.annotations.NotNull field a: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt3930.txt b/compiler/testData/codegen/light-analysis/properties/kt3930.txt index aed5d64ea6f..be526c42f3d 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt3930.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt3930.txt @@ -3,7 +3,6 @@ public final class Bar { public method (): void } - public final class Bar/Baz { synthetic final field this$0: Bar inner class Bar/Baz @@ -11,7 +10,6 @@ public final class Bar/Baz { public final method call(): void } - public abstract class Foo { private field isOpen: boolean public method (): void @@ -19,7 +17,6 @@ public abstract class Foo { private final method setOpen(p0: boolean): void } - public final class Kt3930Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4140.txt b/compiler/testData/codegen/light-analysis/properties/kt4140.txt index c66ea824e19..55eb0cb2120 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4140.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4140.txt @@ -2,7 +2,6 @@ public final class Kt4140Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TestObject { public final static field Companion: TestObject.Companion private static field prop: int @@ -10,7 +9,6 @@ public final class TestObject { public method (): void } - public final static class TestObject/Companion { inner class TestObject/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/properties/kt4252.txt b/compiler/testData/codegen/light-analysis/properties/kt4252.txt index 9029a8c7f9b..215c20ec18c 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4252.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4252.txt @@ -2,7 +2,6 @@ public final class CallbackBlock { public method (): void } - public final class Foo { public final static field Companion: Foo.Companion private static field bar: int @@ -11,7 +10,6 @@ public final class Foo { public final method getBar(): int } - public final static class Foo/Companion { inner class Foo/Companion private method (): void @@ -19,7 +17,6 @@ public final static class Foo/Companion { private final method setBar(p0: int): void } - public final class Kt4252Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4252_2.txt b/compiler/testData/codegen/light-analysis/properties/kt4252_2.txt index 1b19a1007f6..bf0fd38cfc3 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4252_2.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4252_2.txt @@ -16,7 +16,6 @@ public final class Foo { public final method setD(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final static class Foo/Companion { inner class Foo/Companion private method (): void @@ -25,7 +24,6 @@ public final static class Foo/Companion { public final method setBoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt4252_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4340.txt b/compiler/testData/codegen/light-analysis/properties/kt4340.txt index 2d0935a0ff7..84407fd8f7e 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4340.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4340.txt @@ -10,7 +10,6 @@ public final class A { public final method test2(p0: int, p1: int): int } - public final class Kt4340Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4373.txt b/compiler/testData/codegen/light-analysis/properties/kt4373.txt index 374a364a02b..2efb30e54e7 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4373.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4373.txt @@ -5,13 +5,11 @@ public final class A { public synthetic method getProp(): java.lang.Object } - public final class Kt4373Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method eat(p0: int): void } - public interface Tr { public abstract method getProp(): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4383.txt b/compiler/testData/codegen/light-analysis/properties/kt4383.txt index 942eff6ddb1..0c250ab30fb 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4383.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4383.txt @@ -3,12 +3,10 @@ public final class D { public final method getValue(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): void } - public final class Kt4383Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class P { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: P diff --git a/compiler/testData/codegen/light-analysis/properties/kt613.txt b/compiler/testData/codegen/light-analysis/properties/kt613.txt index 96bea9895cb..44a7903e9e5 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt613.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt613.txt @@ -2,7 +2,6 @@ public final class name/Kt613Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class name/Test { private field i: int private final field ten: long diff --git a/compiler/testData/codegen/light-analysis/properties/kt8928.txt b/compiler/testData/codegen/light-analysis/properties/kt8928.txt index ce52b36eff5..0429f0bc040 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt8928.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt8928.txt @@ -6,7 +6,6 @@ public final class App { public final method init(): void } - public final static class App/Companion { inner class App/Companion private method (): void @@ -14,7 +13,6 @@ public final static class App/Companion { private final method setS(p0: java.lang.String): void } - public final class Kt8928Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt9603.txt b/compiler/testData/codegen/light-analysis/properties/kt9603.txt index 4b1ba5a7bd1..4ac1c6173c2 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt9603.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt9603.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class Kt9603Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/accessor.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/accessor.txt index 76a6af5b48e..e0f1a561a07 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/accessor.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/accessor.txt @@ -7,7 +7,6 @@ public final class A { public final method setMyStr(): void } - private final static class A/Companion { inner class A/Companion private method (): void @@ -15,7 +14,6 @@ private final static class A/Companion { private final method setStr(p0: java.lang.String): void } - public final class AccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/accessorException.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/accessorException.txt index 0882e829b48..e4c2a4237d5 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/accessorException.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/accessorException.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getMyStr(): java.lang.String } - private final static class A/Companion { inner class A/Companion private method (): void @@ -14,7 +13,6 @@ private final static class A/Companion { private final method setStr(p0: java.lang.String): void } - public final class AccessorExceptionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionField.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionField.txt index a9adeccf485..991f8c68903 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionField.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionField.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getMyStr(): java.lang.String } - public final class ExceptionFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionGetter.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionGetter.txt index 5e0591db747..26a16917a35 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionGetter.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/exceptionGetter.txt @@ -5,7 +5,6 @@ public final class A { public final method setStr(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ExceptionGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/override.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/override.txt index eca16462a79..bff7e207f65 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/override.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/override.txt @@ -7,12 +7,10 @@ public final class A { public method setStr(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface Intf { public abstract @org.jetbrains.annotations.NotNull method getStr(): java.lang.String } - public final class OverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/overrideException.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/overrideException.txt index 1c97e3e9d7d..0aca0680fca 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/overrideException.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/overrideException.txt @@ -6,12 +6,10 @@ public final class A { public method setStr(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface Intf { public abstract @org.jetbrains.annotations.NotNull method getStr(): java.lang.String } - public final class OverrideExceptionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetter.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetter.txt index 103473946a2..91f3471d361 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetter.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetter.txt @@ -6,7 +6,6 @@ public final class My { private final method setX(p0: java.lang.String): void } - public final class PrivateSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetterFromLambda.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetterFromLambda.txt index 667fe6e0768..efb24df7631 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetterFromLambda.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/privateSetterFromLambda.txt @@ -6,7 +6,6 @@ public final class My { private final method setX(p0: java.lang.String): void } - public final class PrivateSetterFromLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/simpleVar.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/simpleVar.txt index 8b096145358..18876a7aaca 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/simpleVar.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/simpleVar.txt @@ -5,7 +5,6 @@ public final class A { public final method setStr(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class SimpleVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/lateinit/visibility.txt b/compiler/testData/codegen/light-analysis/properties/lateinit/visibility.txt index 98a3f5403e2..55b0cc6632a 100644 --- a/compiler/testData/codegen/light-analysis/properties/lateinit/visibility.txt +++ b/compiler/testData/codegen/light-analysis/properties/lateinit/visibility.txt @@ -10,7 +10,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class VisibilityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDefaultAccessor.txt b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDefaultAccessor.txt index 926667027f3..bf25140729f 100644 --- a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDefaultAccessor.txt +++ b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDefaultAccessor.txt @@ -7,12 +7,10 @@ public final class A { public synthetic method setValue(p0: java.lang.Comparable): void } - public final class PrimitiveOverrideDefaultAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface R { public abstract @org.jetbrains.annotations.NotNull method getValue(): java.lang.Comparable public abstract method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): void diff --git a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt index c077e501da2..9d93ad6e1da 100644 --- a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt +++ b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt @@ -8,7 +8,6 @@ public final class A { public synthetic method setValue(p0: java.lang.Comparable): void } - public final class Holder { private field value: int public method (p0: int): void @@ -18,12 +17,10 @@ public final class Holder { public final method setValue(p0: int): void } - public final class PrimitiveOverrideDelegateAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface R { public abstract @org.jetbrains.annotations.NotNull method getValue(): java.lang.Comparable public abstract method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): void diff --git a/compiler/testData/codegen/light-analysis/properties/privatePropertyInConstructor.txt b/compiler/testData/codegen/light-analysis/properties/privatePropertyInConstructor.txt index bbadb07581b..072c851b4d3 100644 --- a/compiler/testData/codegen/light-analysis/properties/privatePropertyInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/properties/privatePropertyInConstructor.txt @@ -5,7 +5,6 @@ public final class A { public final method foo(): void } - public final class PrivatePropertyInConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/privatePropertyWithoutBackingField.txt b/compiler/testData/codegen/light-analysis/properties/privatePropertyWithoutBackingField.txt index 07351e57f1e..edbf5c7c8fe 100644 --- a/compiler/testData/codegen/light-analysis/properties/privatePropertyWithoutBackingField.txt +++ b/compiler/testData/codegen/light-analysis/properties/privatePropertyWithoutBackingField.txt @@ -2,7 +2,6 @@ public final class PrivatePropertyWithoutBackingFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final method foo(): void diff --git a/compiler/testData/codegen/light-analysis/properties/protectedJavaFieldInInline.txt b/compiler/testData/codegen/light-analysis/properties/protectedJavaFieldInInline.txt index 842b0de4748..3427e49588c 100644 --- a/compiler/testData/codegen/light-analysis/properties/protectedJavaFieldInInline.txt +++ b/compiler/testData/codegen/light-analysis/properties/protectedJavaFieldInInline.txt @@ -3,7 +3,6 @@ public final class test/B { public final method bar(): java.lang.String } - public final class test/KotlinKt { public final static method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/protectedJavaProperty.txt b/compiler/testData/codegen/light-analysis/properties/protectedJavaProperty.txt index d2b96392ba3..be48d3d700f 100644 --- a/compiler/testData/codegen/light-analysis/properties/protectedJavaProperty.txt +++ b/compiler/testData/codegen/light-analysis/properties/protectedJavaProperty.txt @@ -4,7 +4,6 @@ public final class z/KotlinExtender { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class z/KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method runSlowly(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/protectedJavaPropertyInCompanion.txt b/compiler/testData/codegen/light-analysis/properties/protectedJavaPropertyInCompanion.txt index 960e040f527..bcec39c9e2a 100644 --- a/compiler/testData/codegen/light-analysis/properties/protectedJavaPropertyInCompanion.txt +++ b/compiler/testData/codegen/light-analysis/properties/protectedJavaPropertyInCompanion.txt @@ -6,14 +6,12 @@ public final class z/A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final static class z/A/Companion { inner class z/A/Companion private method (): void public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class z/KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method runSlowly(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/properties/substituteJavaSuperField.txt b/compiler/testData/codegen/light-analysis/properties/substituteJavaSuperField.txt index 1ac41dfb271..9b3f2314c55 100644 --- a/compiler/testData/codegen/light-analysis/properties/substituteJavaSuperField.txt +++ b/compiler/testData/codegen/light-analysis/properties/substituteJavaSuperField.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.Nullable method foo(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.txt b/compiler/testData/codegen/light-analysis/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.txt index 7fbfaec6fb8..160bc5fd020 100644 --- a/compiler/testData/codegen/light-analysis/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.txt +++ b/compiler/testData/codegen/light-analysis/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.txt @@ -1,7 +1,6 @@ @java.lang.annotation.Retention public annotation class Anno - public final class TwoAnnotatedExtensionPropertiesWithoutBackingFieldsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private synthetic deprecated static @Anno method foo$annotations(p0: int): void diff --git a/compiler/testData/codegen/light-analysis/properties/typeInferredFromGetter.txt b/compiler/testData/codegen/light-analysis/properties/typeInferredFromGetter.txt index c45c5e005b5..dc780e194c9 100644 --- a/compiler/testData/codegen/light-analysis/properties/typeInferredFromGetter.txt +++ b/compiler/testData/codegen/light-analysis/properties/typeInferredFromGetter.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getY(): java.lang.String } - public final class TypeInferredFromGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/publishedApi/noMangling.txt b/compiler/testData/codegen/light-analysis/publishedApi/noMangling.txt index c5baf5dae27..758ba03f12c 100644 --- a/compiler/testData/codegen/light-analysis/publishedApi/noMangling.txt +++ b/compiler/testData/codegen/light-analysis/publishedApi/noMangling.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class NoManglingKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/publishedApi/simple.txt b/compiler/testData/codegen/light-analysis/publishedApi/simple.txt index f1ddb5c5e67..be4300ef569 100644 --- a/compiler/testData/codegen/light-analysis/publishedApi/simple.txt +++ b/compiler/testData/codegen/light-analysis/publishedApi/simple.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/ranges/contains/inComparableRange.txt b/compiler/testData/codegen/light-analysis/ranges/contains/inComparableRange.txt index 8f8400c858c..76db092e7ed 100644 --- a/compiler/testData/codegen/light-analysis/ranges/contains/inComparableRange.txt +++ b/compiler/testData/codegen/light-analysis/ranges/contains/inComparableRange.txt @@ -8,7 +8,6 @@ public final class ComparablePair { public final @org.jetbrains.annotations.NotNull method getSecond(): java.lang.Comparable } - public final class InComparableRangeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(p0: double, p1: double, p2: double): boolean diff --git a/compiler/testData/codegen/light-analysis/ranges/contains/inRangeWithCustomContains.txt b/compiler/testData/codegen/light-analysis/ranges/contains/inRangeWithCustomContains.txt index 7d98b0c8832..263c39dc43c 100644 --- a/compiler/testData/codegen/light-analysis/ranges/contains/inRangeWithCustomContains.txt +++ b/compiler/testData/codegen/light-analysis/ranges/contains/inRangeWithCustomContains.txt @@ -3,7 +3,6 @@ public final class InRangeWithCustomContainsKt { public final static @org.jetbrains.annotations.NotNull method rangeTo(@org.jetbrains.annotations.NotNull p0: Value, @org.jetbrains.annotations.NotNull p1: Value): kotlin.ranges.ClosedRange } - public final class Value { private final field x: int public method (p0: int): void @@ -12,7 +11,6 @@ public final class Value { public final method getX(): int } - public final class ValueRange { private final @org.jetbrains.annotations.NotNull field endInclusive: Value private final @org.jetbrains.annotations.NotNull field start: Value diff --git a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericArrayIndices.txt b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericArrayIndices.txt index 234d96886a9..1545aebdd5f 100644 --- a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericArrayIndices.txt +++ b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericArrayIndices.txt @@ -5,7 +5,6 @@ public abstract class BaseGeneric { public abstract method iterate(): void } - public final class Derived { private field test: int public method (@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): void @@ -14,7 +13,6 @@ public final class Derived { public final method setTest(p0: int): void } - public final class Kt12983_forInGenericArrayIndicesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericCollectionIndices.txt b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericCollectionIndices.txt index 3aa476e0f2b..a45ead362d5 100644 --- a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericCollectionIndices.txt +++ b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInGenericCollectionIndices.txt @@ -5,7 +5,6 @@ public abstract class BaseGeneric { public abstract method iterate(): void } - public final class Derived { private field test: int public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void @@ -14,7 +13,6 @@ public final class Derived { public final method setTest(p0: int): void } - public final class Kt12983_forInGenericCollectionIndicesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificArrayIndices.txt b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificArrayIndices.txt index b2c05415366..7444915bc48 100644 --- a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificArrayIndices.txt +++ b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificArrayIndices.txt @@ -5,7 +5,6 @@ public abstract class BaseGeneric { public abstract method iterate(): void } - public final class Derived { private field test: int public method (@org.jetbrains.annotations.NotNull p0: double[]): void @@ -14,7 +13,6 @@ public final class Derived { public final method setTest(p0: int): void } - public final class Kt12983_forInSpecificArrayIndicesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificCollectionIndices.txt b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificCollectionIndices.txt index 0f291e1433d..7d5f4accdc7 100644 --- a/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificCollectionIndices.txt +++ b/compiler/testData/codegen/light-analysis/ranges/forInIndices/kt12983_forInSpecificCollectionIndices.txt @@ -5,7 +5,6 @@ public abstract class BaseGeneric { public abstract method iterate(): void } - public final class Derived { private field test: int public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void @@ -14,7 +13,6 @@ public final class Derived { public final method setTest(p0: int): void } - public final class Kt12983_forInSpecificCollectionIndicesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/annotationRetentionAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/annotationRetentionAnnotation.txt index 2eff8f947e8..2678f3dd27e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/annotationRetentionAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/annotationRetentionAnnotation.txt @@ -2,7 +2,6 @@ @java.lang.annotation.Retention public annotation class Anno - public final class AnnotationRetentionAnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/annotationsOnJavaMembers.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/annotationsOnJavaMembers.txt index f31fc04ea7e..b0df3eb4469 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/annotationsOnJavaMembers.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/annotationsOnJavaMembers.txt @@ -3,7 +3,6 @@ public annotation class Anno { public abstract method value(): java.lang.String } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/propertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/propertyAccessors.txt index 987ee108f59..597f08bbc53 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/propertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/propertyAccessors.txt @@ -1,7 +1,6 @@ @java.lang.annotation.Retention public annotation class Get - public final class PropertyAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @Get @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/propertyWithoutBackingField.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/propertyWithoutBackingField.txt index 6967d942b49..abedeb0d585 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/propertyWithoutBackingField.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/propertyWithoutBackingField.txt @@ -3,7 +3,6 @@ public annotation class Ann { public abstract method value(): java.lang.String } - public final class PropertyWithoutBackingFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/retentions.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/retentions.txt index c13d99d7ddb..10a92aaaeb2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/retentions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/retentions.txt @@ -2,7 +2,6 @@ @java.lang.annotation.Retention public annotation class BinaryAnno - public final class RetentionsKt { public final static @RuntimeAnno @SourceAnno @BinaryAnno @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleClassAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleClassAnnotation.txt index 57218852dbd..e58c7653cbe 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleClassAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleClassAnnotation.txt @@ -9,7 +9,6 @@ public annotation class Simple { public abstract method value(): java.lang.String } - public final class SimpleClassAnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleConstructorAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleConstructorAnnotation.txt index 769e19c526f..0298b66cf94 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleConstructorAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleConstructorAnnotation.txt @@ -9,7 +9,6 @@ public annotation class Primary @java.lang.annotation.Retention public annotation class Secondary - public final class SimpleConstructorAnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleFunAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleFunAnnotation.txt index 33fb70fbe42..9aa52d7eef0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleFunAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleFunAnnotation.txt @@ -4,7 +4,6 @@ public annotation class Simple { public abstract method value(): java.lang.String } - public final class SimpleFunAnnotationKt { public final static @Simple @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleParamAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleParamAnnotation.txt index e180a149270..d061653e0d2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleParamAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleParamAnnotation.txt @@ -4,7 +4,6 @@ public annotation class Simple { public abstract method value(): java.lang.String } - public final class SimpleParamAnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@Simple p0: int): void diff --git a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleValAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleValAnnotation.txt index 123d628c5a3..8410dad6d22 100644 --- a/compiler/testData/codegen/light-analysis/reflection/annotations/simpleValAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/annotations/simpleValAnnotation.txt @@ -4,7 +4,6 @@ public annotation class Simple { public abstract method value(): java.lang.String } - public final class SimpleValAnnotationKt { private final static field foo: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/companionObjectPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/companionObjectPropertyAccessors.txt index e1b91754750..659a7736909 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/companionObjectPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/companionObjectPropertyAccessors.txt @@ -10,7 +10,6 @@ public final class CompanionObjectPropertyAccessorsKt { public final static @org.jetbrains.annotations.NotNull method getC_yy(): kotlin.reflect.KMutableProperty0 } - public final class Host { public final static field Companion: Host.Companion private final static field x: int @@ -19,7 +18,6 @@ public final class Host { public method (): void } - public final static class Host/Companion { inner class Host/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/extensionPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/extensionPropertyAccessors.txt index 5cf3372fce0..06c8c774a80 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/extensionPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/extensionPropertyAccessors.txt @@ -7,7 +7,6 @@ public final class C { public final method setY(p0: int): void } - public final class ExtensionPropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field c: C private final static @org.jetbrains.annotations.NotNull field c_xx: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/innerClassConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/innerClassConstructor.txt index d47f851ef69..5667f9d3602 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/innerClassConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/innerClassConstructor.txt @@ -2,7 +2,6 @@ public final class InnerClassConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field x: java.lang.String inner class Outer/Inner @@ -10,7 +9,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class Outer/Inner { synthetic final field this$0: Outer private final @org.jetbrains.annotations.NotNull field y: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticCompanionObjectPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticCompanionObjectPropertyAccessors.txt index 974ba194620..4b214e5d5a5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticCompanionObjectPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticCompanionObjectPropertyAccessors.txt @@ -12,7 +12,6 @@ public final class Host { public final static method setYy(p0: int): void } - public final static class Host/Companion { inner class Host/Companion private method (): void @@ -28,7 +27,6 @@ public final static class Host/Companion { private synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void } - public final class JvmStaticCompanionObjectPropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field c_x: kotlin.reflect.KProperty0 private final static @org.jetbrains.annotations.NotNull field c_xx: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectFunction.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectFunction.txt index e1c5178689d..770676f19d6 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectFunction.txt @@ -5,21 +5,18 @@ public final class CompanionOwner { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final static class CompanionOwner/Companion { inner class CompanionOwner/Companion private method (): void public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Host { public final static field INSTANCE: Host private method (): void public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class JvmStaticObjectFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectPropertyAccessors.txt index fe06aa7aa6d..309aec7ef84 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/jvmStaticObjectPropertyAccessors.txt @@ -15,7 +15,6 @@ public final class Host { private synthetic deprecated static @kotlin.jvm.JvmStatic method yy$annotations(): void } - public final class JvmStaticObjectPropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field c_x: kotlin.reflect.KProperty0 private final static @org.jetbrains.annotations.NotNull field c_xx: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/memberFunction.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/memberFunction.txt index e18e9bbb951..16daf063291 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/memberFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/memberFunction.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String } - public final class MemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/memberPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/memberPropertyAccessors.txt index fb49e9f048f..fc95cee7368 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/memberPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/memberPropertyAccessors.txt @@ -10,7 +10,6 @@ public final class C { public final method setYy(p0: int): void } - public final class MemberPropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field c: C private final static @org.jetbrains.annotations.NotNull field c_x: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/objectFunction.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/objectFunction.txt index 51b955d5cec..594151c13db 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/objectFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/objectFunction.txt @@ -4,21 +4,18 @@ public final class CompanionOwner { public method (): void } - public final static class CompanionOwner/Companion { inner class CompanionOwner/Companion private method (): void public final @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class Host { public final static field INSTANCE: Host private method (): void public final @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final class ObjectFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/bound/objectPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/bound/objectPropertyAccessors.txt index e260612118e..c003c693d9d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/bound/objectPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/bound/objectPropertyAccessors.txt @@ -11,7 +11,6 @@ public final class Host { public final method setYy(p0: int): void } - public final class ObjectPropertyAccessorsKt { private final static @org.jetbrains.annotations.NotNull field c_x: kotlin.reflect.KProperty0 private final static @org.jetbrains.annotations.NotNull field c_xx: kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/light-analysis/reflection/call/cannotCallEnumConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/call/cannotCallEnumConstructor.txt index a86f1277e08..9b11f33cc19 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/cannotCallEnumConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/cannotCallEnumConstructor.txt @@ -2,7 +2,6 @@ public final class CannotCallEnumConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class E { protected method (p0: java.lang.String, p1: int): void public static method valueOf(p0: java.lang.String): E diff --git a/compiler/testData/codegen/light-analysis/reflection/call/disallowNullValueForNotNullField.txt b/compiler/testData/codegen/light-analysis/reflection/call/disallowNullValueForNotNullField.txt index 1016fa3e97e..ff943784e92 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/disallowNullValueForNotNullField.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/disallowNullValueForNotNullField.txt @@ -3,19 +3,16 @@ public final class A { public method (): void } - public final class CounterTest { private field baz: java.lang.String private field generic: java.lang.Object public method (p0: java.lang.Object): void } - public final class DisallowNullValueForNotNullFieldKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field INSTANCE: O private static field bar: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/call/equalsHashCodeToString.txt b/compiler/testData/codegen/light-analysis/reflection/call/equalsHashCodeToString.txt index 832420f7fc3..2d604655547 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/equalsHashCodeToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/equalsHashCodeToString.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class D { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -15,7 +14,6 @@ public final class D { public method toString(): java.lang.String } - public final class EqualsHashCodeToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/fakeOverride.txt b/compiler/testData/codegen/light-analysis/reflection/call/fakeOverride.txt index 548ff8db165..722474c950f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/fakeOverride.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/fakeOverride.txt @@ -3,12 +3,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B { public method (): void } - public final class FakeOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/fakeOverrideSubstituted.txt b/compiler/testData/codegen/light-analysis/reflection/call/fakeOverrideSubstituted.txt index 85ea08e2a65..7c39a0e302d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/fakeOverrideSubstituted.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/fakeOverrideSubstituted.txt @@ -5,12 +5,10 @@ public class A { public final method getT(): java.lang.Object } - public final class B { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class FakeOverrideSubstitutedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/incorrectNumberOfArguments.txt b/compiler/testData/codegen/light-analysis/reflection/call/incorrectNumberOfArguments.txt index 96826b6ab12..97696d38682 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/incorrectNumberOfArguments.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/incorrectNumberOfArguments.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getBar(): kotlin.reflect.KMutableProperty1 } - public final class IncorrectNumberOfArgumentsKt { private static @org.jetbrains.annotations.NotNull field foo: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -15,7 +14,6 @@ public final class IncorrectNumberOfArgumentsKt { public final static method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class O { public final static field INSTANCE: O private static field baz: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/call/innerClassConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/call/innerClassConstructor.txt index e654a37e3a6..2e564c383d8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/innerClassConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/innerClassConstructor.txt @@ -4,7 +4,6 @@ public final class A { public method (): void } - public final class A/Inner { private final @org.jetbrains.annotations.NotNull field result: java.lang.String synthetic final field this$0: A @@ -13,7 +12,6 @@ public final class A/Inner { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final static class A/Nested { private final @org.jetbrains.annotations.NotNull field result: java.lang.String inner class A/Nested @@ -21,7 +19,6 @@ public final static class A/Nested { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class InnerClassConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/jvmStatic.txt b/compiler/testData/codegen/light-analysis/reflection/call/jvmStatic.txt index fb7499cb926..ea10c3e6205 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/jvmStatic.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/jvmStatic.txt @@ -5,19 +5,16 @@ public final class C { public final static @kotlin.jvm.JvmStatic method bar(): void } - public final static class C/Companion { inner class C/Companion private method (): void public final @kotlin.jvm.JvmStatic method bar(): void } - public final class JvmStaticKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Obj { public final static field INSTANCE: Obj private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/call/jvmStaticInObjectIncorrectReceiver.txt b/compiler/testData/codegen/light-analysis/reflection/call/jvmStaticInObjectIncorrectReceiver.txt index 24c1c42192c..24b87e8a95d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/jvmStaticInObjectIncorrectReceiver.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/jvmStaticInObjectIncorrectReceiver.txt @@ -2,7 +2,6 @@ public final class JvmStaticInObjectIncorrectReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Obj { public final static field INSTANCE: Obj private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/call/memberOfGenericClass.txt b/compiler/testData/codegen/light-analysis/reflection/call/memberOfGenericClass.txt index 5b4e1a8d993..9e2d57f9a2c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/memberOfGenericClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/memberOfGenericClass.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(p0: java.lang.Object): void } - public final class MemberOfGenericClassKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/call/privateProperty.txt b/compiler/testData/codegen/light-analysis/reflection/call/privateProperty.txt index 07676fadbd1..94ab095ba77 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/privateProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/privateProperty.txt @@ -3,7 +3,6 @@ public final class A { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PrivatePropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/propertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/call/propertyAccessors.txt index 4b9d60283c7..75194eb5bad 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/propertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/propertyAccessors.txt @@ -3,14 +3,12 @@ public final class A { public final method getP2(p0: int): int } - public final class B { public method (): void public final method getMp2(p0: int): int public final method setMp2(p0: int, p1: int): void } - public final class PropertyAccessorsKt { private static field globalCounter: int private static field mp0: int diff --git a/compiler/testData/codegen/light-analysis/reflection/call/propertyGetterAndGetFunctionDifferentReturnType.txt b/compiler/testData/codegen/light-analysis/reflection/call/propertyGetterAndGetFunctionDifferentReturnType.txt index cafac9545cb..d6376337216 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/propertyGetterAndGetFunctionDifferentReturnType.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/propertyGetterAndGetFunctionDifferentReturnType.txt @@ -11,7 +11,6 @@ public final class Foo { public method toString(): java.lang.String } - public final class PropertyGetterAndGetFunctionDifferentReturnTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/returnUnit.txt b/compiler/testData/codegen/light-analysis/reflection/call/returnUnit.txt index 74a2c97175c..0b0e27fe03d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/returnUnit.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/returnUnit.txt @@ -3,14 +3,12 @@ public final class A { public final method bar(): void } - public final class O { public final static field INSTANCE: O private method (): void public final static @kotlin.jvm.JvmStatic method baz(): void } - public final class ReturnUnitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method foo(): void diff --git a/compiler/testData/codegen/light-analysis/reflection/call/simpleConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/call/simpleConstructor.txt index 77368a95884..d2062cc8574 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/simpleConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/simpleConstructor.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class SimpleConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/call/simpleMemberFunction.txt b/compiler/testData/codegen/light-analysis/reflection/call/simpleMemberFunction.txt index fcf79f385d8..6bbe5e0e65a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/call/simpleMemberFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/call/simpleMemberFunction.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(p0: int, p1: int): int } - public final class SimpleMemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/boundJvmStaticInObject.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/boundJvmStaticInObject.txt index daac3740940..423c5c81763 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/boundJvmStaticInObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/boundJvmStaticInObject.txt @@ -2,7 +2,6 @@ public final class BoundJvmStaticInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Host { public final static field INSTANCE: Host private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/companionObject.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/companionObject.txt index 3391c3b5f42..23d5d399cf1 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/companionObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/companionObject.txt @@ -4,7 +4,6 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void @@ -12,7 +11,6 @@ public final static class C/Companion { public final @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class CompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInCompanionObject.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInCompanionObject.txt index 73b1b4dbc94..cb9328e90a2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInCompanionObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInCompanionObject.txt @@ -5,7 +5,6 @@ public final class C { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final static class C/Companion { inner class C/Companion private method (): void @@ -13,7 +12,6 @@ public final static class C/Companion { public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String } - public final class JvmStaticInCompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInObject.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInObject.txt index 3a669b42105..3e389eb5bde 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/jvmStaticInObject.txt @@ -2,7 +2,6 @@ public final class JvmStaticInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Obj { public final static field INSTANCE: Obj private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/manyArgumentsOnlyOneDefault.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/manyArgumentsOnlyOneDefault.txt index 63a6e85988b..c40ab556774 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/manyArgumentsOnlyOneDefault.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/manyArgumentsOnlyOneDefault.txt @@ -4,7 +4,6 @@ public final class A { public final method foo(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: int, p7: int, p8: int, p9: int, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: int, p17: int, p18: int, p19: int, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: int, p27: int, p28: int, p29: int, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: int, p37: int, p38: int, p39: int, p40: int, p41: int, p42: int, p43: int, p44: int, p45: int, p46: int, p47: int, p48: int, p49: int, p50: int, p51: int, p52: int, p53: int, p54: int, p55: int, p56: int, p57: int, p58: int, p59: int, p60: int, p61: int, p62: int, p63: int, p64: int, p65: int, p66: int, p67: int, p68: int, p69: int): void } - public final class ManyArgumentsOnlyOneDefaultKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/manyMaskArguments.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/manyMaskArguments.txt index deacc179ed2..8f1bf8cb243 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/manyMaskArguments.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/manyMaskArguments.txt @@ -4,7 +4,6 @@ public final class A { public final method foo(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: int, p7: int, p8: int, p9: int, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: int, p17: int, p18: int, p19: int, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: int, p27: int, p28: int, p29: int, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: int, p37: int, p38: int, p39: int, p40: int, p41: int, p42: int, p43: int, p44: int, p45: int, p46: int, p47: int, p48: int, p49: int, p50: int, p51: int, p52: int, p53: int, p54: int, p55: int, p56: int, p57: int, p58: int, p59: int, p60: int, p61: int, p62: int, p63: int, p64: int, p65: int, p66: int, p67: int, p68: int, p69: int): void } - public final class ManyMaskArgumentsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/privateMemberFunction.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/privateMemberFunction.txt index c31447c1693..3150c11dce8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/privateMemberFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/privateMemberFunction.txt @@ -5,7 +5,6 @@ public final class A { private final method foo(p0: java.lang.Object): void } - public final class PrivateMemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/simpleConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/simpleConstructor.txt index 08e987d38e9..a9b71457765 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/simpleConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/simpleConstructor.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class SimpleConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/callBy/simpleMemberFunciton.txt b/compiler/testData/codegen/light-analysis/reflection/callBy/simpleMemberFunciton.txt index c3ac8dd4861..6b66a333986 100644 --- a/compiler/testData/codegen/light-analysis/reflection/callBy/simpleMemberFunciton.txt +++ b/compiler/testData/codegen/light-analysis/reflection/callBy/simpleMemberFunciton.txt @@ -8,7 +8,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class SimpleMemberFuncitonKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericArrays.txt b/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericArrays.txt index bd8bd325a75..91879c4665c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericArrays.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericArrays.txt @@ -3,7 +3,6 @@ public final class GenericArraysKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Klass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericClass.txt b/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericClass.txt index 9c473d68707..7d6261fc5cc 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classLiterals/genericClass.txt @@ -2,7 +2,6 @@ public final class Generic { public method (): void } - public final class GenericClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/classLiterals/reifiedTypeClassLiteral.txt b/compiler/testData/codegen/light-analysis/reflection/classLiterals/reifiedTypeClassLiteral.txt index 20b4fd56c98..59d884980ab 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classLiterals/reifiedTypeClassLiteral.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classLiterals/reifiedTypeClassLiteral.txt @@ -2,12 +2,10 @@ public final class Klass { public method (): void } - public final class Other { public method (): void } - public final class ReifiedTypeClassLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method myJavaClass(): java.lang.Class diff --git a/compiler/testData/codegen/light-analysis/reflection/classLiterals/simpleClassLiteral.txt b/compiler/testData/codegen/light-analysis/reflection/classLiterals/simpleClassLiteral.txt index 11904e26e0b..628ce4ac60d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classLiterals/simpleClassLiteral.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classLiterals/simpleClassLiteral.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class SimpleClassLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/classSimpleName.txt b/compiler/testData/codegen/light-analysis/reflection/classes/classSimpleName.txt index aab8218587b..cd6344d16c1 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/classSimpleName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/classSimpleName.txt @@ -2,7 +2,6 @@ public final class ClassSimpleNameKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Klass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/companionObject.txt b/compiler/testData/codegen/light-analysis/reflection/classes/companionObject.txt index 4c5d1c0538b..8d29fd8b663 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/companionObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/companionObject.txt @@ -4,18 +4,15 @@ public final class A { public method (): void } - public final static class A/C { inner class A/C private method (): void } - public final class CompanionObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class E { public final static field Companion: E.Companion public final static field ENTRY: E @@ -25,7 +22,6 @@ public enum class E { public static method values(): E[] } - public final static class E/Companion { inner class E/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/createInstance.txt b/compiler/testData/codegen/light-analysis/reflection/classes/createInstance.txt index 3b9763035c5..18c0528a843 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/createInstance.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/createInstance.txt @@ -4,7 +4,6 @@ public final class CreateInstanceKt { private final static method testFail(): void } - public final class DefaultPrimaryAndDefaultSecondary { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -15,14 +14,12 @@ public final class DefaultPrimaryAndDefaultSecondary { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class NoArgAndDefault { public method (): void public method (p0: int): void public synthetic method (p0: int, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class NoNoArgConstructor { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -30,13 +27,11 @@ public final class NoNoArgConstructor { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class Object { public final static field INSTANCE: Object private method (): void } - public final class PrimaryWithDefaults { private final @org.jetbrains.annotations.NotNull field d1: java.lang.String private final field d2: int @@ -47,12 +42,10 @@ public final class PrimaryWithDefaults { public final method getD2(): int } - public final class PrivateConstructor { private method (): void } - public final class Secondary { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (): void @@ -60,7 +53,6 @@ public final class Secondary { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class SecondaryWithDefaults { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -69,14 +61,12 @@ public final class SecondaryWithDefaults { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class SecondaryWithDefaultsNoPrimary { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method (p0: int): void public synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class SeveralDefaultSecondaries { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method (p0: double): void @@ -86,7 +76,6 @@ public final class SeveralDefaultSecondaries { public synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class Simple { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/declaredMembers.txt b/compiler/testData/codegen/light-analysis/reflection/classes/declaredMembers.txt index 181a6bdf0c7..335bebe3b55 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/declaredMembers.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/declaredMembers.txt @@ -8,13 +8,11 @@ public class K { public final method setPublicKProp(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method test(p0: java.lang.String[]): void } - public final class L { private field privateLProp: kotlin.Unit private final @org.jetbrains.annotations.NotNull field publicLProp: kotlin.Unit diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/jvmName.txt b/compiler/testData/codegen/light-analysis/reflection/classes/jvmName.txt index ccd2705d43d..5c3731fd198 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/jvmName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/jvmName.txt @@ -2,7 +2,6 @@ public final class JvmNameKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Klass { public final static field Companion: Klass.Companion inner class Klass/Companion @@ -10,13 +9,11 @@ public final class Klass { public method (): void } - public final static class Klass/Companion { inner class Klass/Companion private method (): void } - public final static class Klass/Nested { inner class Klass/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/localClassSimpleName.txt b/compiler/testData/codegen/light-analysis/reflection/classes/localClassSimpleName.txt index cafd30424b1..ce291c013b4 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/localClassSimpleName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/localClassSimpleName.txt @@ -4,7 +4,6 @@ public final class LocalClassSimpleNameKt { public final static method localInMethod(): void } - public final class LocalInConstructor { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/nestedClasses.txt b/compiler/testData/codegen/light-analysis/reflection/classes/nestedClasses.txt index fb89989f82c..7756e54468a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/nestedClasses.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/nestedClasses.txt @@ -7,32 +7,27 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final class A/Inner { synthetic final field this$0: A inner class A/Inner public method (p0: A): void } - public final static class A/Nested { inner class A/Nested public method (): void } - private final static class A/PrivateNested { inner class A/PrivateNested public method (): void } - public final class NestedClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method nestedNames(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass): java.util.List diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/objectInstance.txt b/compiler/testData/codegen/light-analysis/reflection/classes/objectInstance.txt index 8be7b7dad4b..f30edff7877 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/objectInstance.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/objectInstance.txt @@ -4,40 +4,34 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void public final method foo(): int } - public final class B { public final static field Factory: B.Factory inner class B/Factory public method (): void } - public final static class B/Factory { inner class B/Factory private method (): void public final method foo(): int } - public final class C { public method (): void } - public final class Obj { public final static field INSTANCE: Obj private method (): void public final method foo(): int } - public final class ObjectInstanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/qualifiedName.txt b/compiler/testData/codegen/light-analysis/reflection/classes/qualifiedName.txt index 59dbe41a0bd..c26d272135c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/qualifiedName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/qualifiedName.txt @@ -5,19 +5,16 @@ public final class Klass { public method (): void } - public final static class Klass/Companion { inner class Klass/Companion private method (): void } - public final static class Klass/Nested { inner class Klass/Nested public method (): void } - public final class QualifiedNameKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/classes/starProjectedType.txt b/compiler/testData/codegen/light-analysis/reflection/classes/starProjectedType.txt index 815765afeb3..6be52455d73 100644 --- a/compiler/testData/codegen/light-analysis/reflection/classes/starProjectedType.txt +++ b/compiler/testData/codegen/light-analysis/reflection/classes/starProjectedType.txt @@ -2,7 +2,6 @@ public final class Foo { public method (): void } - public final class StarProjectedTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/constructors/annotationClass.txt b/compiler/testData/codegen/light-analysis/reflection/constructors/annotationClass.txt index e2a2a466b01..227c12499ba 100644 --- a/compiler/testData/codegen/light-analysis/reflection/constructors/annotationClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/constructors/annotationClass.txt @@ -7,7 +7,6 @@ public annotation class A2 { public abstract method s(): A1 } - public final class AnnotationClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/constructors/classesWithoutConstructors.txt b/compiler/testData/codegen/light-analysis/reflection/constructors/classesWithoutConstructors.txt index 2b99067d212..9bc308dad10 100644 --- a/compiler/testData/codegen/light-analysis/reflection/constructors/classesWithoutConstructors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/constructors/classesWithoutConstructors.txt @@ -4,21 +4,17 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void } - public final class ClassesWithoutConstructorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Interface - public final class Obj { public final static field INSTANCE: Obj private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/constructors/constructorName.txt b/compiler/testData/codegen/light-analysis/reflection/constructors/constructorName.txt index 73715c504a6..de0133cef2c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/constructors/constructorName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/constructors/constructorName.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class ConstructorNameKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/constructors/primaryConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/constructors/primaryConstructor.txt index 9ce56d9e264..c385e0479d4 100644 --- a/compiler/testData/codegen/light-analysis/reflection/constructors/primaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/constructors/primaryConstructor.txt @@ -4,44 +4,36 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void } - public enum class En { protected method (p0: java.lang.String, p1: int): void public static method valueOf(p0: java.lang.String): En public static method values(): En[] } - public interface I - public final class O { public final static field INSTANCE: O private method (): void } - public final class OnlyPrimary { public method (): void } - public final class OnlySecondary { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PrimaryConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class PrimaryWithSecondary { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -50,7 +42,6 @@ public final class PrimaryWithSecondary { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class TwoSecondaries { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method (p0: double): void diff --git a/compiler/testData/codegen/light-analysis/reflection/constructors/simpleGetConstructors.txt b/compiler/testData/codegen/light-analysis/reflection/constructors/simpleGetConstructors.txt index b08f5998e6a..5e203605cf6 100644 --- a/compiler/testData/codegen/light-analysis/reflection/constructors/simpleGetConstructors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/constructors/simpleGetConstructors.txt @@ -4,32 +4,27 @@ public class A { private method (p0: int): void } - public final class B { public method (): void } - public final class C { inner class C/Inner inner class C/Nested public method (): void } - public final class C/Inner { synthetic final field this$0: C inner class C/Inner public method (p0: C): void } - public final static class C/Nested { inner class C/Nested public method (): void } - public final class SimpleGetConstructorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/arrayOfKClasses.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/arrayOfKClasses.txt index 46de799e7a7..14716186daa 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/arrayOfKClasses.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/arrayOfKClasses.txt @@ -3,7 +3,6 @@ public annotation class Anno { public abstract method klasses(): java.lang.Class[] } - public final class ArrayOfKClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/enumKClassAnnotation.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/enumKClassAnnotation.txt index a3084992597..3e7a57476cb 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/enumKClassAnnotation.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/enumKClassAnnotation.txt @@ -8,7 +8,6 @@ public annotation class Anno { public abstract method levels(): kotlin.DeprecationLevel[] } - public final class EnumKClassAnnotationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @Anno method foo(): void diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/equalsHashCodeToString.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/equalsHashCodeToString.txt index e92dc2e3a76..d6c83016d4c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/equalsHashCodeToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/equalsHashCodeToString.txt @@ -6,7 +6,6 @@ public annotation class test/B { public abstract method s(): java.lang.String } - public final class test/EqualsHashCodeToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @test.A @test.B method javaReflectionAnnotationInstances(): void diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/floatingPointParameters.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/floatingPointParameters.txt index 5ad103fcb13..4d5f5b2edd8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/floatingPointParameters.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/floatingPointParameters.txt @@ -8,7 +8,6 @@ public annotation class F { public abstract method f(): float } - public final class FloatingPointParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/parameterNamedEquals.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/parameterNamedEquals.txt index 42514b1bbc2..6a44c9fd879 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/parameterNamedEquals.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/parameterNamedEquals.txt @@ -3,7 +3,6 @@ public annotation class Anno { public abstract method equals(): boolean } - public final class ParameterNamedEqualsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/primitivesAndArrays.txt b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/primitivesAndArrays.txt index 68056763af8..4f6309b0164 100644 --- a/compiler/testData/codegen/light-analysis/reflection/createAnnotation/primitivesAndArrays.txt +++ b/compiler/testData/codegen/light-analysis/reflection/createAnnotation/primitivesAndArrays.txt @@ -20,7 +20,6 @@ public annotation class Anno { public abstract method za(): boolean[] } - public final class PrimitivesAndArraysKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @Anno method foo(): void diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/anonymousObjectInInlinedLambda.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/anonymousObjectInInlinedLambda.txt index 9a56321d4c5..aea13163c32 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/anonymousObjectInInlinedLambda.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/anonymousObjectInInlinedLambda.txt @@ -2,7 +2,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class AnonymousObjectInInlinedLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): A diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt index 0fe4dadffe5..3ff7ded048c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt @@ -5,7 +5,6 @@ public final class Kt6368Kt { public final static @org.jetbrains.annotations.NotNull method getA(): java.util.HashMap } - public interface R { public abstract @org.jetbrains.annotations.NotNull method result(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6691_lambdaInSamConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6691_lambdaInSamConstructor.txt index d1c58dec7c3..27b8a544fea 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6691_lambdaInSamConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6691_lambdaInSamConstructor.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.Runnable } - public final class Kt6691_lambdaInSamConstructorKt { private static @org.jetbrains.annotations.NotNull field lambda: kotlin.jvm.functions.Function0 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInClassObject.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInClassObject.txt index 2548864a71b..fdbbeaff727 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInClassObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInClassObject.txt @@ -2,7 +2,6 @@ public final class LambdaInClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field Companion: O.Companion private final static @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function0 @@ -10,7 +9,6 @@ public final class O { public method (): void } - public final static class O/Companion { inner class O/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInConstructor.txt index 7eff8c149d6..e78e809a4ca 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInConstructor.txt @@ -4,7 +4,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getL(): java.lang.Object } - public final class LambdaInConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassConstructor.txt index bbe478078cc..f0b6dd7e44d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassConstructor.txt @@ -2,7 +2,6 @@ public class C { public method (): void } - public final class LambdaInLocalClassConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassSuperCall.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassSuperCall.txt index e25d0a4ec67..c6a3faa9b9d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInLocalClassSuperCall.txt @@ -4,7 +4,6 @@ public class C { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.Object } - public final class LambdaInLocalClassSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunction.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunction.txt index adbef340917..feeac4312b5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunction.txt @@ -3,7 +3,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public final class LambdaInMemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunctionInNestedClass.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunctionInNestedClass.txt index afcccff627b..b0291459219 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunctionInNestedClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInMemberFunctionInNestedClass.txt @@ -3,14 +3,12 @@ public final class C { public method (): void } - public final static class C/D { inner class C/D public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public final class LambdaInMemberFunctionInNestedClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectDeclaration.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectDeclaration.txt index 4768e8737d0..30eb26f84d9 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectDeclaration.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectDeclaration.txt @@ -2,7 +2,6 @@ public final class LambdaInObjectDeclarationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field INSTANCE: O private final static @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function0 diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectExpression.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectExpression.txt index f99e04ffcb7..6c7c9a37846 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectExpression.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectExpression.txt @@ -2,7 +2,6 @@ public interface C { public abstract @org.jetbrains.annotations.NotNull method getA(): java.lang.Object } - public final class LambdaInObjectExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectLiteralSuperCall.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectLiteralSuperCall.txt index 4f745dd6e84..d42526915d3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectLiteralSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/lambdaInObjectLiteralSuperCall.txt @@ -4,7 +4,6 @@ public class C { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.Object } - public final class LambdaInObjectLiteralSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/declaredVsInheritedFunctions.txt b/compiler/testData/codegen/light-analysis/reflection/functions/declaredVsInheritedFunctions.txt index 065e8208899..7540760c556 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/declaredVsInheritedFunctions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/declaredVsInheritedFunctions.txt @@ -6,14 +6,12 @@ public class K { public final method publicMemberK(): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.util.Collection, @org.jetbrains.annotations.NotNull p1: java.util.Set): void public final static @org.jetbrains.annotations.NotNull method names(@org.jetbrains.annotations.NotNull p0: java.util.Collection): java.util.Set } - public final class L { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/functionReferenceErasedToKFunction.txt b/compiler/testData/codegen/light-analysis/reflection/functions/functionReferenceErasedToKFunction.txt index 2c81f8d9efc..48e01dcffdc 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/functionReferenceErasedToKFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/functionReferenceErasedToKFunction.txt @@ -5,14 +5,12 @@ public final class K { public final @org.jetbrains.annotations.NotNull method reverse(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String } - public final static class K/Companion { inner class K/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getRef(): kotlin.reflect.KFunction } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/genericOverriddenFunction.txt b/compiler/testData/codegen/light-analysis/reflection/functions/genericOverriddenFunction.txt index 3103e39b2a4..59585537a0e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/genericOverriddenFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/genericOverriddenFunction.txt @@ -1,11 +1,9 @@ public interface A - public final class GenericOverriddenFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface H { public abstract @org.jetbrains.annotations.Nullable method foo(): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/instanceOfFunction.txt b/compiler/testData/codegen/light-analysis/reflection/functions/instanceOfFunction.txt index 26912383d5d..b3903f2fbeb 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/instanceOfFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/instanceOfFunction.txt @@ -3,7 +3,6 @@ public final class Foo { public final method bar(p0: int): int } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/privateMemberFunction.txt b/compiler/testData/codegen/light-analysis/reflection/functions/privateMemberFunction.txt index 45c3bf83e43..890159094b9 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/privateMemberFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/privateMemberFunction.txt @@ -3,7 +3,6 @@ public final class A { private final method foo(): java.lang.String } - public final class PrivateMemberFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/simpleGetFunctions.txt b/compiler/testData/codegen/light-analysis/reflection/functions/simpleGetFunctions.txt index 740169e7437..ac7e5626966 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/simpleGetFunctions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/simpleGetFunctions.txt @@ -4,12 +4,10 @@ public class A { public final method memExt(p0: int): void } - public final class B { public method (): void } - public final class SimpleGetFunctionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/functions/simpleNames.txt b/compiler/testData/codegen/light-analysis/reflection/functions/simpleNames.txt index fdd864b10c0..51a8f66423b 100644 --- a/compiler/testData/codegen/light-analysis/reflection/functions/simpleNames.txt +++ b/compiler/testData/codegen/light-analysis/reflection/functions/simpleNames.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class SimpleNamesKt { public final static method baz(p0: int): int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/covariantOverride.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/covariantOverride.txt index 8161e40de5c..9140bd56533 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/covariantOverride.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/covariantOverride.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.util.Collection } - public abstract class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.util.Collection } - public final class CovariantOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/defaultImplsGenericSignature.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/defaultImplsGenericSignature.txt index 46efbc1b5c7..791cf79c66a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/defaultImplsGenericSignature.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/defaultImplsGenericSignature.txt @@ -4,26 +4,22 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method test2(p0: java.lang.Object): A } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method test1(p0: A, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public static @org.jetbrains.annotations.NotNull method test2(p0: A, p1: java.lang.Object): A } - public final class B { private final field value: java.lang.Object public method (p0: java.lang.Object): void public final method getValue(): java.lang.Object } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class X { private final field p1: java.lang.Object private final @org.jetbrains.annotations.NotNull field p2: B diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt index 257b019e077..26384d10aa0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt @@ -2,12 +2,10 @@ public final class GenericBackingFieldSignatureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class TParam { public method (): void } - public final class Test { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.Nullable field classField1: Z @@ -27,17 +25,14 @@ public final class Test { public final @org.jetbrains.annotations.Nullable method getDelegateNotNull(): Z } - public final class Z { public method (): void } - public final class Zin { public method (): void } - public final class Zout { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericMethodSignature.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericMethodSignature.txt index 2269d8be557..facbeb21d49 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericMethodSignature.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericMethodSignature.txt @@ -3,7 +3,6 @@ public final class GenericMethodSignatureKt { public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.Class, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Class, @org.jetbrains.annotations.NotNull p3: java.lang.String, @org.jetbrains.annotations.NotNull p4: java.lang.String): java.lang.String } - public final class Params { private final @org.jetbrains.annotations.NotNull field expecedParamType: java.lang.String private final @org.jetbrains.annotations.NotNull field expectedReturnType: java.lang.String @@ -16,12 +15,10 @@ public final class Params { public final @org.jetbrains.annotations.NotNull method getParamClass(): java.lang.Class } - public final class TParam { public method (): void } - public final class Test { public method (): void public final @org.jetbrains.annotations.Nullable method test1(p0: java.lang.Object): java.lang.Object @@ -31,17 +28,14 @@ public final class Test { public final @org.jetbrains.annotations.Nullable method test5(p0: java.lang.Object): Zin } - public final class Z { public method (): void } - public final class Zin { public method (): void } - public final class Zout { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt11121.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt11121.txt index 491de146076..8eef6caa92e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt11121.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt11121.txt @@ -4,19 +4,16 @@ public interface A { public abstract method p(p0: java.lang.Object): java.lang.Object } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.Nullable method getZ(p0: A, p1: java.lang.Object): java.lang.Object public static method p(p0: A, p1: java.lang.Object): java.lang.Object } - public final class B { public method (): void } - public final class Kt11121Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt5112.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt5112.txt index 5f5d1786c73..838965066a3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt5112.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt5112.txt @@ -5,19 +5,16 @@ public final class test/ErrorsJvmClass { public method (): void } - public final static class test/ErrorsJvmClass/Companion { inner class test/ErrorsJvmClass/Companion private method (): void } - public interface test/ErrorsJvmTrait { public final static field Companion: test.ErrorsJvmTrait.Companion inner class test/ErrorsJvmTrait/Companion } - public final static class test/ErrorsJvmTrait/Companion { private final static @org.jetbrains.annotations.NotNull field param: test.G inner class test/ErrorsJvmTrait/Companion @@ -25,14 +22,12 @@ public final static class test/ErrorsJvmTrait/Companion { public final @org.jetbrains.annotations.NotNull method getParam(): test.G } - public final class test/G { private final field s: java.lang.Object public method (p0: java.lang.Object): void public final method getS(): java.lang.Object } - public final class test/Kt5112Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt6106.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt6106.txt index 77671df2b35..36518f1786a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt6106.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/kt6106.txt @@ -5,19 +5,16 @@ public final class test/A { public final static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method a(@org.jetbrains.annotations.NotNull p0: test.B): test.B } - public final static class test/A/Companion { inner class test/A/Companion private method (): void public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method a(@org.jetbrains.annotations.NotNull p0: test.B): test.B } - public class test/B { public method (): void } - public final class test/Kt6106Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/array.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/array.txt index 31bcac95592..83c506443bb 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/array.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/array.txt @@ -4,12 +4,10 @@ public annotation class Ann { public abstract method args(): java.lang.Class[] } - public final class ArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class K { public method (): void } @@ -19,7 +17,6 @@ public final class MyClass { public method (): void } - public final class O { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/arrayInJava.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/arrayInJava.txt index 52a0935518c..aee7b23614f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/arrayInJava.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/arrayInJava.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method args(): java.lang.Class[] } - public final class ArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basic.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basic.txt index e24834ac2e8..ddedcb7b217 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basic.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basic.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method arg(): java.lang.Class } - public final class BasicKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } @@ -14,7 +13,6 @@ public final class MyClass { public method (): void } - public final class OK { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basicInJava.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basicInJava.txt index 8341eabb940..bfda28ce79b 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basicInJava.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/basicInJava.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method arg(): java.lang.Class } - public final class BasicKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/vararg.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/vararg.txt index 05985c00f67..1e1582e2497 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/vararg.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/vararg.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method args(): java.lang.Class[] } - public final class K { public method (): void } @@ -14,12 +13,10 @@ public final class MyClass { public method (): void } - public final class O { public method (): void } - public final class VarargKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/varargInJava.txt b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/varargInJava.txt index f640d3e0058..63b87dae3fd 100644 --- a/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/varargInJava.txt +++ b/compiler/testData/codegen/light-analysis/reflection/kClassInAnnotation/varargInJava.txt @@ -4,7 +4,6 @@ public annotation class Ann { public abstract method args(): java.lang.Class[] } - public final class VarargKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/constructor.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/constructor.txt index 5f017716859..08ed940ad9e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/constructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/constructor.txt @@ -3,27 +3,23 @@ public final class ConstructorKt { public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KFunction): void } - public final class K { inner class K/Inner inner class K/Nested public method (): void } - public final class K/Inner { synthetic final field this$0: K inner class K/Inner public method (p0: K): void } - public final static class K/Nested { inner class K/Nested public method (): void } - public final class Secondary { public method (p0: int): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/extensionProperty.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/extensionProperty.txt index 9891cc7be0a..35dc985eb2a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/extensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/extensionProperty.txt @@ -4,7 +4,6 @@ public final class ExtensionPropertyKt { public final static method setExt(@org.jetbrains.annotations.NotNull p0: K, p1: double): void } - public final class K { private field value: long public method (p0: long): void diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaFieldGetterSetter.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaFieldGetterSetter.txt index 88b45087249..d10f0b06eb5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaFieldGetterSetter.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaFieldGetterSetter.txt @@ -2,7 +2,6 @@ public final class JavaFieldGetterSetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class TestBase { private field id: long public method (): void @@ -10,7 +9,6 @@ public class TestBase { public final method setId(p0: long): void } - public final class TestChild { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaMethod.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaMethod.txt index 76691d952b5..458b5d8d41e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaMethod.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/fakeOverrides/javaMethod.txt @@ -2,13 +2,11 @@ public final class JavaMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class TestBase { public method (): void public final method id(): long } - public final class TestChild { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/functions.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/functions.txt index d45617e1cd5..1517c71b324 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/functions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/functions.txt @@ -5,7 +5,6 @@ public final class FunctionsKt { public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KFunction): void } - public final class K { public method (): void public final method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): int diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/inlineReifiedFun.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/inlineReifiedFun.txt index 5edddce3b1a..94d42188a0f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/inlineReifiedFun.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/inlineReifiedFun.txt @@ -3,7 +3,6 @@ public final class Foo { private final method h(p0: java.lang.Object): int } - public final class InlineReifiedFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method f(): int diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/companionObjectFunction.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/companionObjectFunction.txt index 881827b3ae6..86f0b17b929 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/companionObjectFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/companionObjectFunction.txt @@ -5,14 +5,12 @@ public final class C { public final static @kotlin.jvm.JvmStatic method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): int } - public final static class C/Companion { inner class C/Companion private method (): void public final @kotlin.jvm.JvmStatic method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): int } - public final class CompanionObjectFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/objectFunction.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/objectFunction.txt index 838b9deee3f..45fc0b144c7 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/objectFunction.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/jvmStatic/objectFunction.txt @@ -4,7 +4,6 @@ public final class O { public final static @kotlin.jvm.JvmStatic method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): int } - public final class ObjectFunctionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/mappedClassIsEqualToClassLiteral.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/mappedClassIsEqualToClassLiteral.txt index 858520ebec0..1ac40b835d7 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/mappedClassIsEqualToClassLiteral.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/mappedClassIsEqualToClassLiteral.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class MappedClassIsEqualToClassLiteralKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/memberProperty.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/memberProperty.txt index 6ad5417fb94..5954682fab1 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/memberProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/memberProperty.txt @@ -5,7 +5,6 @@ public final class K { public final method setValue(p0: long): void } - public final class MemberPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/propertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/propertyAccessors.txt index ea04522e511..c2d381c4b7b 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/propertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/propertyAccessors.txt @@ -5,7 +5,6 @@ public final class A { public final method setBar(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PropertyAccessorsKt { private static @org.jetbrains.annotations.NotNull field foo: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/syntheticFields.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/syntheticFields.txt index 816ae8e4958..9545c24b917 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/syntheticFields.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/syntheticFields.txt @@ -4,7 +4,6 @@ public enum class A { public static method values(): A[] } - public final class SyntheticFieldsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/topLevelFunctionOtherFile.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/topLevelFunctionOtherFile.txt index c84a721f304..aef1faf7264 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/topLevelFunctionOtherFile.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/topLevelFunctionOtherFile.txt @@ -3,7 +3,6 @@ public final class MainKt { public final static method test1(): void } - public final class TestKt { public final static method test2(): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/annotationConstructorParameters.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/annotationConstructorParameters.txt index 0339b20eac7..0bae8f6ee39 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/annotationConstructorParameters.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/annotationConstructorParameters.txt @@ -11,13 +11,11 @@ public annotation class Anno { public abstract method zs(): Z[] } - public final class AnnotationConstructorParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method tmp(): java.lang.Class[] } - public enum class E { protected method (p0: java.lang.String, p1: int): void public static method valueOf(p0: java.lang.String): E diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/array.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/array.txt index 1feb6704a4e..8f47f6c7b81 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/array.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/array.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method baz(): java.lang.Object[] } - public final class ArrayKt { public final static @org.jetbrains.annotations.NotNull method bar(): java.util.List[] public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/constructors.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/constructors.txt index 7cc48839acc..77f856b66a6 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/constructors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/constructors.txt @@ -4,20 +4,17 @@ public final class A { public method (p0: double, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.Nullable p2: A): void } - public final class A/Inner { synthetic final field this$0: A inner class A/Inner public method (@java.lang.Synthetic p0: A, @org.jetbrains.annotations.NotNull p1: A.Nested): void } - public final static class A/Nested { inner class A/Nested public method (@org.jetbrains.annotations.NotNull p0: A): void } - public final class ConstructorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/genericArrayElementType.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/genericArrayElementType.txt index 8972cb15157..53cf740584f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/genericArrayElementType.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/genericArrayElementType.txt @@ -2,7 +2,6 @@ public final class Bar { public method (): void } - public final class GenericArrayElementTypeKt { public final static @org.jetbrains.annotations.NotNull method arrayOfInBar(): java.lang.Object[] public final static @org.jetbrains.annotations.NotNull method arrayOfInList(): java.lang.Object[] diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/innerGenericTypeArgument.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/innerGenericTypeArgument.txt index 95ec6c36f18..c6477f09bb7 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/innerGenericTypeArgument.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/innerGenericTypeArgument.txt @@ -3,13 +3,11 @@ public final class InnerGenericTypeArgumentKt { public final static @org.jetbrains.annotations.NotNull method foo(): Outer.Inner.Innermost } - public final class Outer { inner class Outer/Inner public method (): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner @@ -17,7 +15,6 @@ public final class Outer/Inner { public method (p0: Outer): void } - public final class Outer/Inner/Innermost { synthetic final field this$0: Outer.Inner inner class Outer/Inner diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/memberFunctions.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/memberFunctions.txt index f7ba38fd73a..fafd31fdb7a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/memberFunctions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/memberFunctions.txt @@ -3,12 +3,10 @@ public final class A { public final method foo(@org.jetbrains.annotations.Nullable p0: java.lang.Long): long } - public final class MemberFunctionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class O { public final static field INSTANCE: O private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/overrideAnyWithPrimitive.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/overrideAnyWithPrimitive.txt index ffec6dbea91..e8329f041a3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/overrideAnyWithPrimitive.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/overrideAnyWithPrimitive.txt @@ -5,12 +5,10 @@ public final class A { public synthetic method foo(): java.lang.Object } - public interface I { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Object } - public final class OverrideAnyWithPrimitiveKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypeArgument.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypeArgument.txt index daa97fd7f2d..a8ccbbd158e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypeArgument.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypeArgument.txt @@ -2,12 +2,10 @@ public final class Bar { public method (): void } - public final class Foo { public method (): void } - public final class ParameterizedTypeArgumentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method fooOfInBar(): Foo diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypes.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypes.txt index 1902153d03f..281975bfe15 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypes.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/parameterizedTypes.txt @@ -3,7 +3,6 @@ public final class A { public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void } - public final class O { public final static field INSTANCE: O private static field bar: java.util.List @@ -11,7 +10,6 @@ public final class O { private synthetic deprecated static @kotlin.jvm.JvmStatic method bar$annotations(): void } - public final class ParameterizedTypesKt { public final static method assertGenericType(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KType): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/propertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/propertyAccessors.txt index 85be7a99d1c..3da66e1cf07 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/propertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/propertyAccessors.txt @@ -3,7 +3,6 @@ public final class A { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class O { public final static field INSTANCE: O private static field bar: java.lang.String @@ -11,7 +10,6 @@ public final class O { private synthetic deprecated static @kotlin.jvm.JvmStatic method bar$annotations(): void } - public final class PropertyAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/supertypes.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/supertypes.txt index 06b6b924b73..9650526aa97 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/supertypes.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/supertypes.txt @@ -2,18 +2,14 @@ public final class A { public method (): void } - public interface Interface - public interface Interface2 - public class Klass { public method (): void } - public final class SupertypesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/mapping/types/typeParameters.txt b/compiler/testData/codegen/light-analysis/reflection/mapping/types/typeParameters.txt index 50bbf8d1ee2..f48077a7c11 100644 --- a/compiler/testData/codegen/light-analysis/reflection/mapping/types/typeParameters.txt +++ b/compiler/testData/codegen/light-analysis/reflection/mapping/types/typeParameters.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(p0: java.lang.Object): void } - public final class TypeParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/callableReferencesEqualToCallablesFromAPI.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/callableReferencesEqualToCallablesFromAPI.txt index 61dabb95e7b..0c3c42e4820 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/callableReferencesEqualToCallablesFromAPI.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/callableReferencesEqualToCallablesFromAPI.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String } - public final class CallableReferencesEqualToCallablesFromAPIKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkEqual(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/classToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/classToString.txt index 0d0cce94389..3d218aea230 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/classToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/classToString.txt @@ -5,19 +5,16 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void } - public final static class A/Nested { inner class A/Nested public method (): void } - public final class ClassToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionEqualsHashCode.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionEqualsHashCode.txt index bb27d50f11c..a52f8f09e23 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionEqualsHashCode.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionEqualsHashCode.txt @@ -3,13 +3,11 @@ public final class A { public final method mem(): void } - public final class B { public method (): void public final method mem(): void } - public final class FunctionEqualsHashCodeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkEqual(@org.jetbrains.annotations.NotNull p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionToString.txt index bddba200f9f..5b563000204 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/functionToString.txt @@ -3,7 +3,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method mem(): java.lang.String } - public final class test/FunctionToStringKt { public final static method assertToString(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.Object): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/memberExtensionToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/memberExtensionToString.txt index 6eaf7f8519c..1f0053be566 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/memberExtensionToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/memberExtensionToString.txt @@ -5,7 +5,6 @@ public final class A { public final method setId(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class MemberExtensionToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersEqualsHashCode.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersEqualsHashCode.txt index ffdd9fb9125..83507c42047 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersEqualsHashCode.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersEqualsHashCode.txt @@ -6,7 +6,6 @@ public final class A { public final method getBaz(): int } - public final class ParametersEqualsHashCodeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersToString.txt index c1c1242dd0a..af6b6414ae3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/parametersToString.txt @@ -3,7 +3,6 @@ public final class A { public final method bar(): void } - public final class ParametersToStringKt { public final static method baz(@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyEqualsHashCode.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyEqualsHashCode.txt index 9bfcc9b2157..d461f9f54f8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyEqualsHashCode.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyEqualsHashCode.txt @@ -5,7 +5,6 @@ public final class A { public final method setMem(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class B { private @org.jetbrains.annotations.NotNull field mem: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -13,7 +12,6 @@ public final class B { public final method setMem(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PropertyEqualsHashCodeKt { private static field top2: int private final static field top: int diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyToString.txt index 4bc1d70de63..12a39af0777 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/propertyToString.txt @@ -4,7 +4,6 @@ public final class test/A { public final @org.jetbrains.annotations.NotNull method getMem(): java.lang.String } - public final class test/B { private @org.jetbrains.annotations.NotNull field mem: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void @@ -12,7 +11,6 @@ public final class test/B { public final method setMem(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class test/PropertyToStringKt { private static field top2: int private final static field top: int diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeEqualsHashCode.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeEqualsHashCode.txt index fa9bcdcd047..df171b83a4e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeEqualsHashCode.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeEqualsHashCode.txt @@ -3,7 +3,6 @@ public final class A { public final method typeParam(p0: java.lang.Object): java.lang.Object } - public final class TypeEqualsHashCodeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method nullable(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersEqualsHashCode.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersEqualsHashCode.txt index 18332edd126..8a9320f041c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersEqualsHashCode.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersEqualsHashCode.txt @@ -2,23 +2,19 @@ public final class A { public method (): void } - public final class B { public method (): void } - public final class Fourple { public method (): void } - public final class Fun { public method (): void public final method foo(): java.lang.Object } - public final class TypeParametersEqualsHashCodeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersToString.txt index 6ed7ab01e04..05ba863815e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeParametersToString.txt @@ -2,15 +2,12 @@ public final class OneBound { public method (): void } - public final class SeveralBounds { public method (): void } - public final class TypeParametersToStringKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Variance diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToString.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToString.txt index 5b132fc7eba..270fcd3f4c4 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToString.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToString.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.Nullable method bar(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } - public final class TypeToStringKt { public final static method baz(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: A): void public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToStringInnerGeneric.txt b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToStringInnerGeneric.txt index 026d83565c7..fca6d50cb6a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToStringInnerGeneric.txt +++ b/compiler/testData/codegen/light-analysis/reflection/methodsFromAny/typeToStringInnerGeneric.txt @@ -3,7 +3,6 @@ public final class A { public method (): void } - public final class A/B { synthetic final field this$0: A inner class A/B @@ -11,7 +10,6 @@ public final class A/B { public method (p0: A): void } - public final class A/B/C { synthetic final field this$0: A.B inner class A/B @@ -19,7 +17,6 @@ public final class A/B/C { public method (p0: A.B): void } - public final class TypeToStringInnerGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): A.B.C diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/callableModality.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/callableModality.txt index 30155ae3bda..f163aef392c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/callableModality.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/callableModality.txt @@ -8,19 +8,16 @@ public abstract class AbstractClass { public abstract method setAbstractVar(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): void } - public final class CallableModalityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Interface { inner class Interface/DefaultImpls public abstract method abstractFun(): void public abstract method openFun(): void } - public final class Interface/DefaultImpls { inner class Interface/DefaultImpls public static method openFun(p0: Interface): void diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/callableVisibility.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/callableVisibility.txt index c4cccf1c5bf..3bed422b1c5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/callableVisibility.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/callableVisibility.txt @@ -2,7 +2,6 @@ public final class CallableVisibilityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Foo { private final @org.jetbrains.annotations.NotNull field internalVal: kotlin.Unit private final field privateToThisVal: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/classModality.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/classModality.txt index a3194c3746f..912f22623db 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/classModality.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/classModality.txt @@ -5,19 +5,16 @@ public abstract class AbstractClass { @java.lang.annotation.Retention public annotation class AnnotationClass - public final class ClassModalityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class EnumClass { protected method (p0: java.lang.String, p1: int): void public static method valueOf(p0: java.lang.String): EnumClass public static method values(): EnumClass[] } - public abstract enum class EnumClassWithAbstractMember { protected method (p0: java.lang.String, p1: int): void public abstract method foo(): void @@ -25,29 +22,24 @@ public abstract enum class EnumClassWithAbstractMember { public static method values(): EnumClassWithAbstractMember[] } - public final class FinalClass { public final static field Companion: FinalClass.Companion inner class FinalClass/Companion public method (): void } - public final static class FinalClass/Companion { inner class FinalClass/Companion private method (): void } - public interface Interface - public final class Object { public final static field INSTANCE: Object private method (): void } - public class OpenClass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/classVisibility.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/classVisibility.txt index bd1fd047db0..e45913bb62d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/classVisibility.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/classVisibility.txt @@ -2,29 +2,24 @@ public final class ClassVisibilityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class DefaultVisibilityClass { public method (): void } - public final class InternalClass { public method (): void } - final class PrivateClass { public method (): void } - public final class PublicClass { inner class PublicClass/ProtectedClass public method (): void public final @org.jetbrains.annotations.NotNull method getProtectedClass(): kotlin.reflect.KClass } - protected final static class PublicClass/ProtectedClass { inner class PublicClass/ProtectedClass public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/classes.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/classes.txt index e743dd7936e..4035f6f5fc2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/classes.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/classes.txt @@ -2,7 +2,6 @@ public final class ClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class S { public final static field Companion: S.Companion inner class S/Companion @@ -12,13 +11,11 @@ public abstract class S { private method (): void } - public final static class S/Companion { inner class S/Companion private method (): void } - public final static class S/DataClass { private final field x: int inner class S/DataClass @@ -32,14 +29,12 @@ public final static class S/DataClass { public method toString(): java.lang.String } - public final class S/InnerClass { synthetic final field this$0: S inner class S/InnerClass public method (p0: S): void } - public final class S/NonCompanionObject { public final static field INSTANCE: S.NonCompanionObject inner class S/NonCompanionObject diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/functions.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/functions.txt index 8400ba55301..261384a1e76 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/functions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/functions.txt @@ -3,7 +3,6 @@ public final class External { public final method external(): void } - public final class FunctionsKt { private final static @org.jetbrains.annotations.NotNull field externalGetter: kotlin.Unit public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/parameters.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/parameters.txt deleted file mode 100644 index a1feb373ff7..00000000000 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/parameters.txt +++ /dev/null @@ -1,4 +0,0 @@ -public final class ParametersKt { - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method foo(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p2: kotlin.Unit[]): void -} diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/properties.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/properties.txt index cfdeecf07b6..7117179555b 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/properties.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/properties.txt @@ -8,7 +8,6 @@ public final class A { public final method setNonLateinit(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): void } - public final class PropertiesKt { public final static @org.jetbrains.annotations.NotNull field const: java.lang.String private final static @org.jetbrains.annotations.NotNull field nonConst: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/modifiers/typeParameters.txt b/compiler/testData/codegen/light-analysis/reflection/modifiers/typeParameters.txt index c16b996d1d4..33c76b7692f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/modifiers/typeParameters.txt +++ b/compiler/testData/codegen/light-analysis/reflection/modifiers/typeParameters.txt @@ -4,7 +4,6 @@ public final class A { private final method reified(): java.lang.Object } - public final class TypeParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callFunctionsInMultifileClass.txt b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callFunctionsInMultifileClass.txt index 16a5e39bf32..de3a76e0c7c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callFunctionsInMultifileClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callFunctionsInMultifileClass.txt @@ -6,13 +6,11 @@ public final class test/Test { public final static method getZ(p0: int): int } - synthetic final class test/Test__Test1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getX(): int } - synthetic final class test/Test__Test2Kt { public final static method getY(): int public synthetic static method getZ$default(p0: int, p1: int, p2: java.lang.Object): int diff --git a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callPropertiesInMultifileClass.txt b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callPropertiesInMultifileClass.txt index b71e60ad586..75038b0b375 100644 --- a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callPropertiesInMultifileClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/callPropertiesInMultifileClass.txt @@ -6,7 +6,6 @@ public final class test/Test { public final static method setX(p0: int): void } - synthetic final class test/Test__Test1Kt { private static field x: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -14,7 +13,6 @@ synthetic final class test/Test__Test1Kt { public final static method setX(p0: int): void } - synthetic final class test/Test__Test2Kt { private final static field y: int public final static method getY(): int diff --git a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/javaFieldForVarAndConstVal.txt b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/javaFieldForVarAndConstVal.txt index 7c88f69f1fa..6f5a4b45306 100644 --- a/compiler/testData/codegen/light-analysis/reflection/multifileClasses/javaFieldForVarAndConstVal.txt +++ b/compiler/testData/codegen/light-analysis/reflection/multifileClasses/javaFieldForVarAndConstVal.txt @@ -9,7 +9,6 @@ public final class test/Test { public final static method testZ(): void } - synthetic final class test/Test___1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method testX(): void @@ -17,7 +16,6 @@ synthetic final class test/Test___1Kt { public final static method testZ(): void } - synthetic final class test/Test___2Kt { private final static @org.jetbrains.annotations.NotNull field refZ: kotlin.reflect.KProperty0 private static @org.jetbrains.annotations.NotNull field x: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/javaClass.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/javaClass.txt index 136301fbfdc..7e5ee2d91c2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/javaClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/javaClass.txt @@ -2,7 +2,6 @@ public final class JavaClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Klass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/callableReferences.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/callableReferences.txt index 8ab831522a5..da216406235 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/callableReferences.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/callableReferences.txt @@ -4,7 +4,6 @@ public final class CallableReferencesKt { public final static method checkToString(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KCallable, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class M { private final field bar: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/classReference.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/classReference.txt index 837a016ccfa..7a85a739579 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/classReference.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/classReference.txt @@ -3,7 +3,6 @@ public final class ClassReferenceKt { public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass): void } - public final class M { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyGetSetName.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyGetSetName.txt index bdc5734d1e2..772428fac9e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyGetSetName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyGetSetName.txt @@ -10,7 +10,6 @@ public final class Box { public method toString(): java.lang.String } - public final class PropertyGetSetNameKt { private static @org.jetbrains.annotations.NotNull field pr: Box public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyInstanceof.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyInstanceof.txt index 9a178be94e2..aab2e9a68d0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyInstanceof.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/propertyInstanceof.txt @@ -7,7 +7,6 @@ public final class A { public final method setMutable(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PropertyInstanceofKt { private static @org.jetbrains.annotations.NotNull field mutable: java.lang.String private final static @org.jetbrains.annotations.NotNull field readonly: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/reifiedTypeJavaClass.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/reifiedTypeJavaClass.txt index 780fbbc5867..9695c4462b9 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/reifiedTypeJavaClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/reifiedTypeJavaClass.txt @@ -2,7 +2,6 @@ public final class Klass { public method (): void } - public final class ReifiedTypeJavaClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method simpleName(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/simpleClassLiterals.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/simpleClassLiterals.txt index b7bf351105c..2d761c4a462 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/simpleClassLiterals.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/simpleClassLiterals.txt @@ -2,7 +2,6 @@ public final class Klass { public method (): void } - public final class SimpleClassLiteralsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/boundInnerClassConstructor.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/boundInnerClassConstructor.txt index 6dcccee657a..616995bbb0c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/boundInnerClassConstructor.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/boundInnerClassConstructor.txt @@ -3,7 +3,6 @@ public final class BoundInnerClassConstructorKt { public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KParameter, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class Outer { private final @org.jetbrains.annotations.NotNull field s1: java.lang.String inner class Outer/Inner @@ -11,7 +10,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getS1(): java.lang.String } - public final class Outer/Inner { private final @org.jetbrains.annotations.NotNull field result: java.lang.String private final @org.jetbrains.annotations.NotNull field s2: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/boundObjectMemberReferences.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/boundObjectMemberReferences.txt index 8b40f69f011..f8a3ced4a0f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/boundObjectMemberReferences.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/boundObjectMemberReferences.txt @@ -2,7 +2,6 @@ public final class BoundObjectMemberReferencesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Host { public final static field INSTANCE: Host private method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/boundReferences.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/boundReferences.txt index 27ce306e5b3..0217c8bad5f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/boundReferences.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/boundReferences.txt @@ -4,7 +4,6 @@ public final class BoundReferencesKt { public final static method extFun(@org.jetbrains.annotations.NotNull p0: C, p1: int): void } - public final class C { private @org.jetbrains.annotations.NotNull field bar: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/functionParameterNameAndIndex.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/functionParameterNameAndIndex.txt index c0a5cf89ef5..439717e85dd 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/functionParameterNameAndIndex.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/functionParameterNameAndIndex.txt @@ -6,7 +6,6 @@ public final class A { public final method mext(p0: double, p1: long): void } - public final class FunctionParameterNameAndIndexKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method checkParameters(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KFunction, @org.jetbrains.annotations.NotNull p1: java.util.List): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/instanceExtensionReceiverAndValueParameters.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/instanceExtensionReceiverAndValueParameters.txt index 13b5121eebb..8c6d7742777 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/instanceExtensionReceiverAndValueParameters.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/instanceExtensionReceiverAndValueParameters.txt @@ -3,7 +3,6 @@ public final class A { public final method memExt(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void } - public final class InstanceExtensionReceiverAndValueParametersKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method ext(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.Object[]): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/isMarkedNullable.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/isMarkedNullable.txt index db30f7ac8c9..590f4780ec6 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/isMarkedNullable.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/isMarkedNullable.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.String, p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: java.lang.Object, @org.jetbrains.annotations.Nullable p4: java.lang.Object): void } - public final class IsMarkedNullableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method ext(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/isOptional.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/isOptional.txt index 5b742eed3f4..7e52ff8a63f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/isOptional.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/isOptional.txt @@ -4,18 +4,15 @@ public class A { public method foo(p0: int, p1: int): void } - public final class B { public method (): void public method foo(p0: int, p1: int): void } - public final class C { public method (): void } - public final class IsOptionalKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method extFun(p0: int): void diff --git a/compiler/testData/codegen/light-analysis/reflection/parameters/kinds.txt b/compiler/testData/codegen/light-analysis/reflection/parameters/kinds.txt index 18a1bae8034..912d7f3a9ab 100644 --- a/compiler/testData/codegen/light-analysis/reflection/parameters/kinds.txt +++ b/compiler/testData/codegen/light-analysis/reflection/parameters/kinds.txt @@ -4,14 +4,12 @@ public final class A { public final method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class A/Inner { synthetic final field this$0: A inner class A/Inner public method (@java.lang.Synthetic p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class KindsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/accessorNames.txt b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/accessorNames.txt index 3540c86001b..4f2b94fd1cf 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/accessorNames.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/accessorNames.txt @@ -7,7 +7,6 @@ public final class A { public final method setQuux(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class AccessorNamesKt { private static @org.jetbrains.annotations.NotNull field foo: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberExtensions.txt b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberExtensions.txt index f7a27008261..c74df69fa59 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberExtensions.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberExtensions.txt @@ -7,7 +7,6 @@ public final class C { public final method setState(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MemberExtensionsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberPropertyAccessors.txt index 56e8bcfa824..ca79e09b8c9 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/accessors/memberPropertyAccessors.txt @@ -5,7 +5,6 @@ public final class C { public final method setState(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MemberPropertyAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/allVsDeclared.txt b/compiler/testData/codegen/light-analysis/reflection/properties/allVsDeclared.txt index 7257fcd76de..90d12587505 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/allVsDeclared.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/allVsDeclared.txt @@ -2,7 +2,6 @@ public final class AllVsDeclaredKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Sub { private final field c: double public method (): void @@ -10,7 +9,6 @@ public final class Sub { public final method getD(p0: char): char } - public class Super { private final field a: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/callPrivatePropertyFromGetProperties.txt b/compiler/testData/codegen/light-analysis/reflection/properties/callPrivatePropertyFromGetProperties.txt index d37ae3359ca..5e826402571 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/callPrivatePropertyFromGetProperties.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/callPrivatePropertyFromGetProperties.txt @@ -2,7 +2,6 @@ public final class CallPrivatePropertyFromGetPropertiesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class K { private final field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/declaredVsInheritedProperties.txt b/compiler/testData/codegen/light-analysis/reflection/properties/declaredVsInheritedProperties.txt index 73677d82e5e..1b08b2b4ab3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/declaredVsInheritedProperties.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/declaredVsInheritedProperties.txt @@ -7,14 +7,12 @@ public class K { public final @org.jetbrains.annotations.NotNull method getPublicMemberK(): java.lang.String } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.util.Collection, @org.jetbrains.annotations.NotNull p1: java.util.Set): void public final static @org.jetbrains.annotations.NotNull method names(@org.jetbrains.annotations.NotNull p0: java.util.Collection): java.util.Set } - public final class L { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/fakeOverridesInSubclass.txt b/compiler/testData/codegen/light-analysis/reflection/properties/fakeOverridesInSubclass.txt index 30edf60939e..4d3eb79e472 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/fakeOverridesInSubclass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/fakeOverridesInSubclass.txt @@ -2,12 +2,10 @@ public final class FakeOverridesInSubclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Sub { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class Super { private final @org.jetbrains.annotations.NotNull field r: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/genericClassLiteralPropertyReceiverIsStar.txt b/compiler/testData/codegen/light-analysis/reflection/properties/genericClassLiteralPropertyReceiverIsStar.txt index 51d154b9adf..f8929a43164 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/genericClassLiteralPropertyReceiverIsStar.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/genericClassLiteralPropertyReceiverIsStar.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class GenericClassLiteralPropertyReceiverIsStarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/genericOverriddenProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/genericOverriddenProperty.txt index 5f5edc7f3ff..a2024ffda40 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/genericOverriddenProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/genericOverriddenProperty.txt @@ -1,11 +1,9 @@ public interface A - public final class GenericOverriddenPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface H { public abstract @org.jetbrains.annotations.Nullable method getParent(): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/genericProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/genericProperty.txt index 3db53fbd34e..d9c97d43bc5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/genericProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/genericProperty.txt @@ -10,7 +10,6 @@ public final class Box { public method toString(): java.lang.String } - public final class GenericPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getExtensionPropertiesMutableVsReadonly.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getExtensionPropertiesMutableVsReadonly.txt index b468dc774db..86ec6ef9d86 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getExtensionPropertiesMutableVsReadonly.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getExtensionPropertiesMutableVsReadonly.txt @@ -5,7 +5,6 @@ public final class A { public final method setMutable(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void } - public final class GetExtensionPropertiesMutableVsReadonlyKt { private static @org.jetbrains.annotations.NotNull field storage: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getPropertiesMutableVsReadonly.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getPropertiesMutableVsReadonly.txt index 00b6d1d5d93..23995bca872 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getPropertiesMutableVsReadonly.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getPropertiesMutableVsReadonly.txt @@ -7,7 +7,6 @@ public final class A { public final method setMutable(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class GetPropertiesMutableVsReadonlyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/invokeKProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/invokeKProperty.txt index c7c6f04d313..6590fc4cb13 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/invokeKProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/invokeKProperty.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class InvokeKPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/javaPropertyInheritedInKotlin.txt b/compiler/testData/codegen/light-analysis/reflection/properties/javaPropertyInheritedInKotlin.txt index 5ddee8281f6..cbb4122cf18 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/javaPropertyInheritedInKotlin.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/javaPropertyInheritedInKotlin.txt @@ -2,7 +2,6 @@ public final class K { public method (): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/kotlinPropertyInheritedInJava.txt b/compiler/testData/codegen/light-analysis/reflection/properties/kotlinPropertyInheritedInJava.txt index b1154823bef..7af86496d81 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/kotlinPropertyInheritedInJava.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/kotlinPropertyInheritedInJava.txt @@ -6,7 +6,6 @@ public class K { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/memberAndMemberExtensionWithSameName.txt b/compiler/testData/codegen/light-analysis/reflection/properties/memberAndMemberExtensionWithSameName.txt index dacd63bd987..9e6224d4490 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/memberAndMemberExtensionWithSameName.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/memberAndMemberExtensionWithSameName.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getFoo(@org.jetbrains.annotations.NotNull p0: kotlin.Unit): java.lang.String } - public final class MemberAndMemberExtensionWithSameNameKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/noConflictOnKotlinGetterAndJavaField.txt b/compiler/testData/codegen/light-analysis/reflection/properties/noConflictOnKotlinGetterAndJavaField.txt index e3d6e749b89..a1683d5d448 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/noConflictOnKotlinGetterAndJavaField.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/noConflictOnKotlinGetterAndJavaField.txt @@ -3,7 +3,6 @@ public final class K { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/overrideKotlinPropertyByJavaMethod.txt b/compiler/testData/codegen/light-analysis/reflection/properties/overrideKotlinPropertyByJavaMethod.txt index 323a5688fb5..7b020105c49 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/overrideKotlinPropertyByJavaMethod.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/overrideKotlinPropertyByJavaMethod.txt @@ -3,7 +3,6 @@ public interface K { public abstract method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVal.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVal.txt index da27ec89197..087ee106095 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVal.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVal.txt @@ -2,7 +2,6 @@ public final class PrivateClassValKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Result { private final field value: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVar.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVar.txt index ca9aaccc3cc..5d5240881e2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVar.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privateClassVar.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method ref(): kotlin.reflect.KMutableProperty1 } - public final class PrivateClassVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privateFakeOverrideFromSuperclass.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privateFakeOverrideFromSuperclass.txt index 950d7c2017f..52eaeb81f7e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privateFakeOverrideFromSuperclass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privateFakeOverrideFromSuperclass.txt @@ -3,12 +3,10 @@ public class A { public method (p0: int): void } - public final class B { public method (): void } - public final class PrivateFakeOverrideFromSuperclassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privateJvmStaticVarInObject.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privateJvmStaticVarInObject.txt index d2a3d3218a3..07126130cef 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privateJvmStaticVarInObject.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privateJvmStaticVarInObject.txt @@ -5,7 +5,6 @@ public final class Obj { private synthetic deprecated static @kotlin.jvm.JvmStatic method result$annotations(): void } - public final class PrivateJvmStaticVarInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.txt index 590393b0186..327c55557b0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.txt @@ -3,7 +3,6 @@ public final class A { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class PrivatePropertyCallIsAccessibleOnAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/privateToThisAccessors.txt b/compiler/testData/codegen/light-analysis/reflection/properties/privateToThisAccessors.txt index 25e82b284d0..e39767d8f0b 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/privateToThisAccessors.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/privateToThisAccessors.txt @@ -5,7 +5,6 @@ public final class K { private final method setT(p0: java.lang.String): void } - public final class PrivateToThisAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/propertyOfNestedClassAndArrayType.txt b/compiler/testData/codegen/light-analysis/reflection/properties/propertyOfNestedClassAndArrayType.txt index 670f3ed92c8..a1ec75af6ee 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/propertyOfNestedClassAndArrayType.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/propertyOfNestedClassAndArrayType.txt @@ -9,7 +9,6 @@ public final class A { public final method setQ(@org.jetbrains.annotations.Nullable p0: A.B[][]): void } - public final static class A/B { private final @org.jetbrains.annotations.NotNull field result: java.lang.String inner class A/B @@ -17,7 +16,6 @@ public final static class A/B { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class PropertyOfNestedClassAndArrayTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/protectedClassVar.txt b/compiler/testData/codegen/light-analysis/reflection/properties/protectedClassVar.txt index 6b76c0e2c7e..b74bfd81c1f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/protectedClassVar.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/protectedClassVar.txt @@ -6,7 +6,6 @@ public final class A { protected final method setV(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class ProtectedClassVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/publicClassValAccessible.txt b/compiler/testData/codegen/light-analysis/reflection/properties/publicClassValAccessible.txt index 750a2aec27c..39808ad8be2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/publicClassValAccessible.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/publicClassValAccessible.txt @@ -2,7 +2,6 @@ public final class PublicClassValAccessibleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Result { private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/referenceToJavaFieldOfKotlinSubclass.txt b/compiler/testData/codegen/light-analysis/reflection/properties/referenceToJavaFieldOfKotlinSubclass.txt index ec503e497e6..ce39af223ca 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/referenceToJavaFieldOfKotlinSubclass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/referenceToJavaFieldOfKotlinSubclass.txt @@ -2,7 +2,6 @@ public class K { public method (): void } - public final class KKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/simpleGetProperties.txt b/compiler/testData/codegen/light-analysis/reflection/properties/simpleGetProperties.txt index f5547b67f88..a2a07d064fb 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/simpleGetProperties.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/simpleGetProperties.txt @@ -10,7 +10,6 @@ public final class A { public final method setAnyVar(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void } - public final class SimpleGetPropertiesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/supertypes/genericSubstitution.txt b/compiler/testData/codegen/light-analysis/reflection/supertypes/genericSubstitution.txt index 714d6c06286..aa98df0ddb5 100644 --- a/compiler/testData/codegen/light-analysis/reflection/supertypes/genericSubstitution.txt +++ b/compiler/testData/codegen/light-analysis/reflection/supertypes/genericSubstitution.txt @@ -1,18 +1,13 @@ public interface A - public interface B - public interface C - public interface D - public final class GenericSubstitutionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface StringList diff --git a/compiler/testData/codegen/light-analysis/reflection/supertypes/isSubclassOfIsSuperclassOf.txt b/compiler/testData/codegen/light-analysis/reflection/supertypes/isSubclassOfIsSuperclassOf.txt index afde0ff1137..e99ffb639f2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/supertypes/isSubclassOfIsSuperclassOf.txt +++ b/compiler/testData/codegen/light-analysis/reflection/supertypes/isSubclassOfIsSuperclassOf.txt @@ -2,16 +2,13 @@ public final class Bar { public method (): void } - public interface Interface - public final class IsSubclassOfIsSuperclassOfKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KClass, p2: boolean): void } - public class Klass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/supertypes/simpleSupertypes.txt b/compiler/testData/codegen/light-analysis/reflection/supertypes/simpleSupertypes.txt index 4ff4c7f813a..42b14bbc982 100644 --- a/compiler/testData/codegen/light-analysis/reflection/supertypes/simpleSupertypes.txt +++ b/compiler/testData/codegen/light-analysis/reflection/supertypes/simpleSupertypes.txt @@ -2,23 +2,18 @@ public final class ClassAndTwoInterfaces { public method (): void } - public interface Interface - public interface Interface2 - public final class OneClass { public method (): void } - public class Simple { public method (): void } - public final class SimpleSupertypesKt { public final static @org.jetbrains.annotations.NotNull method any(): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/typeParameters/declarationSiteVariance.txt b/compiler/testData/codegen/light-analysis/reflection/typeParameters/declarationSiteVariance.txt index 29eff6e2b6e..7a7b7c0b341 100644 --- a/compiler/testData/codegen/light-analysis/reflection/typeParameters/declarationSiteVariance.txt +++ b/compiler/testData/codegen/light-analysis/reflection/typeParameters/declarationSiteVariance.txt @@ -2,7 +2,6 @@ public final class DeclarationSiteVarianceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Triple { public method (): void public final method foo(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/reflection/typeParameters/typeParametersAndNames.txt b/compiler/testData/codegen/light-analysis/reflection/typeParameters/typeParametersAndNames.txt index ce34eba9def..30e9134d8d3 100644 --- a/compiler/testData/codegen/light-analysis/reflection/typeParameters/typeParametersAndNames.txt +++ b/compiler/testData/codegen/light-analysis/reflection/typeParameters/typeParametersAndNames.txt @@ -4,14 +4,12 @@ public final class C { public final method quux(): void } - public final class F { public method (): void public final method foo(): void public final method getBar(p0: java.lang.Object): java.lang.Object } - public final class TypeParametersAndNamesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public synthetic static method get$default(p0: kotlin.reflect.KClass, p1: java.lang.String, p2: int, p3: java.lang.Object): java.util.List diff --git a/compiler/testData/codegen/light-analysis/reflection/typeParameters/upperBounds.txt b/compiler/testData/codegen/light-analysis/reflection/typeParameters/upperBounds.txt index a3715c6fce3..579666b93f8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/typeParameters/upperBounds.txt +++ b/compiler/testData/codegen/light-analysis/reflection/typeParameters/upperBounds.txt @@ -2,38 +2,31 @@ public final class DefaultBound { public method (): void } - public final class FunctionTypeParameter { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.Cloneable } - public final class NotNullAnyBound { public method (): void } - public final class NullableAnyBound { public method (): void } - public final class OtherParameterBound { public method (): void } - public final class RecursiveGeneric { public method (): void } - public final class TwoBounds { public method (): void } - public final class UpperBoundsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method notNullAny(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/reflection/types/classifierIsClass.txt b/compiler/testData/codegen/light-analysis/reflection/types/classifierIsClass.txt index ff53a4c9535..f47281549b1 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/classifierIsClass.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/classifierIsClass.txt @@ -6,21 +6,18 @@ public final class ClassifierIsClassKt { public final static @org.jetbrains.annotations.NotNull method outer(): Outer } - public final class Outer { inner class Outer/Inner inner class Outer/Nested public method (): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner public method (p0: Outer): void } - public final static class Outer/Nested { inner class Outer/Nested public method (): void diff --git a/compiler/testData/codegen/light-analysis/reflection/types/classifierIsTypeParameter.txt b/compiler/testData/codegen/light-analysis/reflection/types/classifierIsTypeParameter.txt index 4d92e820160..a6d166b9727 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/classifierIsTypeParameter.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/classifierIsTypeParameter.txt @@ -4,7 +4,6 @@ public final class A { public final method foo(): java.lang.Object } - public final class ClassifierIsTypeParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/createType/equality.txt b/compiler/testData/codegen/light-analysis/reflection/types/createType/equality.txt index 2236c30c54b..f50b5580bed 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/createType/equality.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/createType/equality.txt @@ -2,7 +2,6 @@ public final class EqualityKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/createType/innerGeneric.txt b/compiler/testData/codegen/light-analysis/reflection/types/createType/innerGeneric.txt index ca66b5ff6b0..f0359e861dd 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/createType/innerGeneric.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/createType/innerGeneric.txt @@ -4,7 +4,6 @@ public final class A { public method (): void } - public final class A/B { synthetic final field this$0: A inner class A/B @@ -12,7 +11,6 @@ public final class A/B { public method (p0: A): void } - public final class A/B/C { synthetic final field this$0: A.B inner class A/B @@ -20,13 +18,11 @@ public final class A/B/C { public method (p0: A.B): void } - public final static class A/D { inner class A/D public method (): void } - public final class InnerGenericKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): A.B.C diff --git a/compiler/testData/codegen/light-analysis/reflection/types/createType/simpleCreateType.txt b/compiler/testData/codegen/light-analysis/reflection/types/createType/simpleCreateType.txt index 6bafe93edbb..f0c81568ea8 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/createType/simpleCreateType.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/createType/simpleCreateType.txt @@ -2,12 +2,10 @@ public final class Bar { public method (): void } - public final class Foo { public method (): void } - public final class SimpleCreateTypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/createType/typeParameter.txt b/compiler/testData/codegen/light-analysis/reflection/types/createType/typeParameter.txt index 9436509d3f6..392f645026c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/createType/typeParameter.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/createType/typeParameter.txt @@ -4,7 +4,6 @@ public final class Foo { public final @org.jetbrains.annotations.Nullable method nullable(): java.lang.Object } - public final class TypeParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/createType/wrongNumberOfArguments.txt b/compiler/testData/codegen/light-analysis/reflection/types/createType/wrongNumberOfArguments.txt index dd141a980ef..1867d716d0e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/createType/wrongNumberOfArguments.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/createType/wrongNumberOfArguments.txt @@ -4,20 +4,17 @@ public final class Outer { public method (): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner public method (p0: Outer): void } - public final static class Outer/Nested { inner class Outer/Nested public method (): void } - public final class WrongNumberOfArgumentsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClassifier, @org.jetbrains.annotations.NotNull p1: java.util.List): void diff --git a/compiler/testData/codegen/light-analysis/reflection/types/innerGenericArguments.txt b/compiler/testData/codegen/light-analysis/reflection/types/innerGenericArguments.txt index dbe5345c108..b24d7041936 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/innerGenericArguments.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/innerGenericArguments.txt @@ -3,13 +3,11 @@ public final class InnerGenericArgumentsKt { public final static @org.jetbrains.annotations.NotNull method foo(): Outer.Inner.Innermost } - public final class Outer { inner class Outer/Inner public method (): void } - public final class Outer/Inner { synthetic final field this$0: Outer inner class Outer/Inner @@ -17,7 +15,6 @@ public final class Outer/Inner { public method (p0: Outer): void } - public final class Outer/Inner/Innermost { synthetic final field this$0: Outer.Inner inner class Outer/Inner diff --git a/compiler/testData/codegen/light-analysis/reflection/types/jvmErasureOfTypeParameter.txt b/compiler/testData/codegen/light-analysis/reflection/types/jvmErasureOfTypeParameter.txt index 7d5779f6d51..f2921a0280e 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/jvmErasureOfTypeParameter.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/jvmErasureOfTypeParameter.txt @@ -14,13 +14,11 @@ public final class A { public final @org.jetbrains.annotations.NotNull method twoInterfaces2(): java.lang.Comparable } - public final class JvmErasureOfTypeParameterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): kotlin.reflect.KClass } - public class O { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleGenericTypes.txt b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleGenericTypes.txt index 53f72214578..eba4734fdf4 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleGenericTypes.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleGenericTypes.txt @@ -2,12 +2,10 @@ public final class A { public method (): void } - public class G { public method (): void } - public final class SimpleGenericTypesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method gOfInt(): G diff --git a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleSubtypeSupertype.txt b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleSubtypeSupertype.txt index b3a1759de10..577db4ef2db 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleSubtypeSupertype.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/simpleSubtypeSupertype.txt @@ -2,7 +2,6 @@ public class O { public method (): void } - public final class SimpleSubtypeSupertypeKt { public final static @org.jetbrains.annotations.NotNull method any(): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -16,7 +15,6 @@ public final class SimpleSubtypeSupertypeKt { public final static @org.jetbrains.annotations.NotNull method string(): java.lang.String } - public final class X { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/typeProjection.txt b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/typeProjection.txt index 858036e5e28..0c7810f727d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/subtyping/typeProjection.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/subtyping/typeProjection.txt @@ -2,7 +2,6 @@ public final class G { public method (): void } - public final class TypeProjectionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method inNumber(): G diff --git a/compiler/testData/codegen/light-analysis/reflection/types/typeArguments.txt b/compiler/testData/codegen/light-analysis/reflection/types/typeArguments.txt index db741dd237a..b61227320c0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/typeArguments.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/typeArguments.txt @@ -2,7 +2,6 @@ public final class Fourple { public method (): void } - public final class TypeArgumentsKt { public final static @org.jetbrains.annotations.NotNull method array(): java.lang.Number[] public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/types/useSiteVariance.txt b/compiler/testData/codegen/light-analysis/reflection/types/useSiteVariance.txt index 77aa9dbceae..f89fe299a65 100644 --- a/compiler/testData/codegen/light-analysis/reflection/types/useSiteVariance.txt +++ b/compiler/testData/codegen/light-analysis/reflection/types/useSiteVariance.txt @@ -2,7 +2,6 @@ public final class Fourple { public method (): void } - public final class UseSiteVarianceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): Fourple diff --git a/compiler/testData/codegen/light-analysis/regressions/Kt1149.txt b/compiler/testData/codegen/light-analysis/regressions/Kt1149.txt index bc9b414bb74..c6d84605245 100644 --- a/compiler/testData/codegen/light-analysis/regressions/Kt1149.txt +++ b/compiler/testData/codegen/light-analysis/regressions/Kt1149.txt @@ -2,7 +2,6 @@ public final class test/regressions/kt1149/Kt1149Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface test/regressions/kt1149/SomeTrait { public abstract method foo(): void } diff --git a/compiler/testData/codegen/light-analysis/regressions/Kt1619Test.txt b/compiler/testData/codegen/light-analysis/regressions/Kt1619Test.txt index f4ad50d2165..c91f0b048dc 100644 --- a/compiler/testData/codegen/light-analysis/regressions/Kt1619Test.txt +++ b/compiler/testData/codegen/light-analysis/regressions/Kt1619Test.txt @@ -4,7 +4,6 @@ public final class regressions/Kt1619Test { public final method testCollectionNotNullCanBeUsedForNullables(): int } - public final class regressions/Kt1619TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant.txt b/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant.txt index 190d04701e0..6ecc4d34baa 100644 --- a/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant.txt +++ b/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant.txt @@ -2,17 +2,14 @@ public final class A { public method (): void } - public final class CommonSupertypeContravariantKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foobar(@org.jetbrains.annotations.NotNull p0: En): In public final static method select(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } - public final class En { public method (): void } - public interface In diff --git a/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant2.txt b/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant2.txt index b1290a56bac..9e29cdb5c4a 100644 --- a/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant2.txt +++ b/compiler/testData/codegen/light-analysis/regressions/commonSupertypeContravariant2.txt @@ -2,17 +2,14 @@ public final class A { public method (): void } - public final class B { public method (): void } - public final class CommonSupertypeContravariant2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foobar(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.NotNull p1: B): In public final static method select(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } - public interface In diff --git a/compiler/testData/codegen/light-analysis/regressions/getGenericInterfaces.txt b/compiler/testData/codegen/light-analysis/regressions/getGenericInterfaces.txt index 7ed786d016e..b3dcdaaa4a5 100644 --- a/compiler/testData/codegen/light-analysis/regressions/getGenericInterfaces.txt +++ b/compiler/testData/codegen/light-analysis/regressions/getGenericInterfaces.txt @@ -4,19 +4,16 @@ public final class ClassWithGenericSuperInterface { public synthetic method compare(p0: java.lang.Object, p1: java.lang.Object): int } - public final class ClassWithNonGenericSuperInterface { public method (): void public @org.jetbrains.annotations.NotNull method clone(): java.lang.Object } - public final class GetGenericInterfacesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void } - public final class SimpleClass { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/regressions/internalTopLevelOtherPackage.txt b/compiler/testData/codegen/light-analysis/regressions/internalTopLevelOtherPackage.txt index f8ad4215b5c..97992d24740 100644 --- a/compiler/testData/codegen/light-analysis/regressions/internalTopLevelOtherPackage.txt +++ b/compiler/testData/codegen/light-analysis/regressions/internalTopLevelOtherPackage.txt @@ -2,7 +2,6 @@ public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/_2Kt { private final static @org.jetbrains.annotations.NotNull field x: java.lang.String public final static @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/regressions/kt10143.txt b/compiler/testData/codegen/light-analysis/regressions/kt10143.txt index d1f55325e11..2f38a5a93a4 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt10143.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt10143.txt @@ -5,7 +5,6 @@ public class another/Outer { protected final @org.jetbrains.annotations.NotNull method my(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): another.Outer.My } - protected final static class another/Outer/My { private @org.jetbrains.annotations.Nullable field stage: another.Outer.Stage inner class another/Outer/My @@ -17,7 +16,6 @@ protected final static class another/Outer/My { public final method setStage(@org.jetbrains.annotations.Nullable p0: another.Outer.Stage): void } - protected final static class another/Outer/Stage { private final @org.jetbrains.annotations.NotNull field run: kotlin.jvm.functions.Function0 inner class another/Outer/Stage @@ -25,12 +23,10 @@ protected final static class another/Outer/Stage { public final @org.jetbrains.annotations.NotNull method getRun(): kotlin.jvm.functions.Function0 } - public final class other/Derived { public method (): void } - public final class other/MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt10934.txt b/compiler/testData/codegen/light-analysis/regressions/kt10934.txt index 32ffc9e1c8e..ba73c64ad5d 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt10934.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt10934.txt @@ -2,7 +2,6 @@ public final class Kt10934Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Parser { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function1 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void @@ -11,14 +10,12 @@ public final class Parser { public final @org.jetbrains.annotations.NotNull method mapJoin(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): Parser } - public abstract class Result { inner class Result/ParseError inner class Result/Value private method (): void } - public final static class Result/ParseError { private final @org.jetbrains.annotations.Nullable field child: Result.ParseError private final @org.jetbrains.annotations.NotNull field productionLabel: java.lang.String @@ -30,7 +27,6 @@ public final static class Result/ParseError { public final method getRest(): java.lang.Object } - public final static class Result/Value { private final field rest: java.lang.Object private final field value: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1202.txt b/compiler/testData/codegen/light-analysis/regressions/kt1202.txt index 6c4c25c1939..4ba9455664e 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1202.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1202.txt @@ -3,15 +3,12 @@ public final class testeval/EOF { private method (): void } - public final class testeval/Error { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface testeval/Expression - public final class testeval/Failure { private final @org.jetbrains.annotations.NotNull field message: java.lang.String private final field success: boolean @@ -23,7 +20,6 @@ public final class testeval/Failure { public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Void } - public final class testeval/Kt1202Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method eval(@org.jetbrains.annotations.NotNull p0: testeval.Expression): int @@ -34,13 +30,11 @@ public final class testeval/Kt1202Kt { public final static @org.jetbrains.annotations.NotNull method tokenize(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.util.Deque } - public final class testeval/LPAR { public final static field INSTANCE: testeval.LPAR private method (): void } - public final class testeval/Mult { private final @org.jetbrains.annotations.NotNull field left: testeval.Expression private final @org.jetbrains.annotations.NotNull field right: testeval.Expression @@ -49,37 +43,31 @@ public final class testeval/Mult { public final @org.jetbrains.annotations.NotNull method getRight(): testeval.Expression } - public final class testeval/Num { private final field value: int public method (p0: int): void public final method getValue(): int } - public final class testeval/Number { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class testeval/PLUS { public final static field INSTANCE: testeval.PLUS private method (): void } - public interface testeval/ParseResult { public abstract method getSuccess(): boolean public abstract method getValue(): java.lang.Object } - public final class testeval/RPAR { public final static field INSTANCE: testeval.RPAR private method (): void } - public final class testeval/Success { private final field success: boolean private final field value: java.lang.Object @@ -88,7 +76,6 @@ public final class testeval/Success { public method getValue(): java.lang.Object } - public final class testeval/Sum { private final @org.jetbrains.annotations.NotNull field left: testeval.Expression private final @org.jetbrains.annotations.NotNull field right: testeval.Expression @@ -97,13 +84,11 @@ public final class testeval/Sum { public final @org.jetbrains.annotations.NotNull method getRight(): testeval.Expression } - public final class testeval/TIMES { public final static field INSTANCE: testeval.TIMES private method (): void } - public class testeval/Token { private final @org.jetbrains.annotations.NotNull field text: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/regressions/kt13381.txt b/compiler/testData/codegen/light-analysis/regressions/kt13381.txt index 533f91653a2..8f694c5bee7 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt13381.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt13381.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls private static method bar(p0: A): java.lang.String @@ -11,24 +10,20 @@ public final class A/DefaultImpls { private static method getLog(p0: A): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.lang.String } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Kt13381Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1406.txt b/compiler/testData/codegen/light-analysis/regressions/kt1406.txt index 51c0518a9ea..c52cb587f94 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1406.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1406.txt @@ -4,12 +4,10 @@ public final class pack/C { private final method name(@org.jetbrains.annotations.NotNull p0: pack.Item): java.lang.String } - public final class pack/Item { public method (): void } - public final class pack/Kt1406Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt14447.txt b/compiler/testData/codegen/light-analysis/regressions/kt14447.txt index 22ca1331fad..100e896407d 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt14447.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt14447.txt @@ -3,7 +3,6 @@ public final class ImpulsMigration { public final method migrate(p0: long): void } - public final class Kt14447Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1515.txt b/compiler/testData/codegen/light-analysis/regressions/kt1515.txt index 93682a70245..66af4f58e43 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1515.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1515.txt @@ -2,7 +2,6 @@ public final class otherpackage/_2Kt { public final static method fromOtherPackage(): boolean } - public final class thispackage/_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method localUse(): boolean diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1528.txt b/compiler/testData/codegen/light-analysis/regressions/kt1528.txt index f42f3835daa..f4b699a9e91 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1528.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1528.txt @@ -2,7 +2,6 @@ public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class _2Kt { private final static field a: java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1779.txt b/compiler/testData/codegen/light-analysis/regressions/kt1779.txt index 401270de133..2a652114db5 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1779.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1779.txt @@ -2,7 +2,6 @@ public final class Kt1779Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class MyIterator { private field i: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1800.txt b/compiler/testData/codegen/light-analysis/regressions/kt1800.txt index 05318d7d36b..5b964b6d4d5 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1800.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1800.txt @@ -3,7 +3,6 @@ public final class i/Kt1800Kt { public final static @org.jetbrains.annotations.Nullable method testMin(@org.jetbrains.annotations.NotNull p0: java.util.Collection): java.lang.Comparable } - public final class i/User { private final field age: int private final @org.jetbrains.annotations.NotNull field firstName: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1845.txt b/compiler/testData/codegen/light-analysis/regressions/kt1845.txt index 2a85a94df7b..ef2b62cb0eb 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1845.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1845.txt @@ -5,7 +5,6 @@ public final class _1Kt { public final static method setV1(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class _2Kt { private static @org.jetbrains.annotations.NotNull field v2: java.lang.String public final static @org.jetbrains.annotations.NotNull method getV2(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/regressions/kt1932.txt b/compiler/testData/codegen/light-analysis/regressions/kt1932.txt index f828c4b02a0..3283838267c 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt1932.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt1932.txt @@ -2,7 +2,6 @@ public final class Kt1932Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final @foo method hello(@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/regressions/kt2060.txt b/compiler/testData/codegen/light-analysis/regressions/kt2060.txt index aa71894b8e8..ea09d1e4d1e 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt2060.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt2060.txt @@ -3,12 +3,10 @@ public final class HelloServer { public method start(): void } - public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class testing/ClassWithInternals { private field some: int private field someGetter: int diff --git a/compiler/testData/codegen/light-analysis/regressions/kt2210.txt b/compiler/testData/codegen/light-analysis/regressions/kt2210.txt index 3d4c6abade7..4bacf9d233a 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt2210.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt2210.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.Object[][] } - public final class Kt2210Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt2509.txt b/compiler/testData/codegen/light-analysis/regressions/kt2509.txt index 1dc26e64296..96d31892e9d 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt2509.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt2509.txt @@ -5,14 +5,12 @@ public final class A { public method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.Integer[]): void } - public abstract class B { public method (): void public abstract @org.jetbrains.annotations.NotNull method getFoo(): java.lang.Integer[] public abstract method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.Integer[]): void } - public final class Kt2509Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt3421.txt b/compiler/testData/codegen/light-analysis/regressions/kt3421.txt index 2c7a645236a..4807fe4ce72 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt3421.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt3421.txt @@ -5,7 +5,6 @@ public final class Globals { public final @org.jetbrains.annotations.NotNull method get(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: boolean): java.lang.String } - public final class Kt3421Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt3587.txt b/compiler/testData/codegen/light-analysis/regressions/kt3587.txt index d6ab511289a..7dc21c7b0b6 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt3587.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt3587.txt @@ -2,12 +2,10 @@ public final class Kt3587Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class LightVariable { public method (): void } - public class Variable { private final @org.jetbrains.annotations.NotNull field lightVar: LightVariable public method (): void diff --git a/compiler/testData/codegen/light-analysis/regressions/kt3850.txt b/compiler/testData/codegen/light-analysis/regressions/kt3850.txt index 9be482de60d..4d90a0ea19f 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt3850.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt3850.txt @@ -2,7 +2,6 @@ public final class Kt3850Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - final class One { private final @org.jetbrains.annotations.NotNull field a1: One$a1$1[] public method (): void diff --git a/compiler/testData/codegen/light-analysis/regressions/kt3903.txt b/compiler/testData/codegen/light-analysis/regressions/kt3903.txt index eb6f7c32850..8aa67da4ac0 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt3903.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt3903.txt @@ -3,7 +3,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class Kt3903Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt4142.txt b/compiler/testData/codegen/light-analysis/regressions/kt4142.txt index 63188b0f4d9..61a4619a054 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt4142.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt4142.txt @@ -2,18 +2,15 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public class B { public method (): void public final @org.jetbrains.annotations.NotNull method getName(): java.lang.String } - public final class C { public method (): void } - public final class Kt4142Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt4262.txt b/compiler/testData/codegen/light-analysis/regressions/kt4262.txt index d45dbb0c6ce..438d377027f 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt4262.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt4262.txt @@ -3,7 +3,6 @@ public final class Kt4262Kt { public final static @org.jetbrains.annotations.NotNull method toEnum(p0: byte, @org.jetbrains.annotations.NotNull p1: java.lang.Class): java.lang.Enum } - public enum class Letters { public final static field A: Letters public final static field B: Letters diff --git a/compiler/testData/codegen/light-analysis/regressions/kt4281.txt b/compiler/testData/codegen/light-analysis/regressions/kt4281.txt index 51e2ee32a90..78d0f173c4f 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt4281.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt4281.txt @@ -3,12 +3,10 @@ public abstract class C { public final method test(p0: int): void } - public final class D { public method (): void } - public final class Kt4281Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt528.txt b/compiler/testData/codegen/light-analysis/regressions/kt528.txt index 5ddf6861b8d..0331b54bc36 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt528.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt528.txt @@ -5,7 +5,6 @@ public final class mask/Kt528Kt { public final static method sum(@org.jetbrains.annotations.NotNull p0: java.util.LinkedList, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): int } - public final class mask/Luhny { private final @org.jetbrains.annotations.NotNull field buffer: java.util.LinkedList private final @org.jetbrains.annotations.NotNull field digits: java.util.LinkedList diff --git a/compiler/testData/codegen/light-analysis/regressions/kt529.txt b/compiler/testData/codegen/light-analysis/regressions/kt529.txt index 55e6ab9bb72..a3a659f5804 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt529.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt529.txt @@ -4,7 +4,6 @@ public final class mask/Kt529Kt { public final static method sum(@org.jetbrains.annotations.NotNull p0: java.lang.Iterable, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): int } - public final class mask/Luhny { private final field buffer: java.util.ArrayDeque private final field digits: java.util.ArrayDeque diff --git a/compiler/testData/codegen/light-analysis/regressions/kt533.txt b/compiler/testData/codegen/light-analysis/regressions/kt533.txt index 86c421dc0c8..0ab8868254d 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt533.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt533.txt @@ -5,7 +5,6 @@ public final class mask/Kt533Kt { public final static method sum(@org.jetbrains.annotations.NotNull p0: java.util.LinkedList, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): int } - public final class mask/Luhny { private final @org.jetbrains.annotations.NotNull field buffer: java.util.LinkedList private final @org.jetbrains.annotations.NotNull field digits: java.util.LinkedList diff --git a/compiler/testData/codegen/light-analysis/regressions/kt5395.txt b/compiler/testData/codegen/light-analysis/regressions/kt5395.txt index df648496e2c..ad64fdcd3c4 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt5395.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt5395.txt @@ -6,14 +6,12 @@ public final class D { public method (): void } - public final static class D/Companion { inner class D/Companion private method (): void protected final @org.jetbrains.annotations.NotNull method getF(): java.lang.String } - public final class D/E { synthetic final field this$0: D inner class D/E @@ -21,7 +19,6 @@ public final class D/E { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Kt5395Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt5445.txt b/compiler/testData/codegen/light-analysis/regressions/kt5445.txt index 766ab257b15..e87e2e3ca49 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt5445.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt5445.txt @@ -3,13 +3,11 @@ public class test/A { public method (): void } - public final class test2/B { public method (): void public final @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.String } - public final class test2/_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt5445_2.txt b/compiler/testData/codegen/light-analysis/regressions/kt5445_2.txt index 24dad04de6e..324ed63cfd5 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt5445_2.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt5445_2.txt @@ -3,13 +3,11 @@ public class test/A { public method (): void } - public final class test2/C { public method (): void public final @org.jetbrains.annotations.NotNull method a(): java.lang.String } - public final class test2/_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt6153.txt b/compiler/testData/codegen/light-analysis/regressions/kt6153.txt index 56725bd0f50..b9d4a66a4c1 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt6153.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt6153.txt @@ -6,7 +6,6 @@ public final class Bug { public final @org.jetbrains.annotations.NotNull method title(p0: int): java.lang.String } - public final class Kt6153Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt6434.txt b/compiler/testData/codegen/light-analysis/regressions/kt6434.txt index 3d1a43b1939..320e045cb23 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt6434.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt6434.txt @@ -7,7 +7,6 @@ public final class C { private final method loadNormalizedNums(): java.util.Map } - public enum class E { public final static field VALUE2: E public final static field VALUE: E @@ -16,7 +15,6 @@ public enum class E { public static method values(): E[] } - public final class Kt6434Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/regressions/kt6485.txt b/compiler/testData/codegen/light-analysis/regressions/kt6485.txt index 3539b5acd6e..db844427892 100644 --- a/compiler/testData/codegen/light-analysis/regressions/kt6485.txt +++ b/compiler/testData/codegen/light-analysis/regressions/kt6485.txt @@ -3,7 +3,6 @@ public final class Kt6485Kt { private final static method typeLiteral(): TypeLiteral } - public class TypeLiteral { public method (): void public final @org.jetbrains.annotations.NotNull method getType(): java.lang.reflect.Type diff --git a/compiler/testData/codegen/light-analysis/regressions/nestedIntersection.txt b/compiler/testData/codegen/light-analysis/regressions/nestedIntersection.txt index 84e381df5c9..d0cec223476 100644 --- a/compiler/testData/codegen/light-analysis/regressions/nestedIntersection.txt +++ b/compiler/testData/codegen/light-analysis/regressions/nestedIntersection.txt @@ -2,15 +2,12 @@ public class A { public method (): void } - public class B { public method (): void } - public interface In - public final class NestedIntersectionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/regressions/objectCaptureOuterConstructorProperty.txt b/compiler/testData/codegen/light-analysis/regressions/objectCaptureOuterConstructorProperty.txt index 0e1e0ef4d70..cb6541e2d77 100644 --- a/compiler/testData/codegen/light-analysis/regressions/objectCaptureOuterConstructorProperty.txt +++ b/compiler/testData/codegen/light-analysis/regressions/objectCaptureOuterConstructorProperty.txt @@ -4,17 +4,14 @@ public final class EmptyStream { public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class ObjectCaptureOuterConstructorPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Stream { public abstract @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } - public final class ZippingStream { private final @org.jetbrains.annotations.NotNull field stream1: Stream private final @org.jetbrains.annotations.NotNull field stream2: Stream diff --git a/compiler/testData/codegen/light-analysis/reified/DIExample.txt b/compiler/testData/codegen/light-analysis/reified/DIExample.txt index a122921a408..39ee645cce5 100644 --- a/compiler/testData/codegen/light-analysis/reified/DIExample.txt +++ b/compiler/testData/codegen/light-analysis/reified/DIExample.txt @@ -10,7 +10,6 @@ public final class DIExampleKt { public final static @org.jetbrains.annotations.NotNull method getX2(): java.lang.String } - public final class Project { public method (): void public final method getInstance(@org.jetbrains.annotations.NotNull p0: java.lang.Class): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/reified/anonymousObject.txt b/compiler/testData/codegen/light-analysis/reified/anonymousObject.txt index 4f9757515e9..eb62d23bc81 100644 --- a/compiler/testData/codegen/light-analysis/reified/anonymousObject.txt +++ b/compiler/testData/codegen/light-analysis/reified/anonymousObject.txt @@ -3,7 +3,6 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class AnonymousObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method foo(): A diff --git a/compiler/testData/codegen/light-analysis/reified/anonymousObjectNoPropagate.txt b/compiler/testData/codegen/light-analysis/reified/anonymousObjectNoPropagate.txt index cb2f0e96146..a598cfeb2cb 100644 --- a/compiler/testData/codegen/light-analysis/reified/anonymousObjectNoPropagate.txt +++ b/compiler/testData/codegen/light-analysis/reified/anonymousObjectNoPropagate.txt @@ -4,7 +4,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method f3(): java.lang.String } - public final class AnonymousObjectNoPropagateKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method doWork(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reified/anonymousObjectReifiedSupertype.txt b/compiler/testData/codegen/light-analysis/reified/anonymousObjectReifiedSupertype.txt index 8122d90a502..3623259425b 100644 --- a/compiler/testData/codegen/light-analysis/reified/anonymousObjectReifiedSupertype.txt +++ b/compiler/testData/codegen/light-analysis/reified/anonymousObjectReifiedSupertype.txt @@ -3,7 +3,6 @@ public abstract class A { public abstract @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class AnonymousObjectReifiedSupertypeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method foo(): A diff --git a/compiler/testData/codegen/light-analysis/reified/approximateCapturedTypes.txt b/compiler/testData/codegen/light-analysis/reified/approximateCapturedTypes.txt index d4096a3a43e..b159672e4fa 100644 --- a/compiler/testData/codegen/light-analysis/reified/approximateCapturedTypes.txt +++ b/compiler/testData/codegen/light-analysis/reified/approximateCapturedTypes.txt @@ -2,21 +2,17 @@ public final class ApproximateCapturedTypesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Inv { public method (): void } - public final class Obs { public method (): void private final method lift(p0: Operator): Inv } - public interface Operator - public final class SwOperator { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/reified/innerAnonymousObject.txt b/compiler/testData/codegen/light-analysis/reified/innerAnonymousObject.txt index 72feb12001a..4d6ea726573 100644 --- a/compiler/testData/codegen/light-analysis/reified/innerAnonymousObject.txt +++ b/compiler/testData/codegen/light-analysis/reified/innerAnonymousObject.txt @@ -4,13 +4,11 @@ public abstract class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public abstract class G { public method (): void public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.Object } - public final class InnerAnonymousObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method foo(): G diff --git a/compiler/testData/codegen/light-analysis/reified/nestedReifiedSignature.txt b/compiler/testData/codegen/light-analysis/reified/nestedReifiedSignature.txt index 9ef0e7f65b2..ee075135a1f 100644 --- a/compiler/testData/codegen/light-analysis/reified/nestedReifiedSignature.txt +++ b/compiler/testData/codegen/light-analysis/reified/nestedReifiedSignature.txt @@ -2,7 +2,6 @@ public class A { public method (): void } - public final class NestedReifiedSignatureKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method foo(): A[] diff --git a/compiler/testData/codegen/light-analysis/reified/recursiveInnerAnonymousObject.txt b/compiler/testData/codegen/light-analysis/reified/recursiveInnerAnonymousObject.txt index 1eabd8c4435..a682a48955c 100644 --- a/compiler/testData/codegen/light-analysis/reified/recursiveInnerAnonymousObject.txt +++ b/compiler/testData/codegen/light-analysis/reified/recursiveInnerAnonymousObject.txt @@ -4,13 +4,11 @@ public abstract class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public abstract class G { public method (): void public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.Object } - public final class RecursiveInnerAnonymousObjectKt { private final static method baz(): G public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObject.txt b/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObject.txt index ed451054a85..3faa2dff010 100644 --- a/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObject.txt +++ b/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObject.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method g(): java.lang.String } - public final class ReifiedInlineFunOfObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObjectWithinReified.txt b/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObjectWithinReified.txt index ea3862a25cd..5041eac0518 100644 --- a/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObjectWithinReified.txt +++ b/compiler/testData/codegen/light-analysis/reified/reifiedInlineFunOfObjectWithinReified.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method g(): java.lang.String } - public final class ReifiedInlineFunOfObjectWithinReifiedKt { private final static method AFactory(): A public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reified/reifiedInlineIntoNonInlineableLambda.txt b/compiler/testData/codegen/light-analysis/reified/reifiedInlineIntoNonInlineableLambda.txt index 21398b9deff..5cd486e3f40 100644 --- a/compiler/testData/codegen/light-analysis/reified/reifiedInlineIntoNonInlineableLambda.txt +++ b/compiler/testData/codegen/light-analysis/reified/reifiedInlineIntoNonInlineableLambda.txt @@ -3,7 +3,6 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method g(): java.lang.String } - public final class ReifiedInlineIntoNonInlineableLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method className(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/safeCall/kt1572.txt b/compiler/testData/codegen/light-analysis/safeCall/kt1572.txt index b66a8a5eadc..3820f717ff5 100644 --- a/compiler/testData/codegen/light-analysis/safeCall/kt1572.txt +++ b/compiler/testData/codegen/light-analysis/safeCall/kt1572.txt @@ -4,7 +4,6 @@ public final class A { public final method getT(): int } - public final class Kt1572Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method testKt1572(): boolean diff --git a/compiler/testData/codegen/light-analysis/safeCall/kt232.txt b/compiler/testData/codegen/light-analysis/safeCall/kt232.txt index 34011223eb1..bc1499fdd60 100644 --- a/compiler/testData/codegen/light-analysis/safeCall/kt232.txt +++ b/compiler/testData/codegen/light-analysis/safeCall/kt232.txt @@ -3,7 +3,6 @@ public final class A { public final method foo(): void } - public final class Kt232Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/safeCall/kt247.txt b/compiler/testData/codegen/light-analysis/safeCall/kt247.txt index 104267e458b..9311770d64b 100644 --- a/compiler/testData/codegen/light-analysis/safeCall/kt247.txt +++ b/compiler/testData/codegen/light-analysis/safeCall/kt247.txt @@ -4,21 +4,18 @@ public final class C { public final method getX(): int } - public final class D { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class E { public method (): void public final @org.jetbrains.annotations.NotNull method bar(): E public final method foo(): int } - public final class Kt247Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method t1(): boolean diff --git a/compiler/testData/codegen/light-analysis/safeCall/kt4733.txt b/compiler/testData/codegen/light-analysis/safeCall/kt4733.txt index b91ecbaf95d..b6c20695fca 100644 --- a/compiler/testData/codegen/light-analysis/safeCall/kt4733.txt +++ b/compiler/testData/codegen/light-analysis/safeCall/kt4733.txt @@ -2,7 +2,6 @@ public final class Kt4733Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public method (): void public final method getFoo(p0: int): int diff --git a/compiler/testData/codegen/light-analysis/sam/constructors/runnableAccessingClosure2.txt b/compiler/testData/codegen/light-analysis/sam/constructors/runnableAccessingClosure2.txt index 6590c4fa68b..ab1268237d7 100644 --- a/compiler/testData/codegen/light-analysis/sam/constructors/runnableAccessingClosure2.txt +++ b/compiler/testData/codegen/light-analysis/sam/constructors/runnableAccessingClosure2.txt @@ -5,7 +5,6 @@ public final class Box { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class RunnableAccessingClosure2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/sam/constructors/samWrappersDifferentFiles.txt b/compiler/testData/codegen/light-analysis/sam/constructors/samWrappersDifferentFiles.txt index e58d34f7bc6..f6c76906fdf 100644 --- a/compiler/testData/codegen/light-analysis/sam/constructors/samWrappersDifferentFiles.txt +++ b/compiler/testData/codegen/light-analysis/sam/constructors/samWrappersDifferentFiles.txt @@ -2,12 +2,10 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Wrapped2Kt { public final static @org.jetbrains.annotations.NotNull method getWrapped2(): java.lang.Runnable } - public final class WrappedKt { public final static @org.jetbrains.annotations.NotNull method getWrapped1(): java.lang.Runnable } diff --git a/compiler/testData/codegen/light-analysis/sealed/objects.txt b/compiler/testData/codegen/light-analysis/sealed/objects.txt index fed26a01352..b7fd3f5fd59 100644 --- a/compiler/testData/codegen/light-analysis/sealed/objects.txt +++ b/compiler/testData/codegen/light-analysis/sealed/objects.txt @@ -3,21 +3,18 @@ public final class ObjectsKt { public final static @org.jetbrains.annotations.NotNull method foo(): Season } - public abstract class Season { inner class Season/Cold inner class Season/Warm private method (): void } - public final class Season/Cold { public final static field INSTANCE: Season.Cold inner class Season/Cold private method (): void } - public final class Season/Warm { public final static field INSTANCE: Season.Warm inner class Season/Warm diff --git a/compiler/testData/codegen/light-analysis/sealed/simple.txt b/compiler/testData/codegen/light-analysis/sealed/simple.txt index cf386f88cdb..12e478cdc37 100644 --- a/compiler/testData/codegen/light-analysis/sealed/simple.txt +++ b/compiler/testData/codegen/light-analysis/sealed/simple.txt @@ -4,19 +4,16 @@ public abstract class Season { private method (): void } - public final static class Season/Cold { inner class Season/Cold public method (): void } - public final static class Season/Warm { inner class Season/Warm public method (): void } - public final class SimpleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(): Season diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToCompanion.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToCompanion.txt index cce83fe3920..f9ef4a23f5b 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToCompanion.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToCompanion.txt @@ -9,7 +9,6 @@ public final class A { public final method getResult(): int } - public final static class A/Companion { inner class A/Companion private method (): void @@ -18,7 +17,6 @@ public final static class A/Companion { public final method getProp(): int } - public final class AccessToCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToNestedObject.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToNestedObject.txt index f4182096766..6b55ccea79b 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToNestedObject.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/accessToNestedObject.txt @@ -7,7 +7,6 @@ public final class A { public final method getResult(): int } - public final class A/B { public final static field INSTANCE: A.B private final static field prop: int @@ -17,14 +16,12 @@ public final class A/B { public final method getProp(): int } - public final class A/C { public final static field INSTANCE: A.C inner class A/C private method (): void } - public final class AccessToNestedObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryManySinks.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryManySinks.txt index f7157ccf00e..99b641c4050 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryManySinks.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryManySinks.txt @@ -6,7 +6,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class BasicNoPrimaryManySinksKt { private static @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryOneSink.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryOneSink.txt index 9bfccc2edb7..df0fca6752c 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryOneSink.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicNoPrimaryOneSink.txt @@ -7,7 +7,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class BasicNoPrimaryOneSinkKt { private static @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicPrimary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicPrimary.txt index 3507f6c2a9f..261e145efb2 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/basicPrimary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/basicPrimary.txt @@ -7,7 +7,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class BasicPrimaryKt { private static @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithNamedArgs.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithNamedArgs.txt index 2019f03cbe7..e77342bcc7e 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithNamedArgs.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithNamedArgs.txt @@ -6,12 +6,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class B { public method (): void } - public final class CallFromPrimaryWithNamedArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithOptionalArgs.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithOptionalArgs.txt index bb576572f85..fa142969ee9 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithOptionalArgs.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromPrimaryWithOptionalArgs.txt @@ -6,12 +6,10 @@ public class A { public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class B { public method (p0: int): void } - public final class CallFromPrimaryWithOptionalArgsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromSubClass.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromSubClass.txt index b6f9e322407..c3b52d1736b 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromSubClass.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/callFromSubClass.txt @@ -7,14 +7,12 @@ public class A { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field y: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getY(): java.lang.String } - public final class CallFromSubClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/clashingDefaultConstructors.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/clashingDefaultConstructors.txt index 3f5aa00aba7..fcdc54931f4 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/clashingDefaultConstructors.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/clashingDefaultConstructors.txt @@ -10,7 +10,6 @@ public class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class B { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void public method (@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String, p2: int): void @@ -18,7 +17,6 @@ public final class B { public synthetic method (p0: java.lang.String, p1: java.lang.String, p2: int, p3: kotlin.jvm.internal.DefaultConstructorMarker): void } - public final class ClashingDefaultConstructorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/dataClasses.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/dataClasses.txt index ce0dd05d900..9c30600f164 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/dataClasses.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/dataClasses.txt @@ -18,7 +18,6 @@ public final class A1 { public method toString(): java.lang.String } - public final class A2 { private @org.jetbrains.annotations.NotNull field prop1: java.lang.String private @org.jetbrains.annotations.NotNull field prop2: java.lang.String @@ -36,7 +35,6 @@ public final class A2 { public final method setProp3(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class DataClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultArgs.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultArgs.txt index 64f1c38d53b..16079b16ac5 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultArgs.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultArgs.txt @@ -9,7 +9,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class DefaultArgsKt { private final static @org.jetbrains.annotations.NotNull field global: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultParametersNotDuplicated.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultParametersNotDuplicated.txt index 08835828cd4..a14a3c6f2e6 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultParametersNotDuplicated.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/defaultParametersNotDuplicated.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class DefaultParametersNotDuplicatedKt { private static field global: int public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/delegatedThisWithLambda.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/delegatedThisWithLambda.txt index 8e3e23eaf76..5b64003353c 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/delegatedThisWithLambda.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/delegatedThisWithLambda.txt @@ -5,7 +5,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getF(): kotlin.jvm.functions.Function0 } - public final class DelegatedThisWithLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/delegationWithPrimary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/delegationWithPrimary.txt index 84b13ec69fa..9882579645e 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/delegationWithPrimary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/delegationWithPrimary.txt @@ -2,13 +2,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class C { private synthetic final field $$delegate_0: B public method (): void @@ -16,7 +14,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class DelegationWithPrimaryKt { private final static @org.jetbrains.annotations.NotNull field global: B public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/enums.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/enums.txt index 619148a1cc7..edee20770db 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/enums.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/enums.txt @@ -18,14 +18,12 @@ public enum class A1 { public static method values(): A1[] } - final static class A1/Y { inner class A1/Y method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public enum class A2 { public final static field X: A2 public final static field Y: A2 @@ -46,14 +44,12 @@ public enum class A2 { public static method values(): A2[] } - final static class A2/Y { inner class A2/Y method (p0: java.lang.String, p1: int): void public @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class EnumsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/generics.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/generics.txt index 6fd4c27da30..c56a9f4e941 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/generics.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/generics.txt @@ -3,7 +3,6 @@ public final class A { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class B { private final field x: java.lang.Object private final field y: java.lang.Object @@ -14,7 +13,6 @@ public class B { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class GenericsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClasses.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClasses.txt index a21eaea1732..8e07b029cd3 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClasses.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClasses.txt @@ -2,7 +2,6 @@ public final class InnerClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field outerProp: java.lang.String private @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String @@ -14,7 +13,6 @@ public final class Outer { public final method setSideEffects(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Outer/A1 { private @org.jetbrains.annotations.NotNull field prop: java.lang.String synthetic final field this$0: Outer @@ -26,7 +24,6 @@ public final class Outer/A1 { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Outer/A2 { private @org.jetbrains.annotations.NotNull field prop: java.lang.String synthetic final field this$0: Outer diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClassesInheritance.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClassesInheritance.txt index e93af7baafc..0240250b3a1 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClassesInheritance.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/innerClassesInheritance.txt @@ -2,7 +2,6 @@ public final class InnerClassesInheritanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field outerProp: java.lang.String private @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String @@ -14,7 +13,6 @@ public final class Outer { public final method setSideEffects(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public abstract class Outer/A1 { private @org.jetbrains.annotations.NotNull field parentProp: java.lang.String synthetic final field this$0: Outer @@ -25,7 +23,6 @@ public abstract class Outer/A1 { public final method setParentProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Outer/A2 { private @org.jetbrains.annotations.NotNull field prop: java.lang.String synthetic final field this$0: Outer diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/localClasses.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/localClasses.txt index 317c218686c..6a3ea428343 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/localClasses.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/localClasses.txt @@ -4,7 +4,6 @@ public class C { public final @org.jetbrains.annotations.NotNull method getGrandParentProp(): java.lang.String } - public final class LocalClassesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallPrimary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallPrimary.txt index d00af354947..82f15882d9b 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallPrimary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallPrimary.txt @@ -7,7 +7,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public abstract class B { private final field arg: int private final @org.jetbrains.annotations.NotNull field parentProp: java.lang.String @@ -16,7 +15,6 @@ public abstract class B { public final @org.jetbrains.annotations.NotNull method getParentProp(): java.lang.String } - public final class SuperCallPrimaryKt { private static @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallSecondary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallSecondary.txt index 0ddd36564dd..8ec31fa8572 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallSecondary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/superCallSecondary.txt @@ -7,7 +7,6 @@ public final class A { public final method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public abstract class B { private final @org.jetbrains.annotations.NotNull field parentProp: java.lang.String protected method (p0: int): void @@ -15,7 +14,6 @@ public abstract class B { public final @org.jetbrains.annotations.NotNull method getParentProp(): java.lang.String } - public final class SuperCallSecondaryKt { private static @org.jetbrains.annotations.NotNull field sideEffects: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/varargs.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/varargs.txt index eaa7336e34a..e701a4ebbc4 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/varargs.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/varargs.txt @@ -4,14 +4,12 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public class B { private final @org.jetbrains.annotations.NotNull field parentProp: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void public final @org.jetbrains.annotations.NotNull method getParentProp(): java.lang.String } - public final class VarargsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method join(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withGenerics.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withGenerics.txt index a9fe31ee127..7bb3e5e051b 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withGenerics.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withGenerics.txt @@ -6,7 +6,6 @@ public class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class WithGenericsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withNonLocalReturn.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withNonLocalReturn.txt index a240a4ec904..a4b096c84e7 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withNonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withNonLocalReturn.txt @@ -4,7 +4,6 @@ public final class A { public final method getProp(): int } - public final class WithNonLocalReturnKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method run(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withPrimary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withPrimary.txt index 46c6697ebbe..4ff178592e8 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withPrimary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withPrimary.txt @@ -11,7 +11,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class WithPrimaryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturn.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturn.txt index af6e9670e0d..fb7a6812ab8 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturn.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturn.txt @@ -4,7 +4,6 @@ public final class A { public final method getProp(): int } - public final class WithReturnKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturnUnit.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturnUnit.txt index 677c5abcd4e..d84e6515fa7 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturnUnit.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withReturnUnit.txt @@ -4,7 +4,6 @@ public final class A { public final method getProp(): int } - public final class WithReturnUnitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withVarargs.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withVarargs.txt index b65ef5d6b8e..76076f72b2f 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withVarargs.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withVarargs.txt @@ -4,7 +4,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class WithVarargsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method join(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/secondaryConstructors/withoutPrimary.txt b/compiler/testData/codegen/light-analysis/secondaryConstructors/withoutPrimary.txt index dc3691d7f56..ff18df614ce 100644 --- a/compiler/testData/codegen/light-analysis/secondaryConstructors/withoutPrimary.txt +++ b/compiler/testData/codegen/light-analysis/secondaryConstructors/withoutPrimary.txt @@ -10,7 +10,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class WithoutPrimaryKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/smartCasts/falseSmartCast.txt b/compiler/testData/codegen/light-analysis/smartCasts/falseSmartCast.txt index 98a4616aef7..523a3d806e8 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/falseSmartCast.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/falseSmartCast.txt @@ -2,13 +2,11 @@ public final class FalseSmartCastKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { public method (): void public final method superFoo(): void } - public class SuperFoo { public method (): void public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/smartCasts/genericIntersection.txt b/compiler/testData/codegen/light-analysis/smartCasts/genericIntersection.txt index 0e2f0b5fdd5..f29ad9299c4 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/genericIntersection.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/genericIntersection.txt @@ -2,7 +2,6 @@ public final class A { public method (): void } - public final class GenericIntersectionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(p0: java.lang.Object): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/smartCasts/genericSet.txt b/compiler/testData/codegen/light-analysis/smartCasts/genericSet.txt index bed07f218d7..47824666406 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/genericSet.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/genericSet.txt @@ -3,7 +3,6 @@ public final class GenericSetKt { private final static method change(p0: Wrapper, p1: java.lang.Object): void } - public final class Wrapper { private field x: java.lang.Object public method (p0: java.lang.Object): void diff --git a/compiler/testData/codegen/light-analysis/smartCasts/implicitExtensionReceiver.txt b/compiler/testData/codegen/light-analysis/smartCasts/implicitExtensionReceiver.txt index 836a3afbc23..325dca41df8 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/implicitExtensionReceiver.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/implicitExtensionReceiver.txt @@ -3,7 +3,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class ImplicitExtensionReceiverKt { public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.Nullable p0: A): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/smartCasts/implicitMemberReceiver.txt b/compiler/testData/codegen/light-analysis/smartCasts/implicitMemberReceiver.txt index c25f2b105eb..638a85e38b0 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/implicitMemberReceiver.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/implicitMemberReceiver.txt @@ -4,7 +4,6 @@ public class A { public @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field a: java.lang.String public method (): void @@ -12,14 +11,12 @@ public final class B { public @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class C { public method (): void public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String public final @org.jetbrains.annotations.NotNull method complex(@org.jetbrains.annotations.Nullable p0: A): java.lang.String } - public final class ImplicitMemberReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiver.txt b/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiver.txt index b65f024752e..991956e608a 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiver.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiver.txt @@ -4,7 +4,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final static class A/B { private final @org.jetbrains.annotations.NotNull field a: java.lang.String inner class A/B @@ -12,7 +11,6 @@ public final static class A/B { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class ImplicitReceiverKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiverInWhen.txt b/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiverInWhen.txt index b806d190420..6a136ad508a 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiverInWhen.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/implicitReceiverInWhen.txt @@ -3,14 +3,12 @@ public class A { public final @org.jetbrains.annotations.NotNull method f(): java.lang.String } - public final class B { private final @org.jetbrains.annotations.NotNull field x: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class ImplicitReceiverInWhenKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/smartCasts/implicitToGrandSon.txt b/compiler/testData/codegen/light-analysis/smartCasts/implicitToGrandSon.txt index a7e72ba7bda..4aa1a3be5fb 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/implicitToGrandSon.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/implicitToGrandSon.txt @@ -4,18 +4,15 @@ public class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public class B { public method (): void } - public class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class ImplicitToGrandSonKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/smartCasts/lambdaArgumentWithoutType.txt b/compiler/testData/codegen/light-analysis/smartCasts/lambdaArgumentWithoutType.txt index e3ea14b176e..eae1118c537 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/lambdaArgumentWithoutType.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/lambdaArgumentWithoutType.txt @@ -4,7 +4,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class LambdaArgumentWithoutTypeKt { private final static @org.jetbrains.annotations.NotNull field foo: Foo public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/smartCasts/smartCastInsideIf.txt b/compiler/testData/codegen/light-analysis/smartCasts/smartCastInsideIf.txt index b20b895ffb2..f4337b0ad68 100644 --- a/compiler/testData/codegen/light-analysis/smartCasts/smartCastInsideIf.txt +++ b/compiler/testData/codegen/light-analysis/smartCasts/smartCastInsideIf.txt @@ -6,7 +6,6 @@ public final class A { public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class SmartCastInsideIfKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String private final static method foo(p0: A, p1: A): A diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/bridgeNotEmptyMap.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/bridgeNotEmptyMap.txt index 18d723234de..286f5d25786 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/bridgeNotEmptyMap.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/bridgeNotEmptyMap.txt @@ -2,7 +2,6 @@ public final class BridgeNotEmptyMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - final class NotEmptyMap { public final static field INSTANCE: NotEmptyMap private method (): void diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/bridges.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/bridges.txt index 5e19e2c3cfa..21b7895791c 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/bridges.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/bridges.txt @@ -3,20 +3,17 @@ public interface A0 { public abstract method getSize(): int } - public final class A0/DefaultImpls { inner class A0/DefaultImpls public static method getSize(p0: A0): int } - public class A1 { private final field size: int public method (): void public final method getSize(): int } - public final class B0 { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -40,7 +37,6 @@ public final class B0 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class B1 { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -63,7 +59,6 @@ public final class B1 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class B2 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -80,7 +75,6 @@ public final class B2 { public final method size(): int } - public final class B3 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -98,7 +92,6 @@ public final class B3 { public final method size(): int } - public final class B4 { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -123,7 +116,6 @@ public final class B4 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class B5 { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -147,42 +139,35 @@ public final class B5 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class BridgesKt { private final static @org.jetbrains.annotations.NotNull field list: java.util.ArrayList public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getList(): java.util.ArrayList } - public interface I2 { public abstract method getSize(): int } - public interface I3 { public abstract method getSize(): java.lang.Object } - public interface I4 { inner class I4/DefaultImpls public abstract method getSize(): java.lang.Object } - public final class I4/DefaultImpls { inner class I4/DefaultImpls public static method getSize(p0: I4): java.lang.Object } - public interface I5 { inner class I5/DefaultImpls public abstract method getSize(): int } - public final class I5/DefaultImpls { inner class I5/DefaultImpls public static method getSize(p0: I5): int diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/collectionImpl.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/collectionImpl.txt index a936690f11b..f2c9fdd2046 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/collectionImpl.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/collectionImpl.txt @@ -19,7 +19,6 @@ public final class A1 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class A2 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -31,7 +30,6 @@ public final class A2 { public final method size(): int } - public final class A3 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -48,7 +46,6 @@ public final class A3 { public final method size(): int } - public final class A4 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -65,13 +62,11 @@ public final class A4 { public final method size(): int } - public final class CollectionImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check56(@org.jetbrains.annotations.NotNull p0: java.util.Collection): void } - public interface Sized { public abstract method getSize(): int } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/commonBridgesTarget.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/commonBridgesTarget.txt index 3213aaf9932..1ceedf72f41 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/commonBridgesTarget.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/commonBridgesTarget.txt @@ -8,24 +8,20 @@ public class Base { public final method size(): int } - public final class CommonBridgesTargetKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class DatabaseEntity { public method (): void } - public final class Derived { public method (): void public method remove(@org.jetbrains.annotations.NotNull p0: Issue): boolean public synthetic method remove(p0: DatabaseEntity): boolean } - public final class Issue { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyList.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyList.txt index fb270506217..a39b2af90ab 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyList.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyList.txt @@ -35,7 +35,6 @@ final class EmptyList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class EmptyListKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyMap.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyMap.txt index 5133902369d..e924ea5b0f2 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyMap.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyMap.txt @@ -22,7 +22,6 @@ final class EmptyMap { public final method values(): java.util.Collection } - public final class EmptyMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyStringMap.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyStringMap.txt index 570db443659..1ebdb146f7b 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/emptyStringMap.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/emptyStringMap.txt @@ -23,7 +23,6 @@ final class EmptyStringMap { public final method values(): java.util.Collection } - public final class EmptyStringMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/entrySetSOE.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/entrySetSOE.txt index ad29a19c09a..3959f66aa62 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/entrySetSOE.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/entrySetSOE.txt @@ -2,7 +2,6 @@ public final class EntrySetSOEKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Map1 { public method (): void public final method containsKey(p0: java.lang.Object): boolean @@ -21,7 +20,6 @@ public class Map1 { public final method values(): java.util.Collection } - public final class Map2 { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/enumAsOrdinaled.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/enumAsOrdinaled.txt index 409656a244c..d4482af85a8 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/enumAsOrdinaled.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/enumAsOrdinaled.txt @@ -6,12 +6,10 @@ public enum class A { public static method values(): A[] } - public final class EnumAsOrdinaledKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Ordinaled { public abstract method getOrdinal(): int } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/explicitSuperCall.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/explicitSuperCall.txt index b8abb1c93db..23fba61d7e6 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/explicitSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/explicitSuperCall.txt @@ -14,7 +14,6 @@ public final class A { public final method size(): int } - public final class ExplicitSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/irrelevantRemoveAtOverride.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/irrelevantRemoveAtOverride.txt index 35c65734b0e..41b01fb2b02 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/irrelevantRemoveAtOverride.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/irrelevantRemoveAtOverride.txt @@ -35,18 +35,15 @@ public final class A { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public interface Container { public abstract @org.jetbrains.annotations.NotNull method removeAt(p0: int): java.lang.String } - public class ContainerImpl { public method (): void public @org.jetbrains.annotations.NotNull method removeAt(p0: int): java.lang.String } - public final class IrrelevantRemoveAtOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/maps.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/maps.txt index 08edb23d946..c2f1ac12169 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/maps.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/maps.txt @@ -22,7 +22,6 @@ public final class A { public final method values(): java.util.Collection } - public final class MapsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/noSpecialBridgeInSuperClass.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/noSpecialBridgeInSuperClass.txt index c4f1a588e60..81627ec680c 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/noSpecialBridgeInSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/noSpecialBridgeInSuperClass.txt @@ -18,12 +18,10 @@ public abstract class AbstractFoo { public final method values(): java.util.Collection } - public final class AnyFoo { public method (): void } - public final class IntFoo { public method (): void public method containsKey(p0: int): boolean @@ -32,7 +30,6 @@ public final class IntFoo { public final method get(p0: java.lang.Object): java.lang.Object } - public final class NoSpecialBridgeInSuperClassKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -40,7 +37,6 @@ public final class NoSpecialBridgeInSuperClassKt { public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public class StringFoo { public method (): void public final method containsKey(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyListAny.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyListAny.txt index f686c8fad96..50da892e952 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyListAny.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyListAny.txt @@ -28,7 +28,6 @@ final class NotEmptyList { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class NotEmptyListAnyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyMap.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyMap.txt index 21ce44832fa..f33cd5e9236 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyMap.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/notEmptyMap.txt @@ -19,7 +19,6 @@ final class NotEmptyMap { public final method values(): java.util.Collection } - public final class NotEmptyMapKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/redundantStubForSize.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/redundantStubForSize.txt index 4d4f4e600f6..47555792166 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/redundantStubForSize.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/redundantStubForSize.txt @@ -4,7 +4,6 @@ public class A1 { public method getSize(): int } - public final class A2 { public method (): void public synthetic method add(p0: java.lang.Object): boolean @@ -24,7 +23,6 @@ public final class A2 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class RedundantStubForSizeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/removeAtTwoSpecialBridges.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/removeAtTwoSpecialBridges.txt index 31533b7a87c..627536f434e 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/removeAtTwoSpecialBridges.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/removeAtTwoSpecialBridges.txt @@ -27,7 +27,6 @@ public class A0 { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class A1 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -43,7 +42,6 @@ public final class A1 { public @org.jetbrains.annotations.NotNull method removeAt(p0: int): java.lang.String } - public final class A2 { public method (): void public final method contains(p0: java.lang.Object): boolean @@ -58,7 +56,6 @@ public final class A2 { public method removeAt(p0: int): java.lang.String } - public final class RemoveAtTwoSpecialBridgesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/throwableImpl.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/throwableImpl.txt index e6827c1afcb..699b924198f 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/throwableImpl.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/throwableImpl.txt @@ -6,7 +6,6 @@ public final class MyThrowable { public @org.jetbrains.annotations.Nullable method getMessage(): java.lang.String } - public final class ThrowableImplKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/specialBuiltins/valuesInsideEnum.txt b/compiler/testData/codegen/light-analysis/specialBuiltins/valuesInsideEnum.txt index 77814794def..a9a7931a928 100644 --- a/compiler/testData/codegen/light-analysis/specialBuiltins/valuesInsideEnum.txt +++ b/compiler/testData/codegen/light-analysis/specialBuiltins/valuesInsideEnum.txt @@ -2,7 +2,6 @@ public final class ValuesInsideEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Variants { public final static field Companion: Variants.Companion public final static field K: Variants @@ -14,7 +13,6 @@ public enum class Variants { public static method values(): Variants[] } - public final static class Variants/Companion { inner class Variants/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/statics/anonymousInitializerIObject.txt b/compiler/testData/codegen/light-analysis/statics/anonymousInitializerIObject.txt index c8040bc2f98..40638868e60 100644 --- a/compiler/testData/codegen/light-analysis/statics/anonymousInitializerIObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/anonymousInitializerIObject.txt @@ -2,7 +2,6 @@ public final class AnonymousInitializerIObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { public final static field INSTANCE: Foo private final static @org.jetbrains.annotations.NotNull field bar: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/statics/anonymousInitializerInClassObject.txt b/compiler/testData/codegen/light-analysis/statics/anonymousInitializerInClassObject.txt index d0d33f6e630..6f98f22a3ac 100644 --- a/compiler/testData/codegen/light-analysis/statics/anonymousInitializerInClassObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/anonymousInitializerInClassObject.txt @@ -2,7 +2,6 @@ public final class AnonymousInitializerInClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Foo { public final static field Companion: Foo.Companion private final static @org.jetbrains.annotations.NotNull field bar: java.lang.String @@ -10,7 +9,6 @@ public final class Foo { public method (): void } - public final static class Foo/Companion { inner class Foo/Companion private method (): void diff --git a/compiler/testData/codegen/light-analysis/statics/incInClassObject.txt b/compiler/testData/codegen/light-analysis/statics/incInClassObject.txt index 28ac50cc9cc..50aa919aef6 100644 --- a/compiler/testData/codegen/light-analysis/statics/incInClassObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/incInClassObject.txt @@ -9,7 +9,6 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void @@ -29,7 +28,6 @@ public final static class A/Companion { public final method test4(): int } - public final class IncInClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/incInObject.txt b/compiler/testData/codegen/light-analysis/statics/incInObject.txt index 3baf4b0f99d..e4102b5ed6f 100644 --- a/compiler/testData/codegen/light-analysis/statics/incInObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/incInObject.txt @@ -20,7 +20,6 @@ public final class A { public final method test4(): int } - public final class IncInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInClassObject.txt b/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInClassObject.txt index 46dad79c17e..6597b522677 100644 --- a/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInClassObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInClassObject.txt @@ -4,7 +4,6 @@ public class Bar { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class Foo { public final static field Companion: Foo.Companion private final static @org.jetbrains.annotations.NotNull field p2: java.lang.String @@ -18,7 +17,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getP5(): java.lang.String } - public final static class Foo/Companion { inner class Foo/Companion private method (): void @@ -27,7 +25,6 @@ public final static class Foo/Companion { public final @org.jetbrains.annotations.NotNull method getP3(): java.lang.String } - public final class InheritedPropertyInClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInObject.txt b/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInObject.txt index 1965ca6eb7b..c06fb23dd06 100644 --- a/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInObject.txt +++ b/compiler/testData/codegen/light-analysis/statics/inheritedPropertyInObject.txt @@ -4,7 +4,6 @@ public class Bar { public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - public final class Foo { public final static field INSTANCE: Foo private final static @org.jetbrains.annotations.NotNull field p2: java.lang.String @@ -16,7 +15,6 @@ public final class Foo { public final @org.jetbrains.annotations.NotNull method getP3(): java.lang.String } - public final class InheritedPropertyInObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/kt8089.txt b/compiler/testData/codegen/light-analysis/statics/kt8089.txt index 1f4de0dfc02..7b8985a6354 100644 --- a/compiler/testData/codegen/light-analysis/statics/kt8089.txt +++ b/compiler/testData/codegen/light-analysis/statics/kt8089.txt @@ -6,7 +6,6 @@ public final class C { public method (): void } - public final static class C/Companion { inner class C/Companion private method (): void @@ -18,7 +17,6 @@ public final static class C/Companion { private final method setS2(p0: java.lang.String): void } - public final class Kt8089Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/protectedSamConstructor.txt b/compiler/testData/codegen/light-analysis/statics/protectedSamConstructor.txt index e5ce713fc1b..f2147ef736f 100644 --- a/compiler/testData/codegen/light-analysis/statics/protectedSamConstructor.txt +++ b/compiler/testData/codegen/light-analysis/statics/protectedSamConstructor.txt @@ -3,7 +3,6 @@ public final class zzz/A { public final method test(): java.lang.String } - public final class zzz/KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/protectedStatic.txt b/compiler/testData/codegen/light-analysis/statics/protectedStatic.txt index e1d64693641..f484f4f9bd9 100644 --- a/compiler/testData/codegen/light-analysis/statics/protectedStatic.txt +++ b/compiler/testData/codegen/light-analysis/statics/protectedStatic.txt @@ -2,7 +2,6 @@ public final class anotherPackage/FirstKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class anotherPackage/Second { private final @org.jetbrains.annotations.NotNull field some2: kotlin.jvm.functions.Function0 private final @org.jetbrains.annotations.NotNull field some: kotlin.jvm.functions.Function0 diff --git a/compiler/testData/codegen/light-analysis/statics/protectedStatic2.txt b/compiler/testData/codegen/light-analysis/statics/protectedStatic2.txt index ff3149052c4..912de0f5012 100644 --- a/compiler/testData/codegen/light-analysis/statics/protectedStatic2.txt +++ b/compiler/testData/codegen/light-analysis/statics/protectedStatic2.txt @@ -3,7 +3,6 @@ public final class anotherPackage/Kotlin { public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String } - public final class anotherPackage/KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/statics/protectedStaticAndInline.txt b/compiler/testData/codegen/light-analysis/statics/protectedStaticAndInline.txt index 3cd3eaaf312..09564f3ce1d 100644 --- a/compiler/testData/codegen/light-analysis/statics/protectedStaticAndInline.txt +++ b/compiler/testData/codegen/light-analysis/statics/protectedStaticAndInline.txt @@ -2,7 +2,6 @@ public final class anotherPackage/KotlinKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class anotherPackage/Test { public method (): void public final @org.jetbrains.annotations.NotNull method doTest(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/statics/syntheticAccessor.txt b/compiler/testData/codegen/light-analysis/statics/syntheticAccessor.txt index e4783bea1d0..525f3af23ee 100644 --- a/compiler/testData/codegen/light-analysis/statics/syntheticAccessor.txt +++ b/compiler/testData/codegen/light-analysis/statics/syntheticAccessor.txt @@ -5,7 +5,6 @@ public final class A { private method (): void } - public final class A/B { public final static field INSTANCE: A.B private final static @org.jetbrains.annotations.NotNull field z: java.lang.String @@ -14,7 +13,6 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public final class SyntheticAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/strings/kt3571.txt b/compiler/testData/codegen/light-analysis/strings/kt3571.txt index 14b75814f2d..a45b5aa4396 100644 --- a/compiler/testData/codegen/light-analysis/strings/kt3571.txt +++ b/compiler/testData/codegen/light-analysis/strings/kt3571.txt @@ -2,7 +2,6 @@ public final class Kt3571Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Thing { private synthetic final field $$delegate_0: java.lang.CharSequence public method (@org.jetbrains.annotations.NotNull p0: java.lang.CharSequence): void diff --git a/compiler/testData/codegen/light-analysis/strings/kt5956.txt b/compiler/testData/codegen/light-analysis/strings/kt5956.txt index dbc7b87e737..2311f7173b8 100644 --- a/compiler/testData/codegen/light-analysis/strings/kt5956.txt +++ b/compiler/testData/codegen/light-analysis/strings/kt5956.txt @@ -2,7 +2,6 @@ public final class Kt5956Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Thing { private final @org.jetbrains.annotations.NotNull field delegate: java.lang.CharSequence public method (@org.jetbrains.annotations.NotNull p0: java.lang.CharSequence): void diff --git a/compiler/testData/codegen/light-analysis/strings/rawStringsWithManyQuotes.txt b/compiler/testData/codegen/light-analysis/strings/rawStringsWithManyQuotes.txt index 014ef25da88..d6a67d42788 100644 --- a/compiler/testData/codegen/light-analysis/strings/rawStringsWithManyQuotes.txt +++ b/compiler/testData/codegen/light-analysis/strings/rawStringsWithManyQuotes.txt @@ -6,7 +6,6 @@ public final class P { public final @org.jetbrains.annotations.NotNull method getExpected(): java.lang.String } - public final class RawStringsWithManyQuotesKt { public final static @org.jetbrains.annotations.NotNull method array(@org.jetbrains.annotations.NotNull p0: P[]): P[] public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/strings/stringBuilderAppend.txt b/compiler/testData/codegen/light-analysis/strings/stringBuilderAppend.txt index e533a0bd5d0..a393ff2c02d 100644 --- a/compiler/testData/codegen/light-analysis/strings/stringBuilderAppend.txt +++ b/compiler/testData/codegen/light-analysis/strings/stringBuilderAppend.txt @@ -3,7 +3,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class StringBuilderAppendKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/basicmethodSuperClass.txt b/compiler/testData/codegen/light-analysis/super/basicmethodSuperClass.txt index 5677b67f399..19fe27f5e0d 100644 --- a/compiler/testData/codegen/light-analysis/super/basicmethodSuperClass.txt +++ b/compiler/testData/codegen/light-analysis/super/basicmethodSuperClass.txt @@ -2,7 +2,6 @@ public final class BasicmethodSuperClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class N { public method (): void public method add(@org.jetbrains.annotations.NotNull p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/light-analysis/super/basicmethodSuperTrait.txt b/compiler/testData/codegen/light-analysis/super/basicmethodSuperTrait.txt index f5e6d8074a6..fa98d08d31c 100644 --- a/compiler/testData/codegen/light-analysis/super/basicmethodSuperTrait.txt +++ b/compiler/testData/codegen/light-analysis/super/basicmethodSuperTrait.txt @@ -2,19 +2,16 @@ public final class BasicmethodSuperTraitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class N { public method (): void public @org.jetbrains.annotations.NotNull method extra(): java.lang.String } - public interface Tr { inner class Tr/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method extra(): java.lang.String } - public final class Tr/DefaultImpls { inner class Tr/DefaultImpls public static @org.jetbrains.annotations.NotNull method extra(p0: Tr): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/basicproperty.txt b/compiler/testData/codegen/light-analysis/super/basicproperty.txt index 7e7ee975270..f9d03d7b946 100644 --- a/compiler/testData/codegen/light-analysis/super/basicproperty.txt +++ b/compiler/testData/codegen/light-analysis/super/basicproperty.txt @@ -2,7 +2,6 @@ public final class BasicpropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class M { private field b: int public method (): void @@ -10,7 +9,6 @@ public class M { public method setB(p0: int): void } - public final class N { private field b: int public method (): void diff --git a/compiler/testData/codegen/light-analysis/super/enclosedFun.txt b/compiler/testData/codegen/light-analysis/super/enclosedFun.txt index f73ed185841..99f9b7b964a 100644 --- a/compiler/testData/codegen/light-analysis/super/enclosedFun.txt +++ b/compiler/testData/codegen/light-analysis/super/enclosedFun.txt @@ -3,43 +3,36 @@ public interface BK { public abstract method x(): int } - public final class BK/DefaultImpls { inner class BK/DefaultImpls public static method x(p0: BK): int } - public final class EnclosedFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface K { inner class K/DefaultImpls public abstract method x(): int } - public final class K/DefaultImpls { inner class K/DefaultImpls public static method x(p0: K): int } - public class M { public method (): void public method x(): int } - public class N { inner class N/C public method (): void public method x(): int } - public class N/C { synthetic final field this$0: N inner class N/C diff --git a/compiler/testData/codegen/light-analysis/super/enclosedVar.txt b/compiler/testData/codegen/light-analysis/super/enclosedVar.txt index b63200cf554..4f9fa7c8d7e 100644 --- a/compiler/testData/codegen/light-analysis/super/enclosedVar.txt +++ b/compiler/testData/codegen/light-analysis/super/enclosedVar.txt @@ -2,7 +2,6 @@ public final class EnclosedVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class M { private field y: int public method (): void @@ -10,7 +9,6 @@ public class M { public method setY(p0: int): void } - public class N { private field y: int inner class N/C @@ -19,7 +17,6 @@ public class N { public method setY(p0: int): void } - public class N/C { synthetic final field this$0: N inner class N/C diff --git a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper.txt b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper.txt index 1f69507b3df..c26bbb41519 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper.txt @@ -5,7 +5,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/B { synthetic final field this$0: A inner class A/B @@ -20,24 +19,20 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method test6(): java.lang.String } - public interface BK { public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class InnerClassLabeledSuperKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface K { inner class K/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class K/DefaultImpls { inner class K/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: K): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper2.txt b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper2.txt index 4a6c69e0755..4d6d007fb40 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper2.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuper2.txt @@ -5,7 +5,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/B { synthetic final field this$0: A inner class A/B @@ -20,30 +19,25 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method test6(): java.lang.String } - public interface BK { public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class InnerClassLabeledSuper2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class K { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public interface KTrait { inner class KTrait/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class KTrait/DefaultImpls { inner class KTrait/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: KTrait): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty.txt b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty.txt index ba978c04e9f..966da7d1586 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty.txt @@ -6,7 +6,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class A/B { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: A @@ -22,18 +21,15 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method test6(): java.lang.String } - public interface Base { public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class InnerClassLabeledSuperPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class K { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty2.txt b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty2.txt index c5865ded228..94f3f0d94fd 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty2.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassLabeledSuperProperty2.txt @@ -6,7 +6,6 @@ public final class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class A/B { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: A @@ -22,23 +21,19 @@ public final class A/B { public final @org.jetbrains.annotations.NotNull method test6(): java.lang.String } - public interface Base { public abstract @org.jetbrains.annotations.NotNull method bar(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class InnerClassLabeledSuperProperty2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class K { public method (): void } - public abstract class KWithOverride { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/super/innerClassQualifiedFunctionCall.txt b/compiler/testData/codegen/light-analysis/super/innerClassQualifiedFunctionCall.txt index 098f00cf99d..3c9b0364051 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassQualifiedFunctionCall.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassQualifiedFunctionCall.txt @@ -6,7 +6,6 @@ public class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public class B { inner class B/E public method (): void @@ -14,7 +13,6 @@ public class B { public @org.jetbrains.annotations.NotNull method baz(): java.lang.String } - public final class B/E { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: B @@ -24,7 +22,6 @@ public final class B/E { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class C { inner class C/D public method (): void @@ -32,7 +29,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method boo(): java.lang.String } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -42,18 +38,15 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class InnerClassQualifiedFunctionCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { inner class T/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method baz(): java.lang.String } - public final class T/DefaultImpls { inner class T/DefaultImpls public static @org.jetbrains.annotations.NotNull method baz(p0: T): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/innerClassQualifiedPropertyAccess.txt b/compiler/testData/codegen/light-analysis/super/innerClassQualifiedPropertyAccess.txt index 407ff8897cc..8bcc87b204f 100644 --- a/compiler/testData/codegen/light-analysis/super/innerClassQualifiedPropertyAccess.txt +++ b/compiler/testData/codegen/light-analysis/super/innerClassQualifiedPropertyAccess.txt @@ -4,7 +4,6 @@ public class A { public @org.jetbrains.annotations.NotNull method getBoo(): java.lang.String } - public class B { inner class B/E public method (): void @@ -12,7 +11,6 @@ public class B { public @org.jetbrains.annotations.NotNull method getBaz(): java.lang.String } - public final class B/E { synthetic final field this$0: B inner class B/E @@ -20,7 +18,6 @@ public final class B/E { public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String } - public final class C { inner class C/D public method (): void @@ -28,7 +25,6 @@ public final class C { public @org.jetbrains.annotations.NotNull method getBoo(): java.lang.String } - public final class C/D { synthetic final field this$0: C inner class C/D @@ -36,18 +32,15 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getBar(): java.lang.String } - public final class InnerClassQualifiedPropertyAccessKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T { inner class T/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method getBaz(): java.lang.String } - public final class T/DefaultImpls { inner class T/DefaultImpls public static @org.jetbrains.annotations.NotNull method getBaz(p0: T): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/kt14243.txt b/compiler/testData/codegen/light-analysis/super/kt14243.txt index bae4cd0630c..49b1f3a2fc4 100644 --- a/compiler/testData/codegen/light-analysis/super/kt14243.txt +++ b/compiler/testData/codegen/light-analysis/super/kt14243.txt @@ -2,26 +2,22 @@ public final class Kt14243Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract method test(p0: java.lang.Object): java.lang.Object } - public final class Z/DefaultImpls { inner class Z/DefaultImpls public static method test(p0: Z, p1: java.lang.Object): java.lang.Object } - public class ZImpl { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method test(p0: java.lang.Object): java.lang.Object } - public final class ZImpl2 { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/kt14243_2.txt b/compiler/testData/codegen/light-analysis/super/kt14243_2.txt index d72fa9f08e9..affe67782a3 100644 --- a/compiler/testData/codegen/light-analysis/super/kt14243_2.txt +++ b/compiler/testData/codegen/light-analysis/super/kt14243_2.txt @@ -2,33 +2,28 @@ public final class Kt14243_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract method test(p0: java.lang.Object): java.lang.Object } - public final class Z/DefaultImpls { inner class Z/DefaultImpls public static method test(p0: Z, p1: java.lang.Object): java.lang.Object } - public class ZImpl { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method test(p0: java.lang.Object): java.lang.Object } - public class ZImpl2 { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public synthetic method test(p0: java.lang.Object): java.lang.Object } - public final class ZImpl3 { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/kt14243_class.txt b/compiler/testData/codegen/light-analysis/super/kt14243_class.txt index 9be43508c59..73338cb11e8 100644 --- a/compiler/testData/codegen/light-analysis/super/kt14243_class.txt +++ b/compiler/testData/codegen/light-analysis/super/kt14243_class.txt @@ -2,23 +2,19 @@ public final class Kt14243_classKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class Z { public method (): void public method test(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } - public class ZImpl { public method (): void } - public class ZImpl2 { public method (): void } - public final class ZImpl3 { public method (): void public @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/kt14243_prop.txt b/compiler/testData/codegen/light-analysis/super/kt14243_prop.txt index 71d34f26874..5f129489a51 100644 --- a/compiler/testData/codegen/light-analysis/super/kt14243_prop.txt +++ b/compiler/testData/codegen/light-analysis/super/kt14243_prop.txt @@ -2,20 +2,17 @@ public final class Kt14243_propKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract method getValue(): java.lang.Object public abstract method getZ(): java.lang.Object } - public final class Z/DefaultImpls { inner class Z/DefaultImpls public static method getZ(p0: Z): java.lang.Object } - public class ZImpl { public method (): void public synthetic method getValue(): java.lang.Object @@ -24,7 +21,6 @@ public class ZImpl { public @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public class ZImpl2 { public method (): void public synthetic method getZ(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/super/kt3492ClassFun.txt b/compiler/testData/codegen/light-analysis/super/kt3492ClassFun.txt index 8b8d62aacd7..a9711a6a9d2 100644 --- a/compiler/testData/codegen/light-analysis/super/kt3492ClassFun.txt +++ b/compiler/testData/codegen/light-analysis/super/kt3492ClassFun.txt @@ -3,18 +3,15 @@ public class A { public @org.jetbrains.annotations.NotNull method foo2(): java.lang.String } - public class B { public method (): void } - public final class C { inner class C/D public method (): void } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -23,7 +20,6 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Kt3492ClassFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt3492ClassProperty.txt b/compiler/testData/codegen/light-analysis/super/kt3492ClassProperty.txt index 8412c074f3c..6cd2bcfa719 100644 --- a/compiler/testData/codegen/light-analysis/super/kt3492ClassProperty.txt +++ b/compiler/testData/codegen/light-analysis/super/kt3492ClassProperty.txt @@ -4,18 +4,15 @@ public class A { public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public class B { public method (): void } - public final class C { inner class C/D public method (): void } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -24,7 +21,6 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Kt3492ClassPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt3492TraitFun.txt b/compiler/testData/codegen/light-analysis/super/kt3492TraitFun.txt index 8cc1f491b95..c1b9782ca9d 100644 --- a/compiler/testData/codegen/light-analysis/super/kt3492TraitFun.txt +++ b/compiler/testData/codegen/light-analysis/super/kt3492TraitFun.txt @@ -3,25 +3,21 @@ public interface ATrait { public abstract @org.jetbrains.annotations.NotNull method foo2(): java.lang.String } - public final class ATrait/DefaultImpls { inner class ATrait/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo2(p0: ATrait): java.lang.String } - public class B { public method (): void public @org.jetbrains.annotations.NotNull method foo2(): java.lang.String } - public final class C { inner class C/D public method (): void } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -30,7 +26,6 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Kt3492TraitFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt3492TraitProperty.txt b/compiler/testData/codegen/light-analysis/super/kt3492TraitProperty.txt index e97434c8ba8..10d69df3484 100644 --- a/compiler/testData/codegen/light-analysis/super/kt3492TraitProperty.txt +++ b/compiler/testData/codegen/light-analysis/super/kt3492TraitProperty.txt @@ -3,25 +3,21 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method getFoo(p0: A): java.lang.String } - public class B { public method (): void public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class C { inner class C/D public method (): void } - public final class C/D { private final @org.jetbrains.annotations.NotNull field foo: java.lang.String synthetic final field this$0: C @@ -30,7 +26,6 @@ public final class C/D { public final @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String } - public final class Kt3492TraitPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt4173.txt b/compiler/testData/codegen/light-analysis/super/kt4173.txt index 45d95b672b9..ea15538e149 100644 --- a/compiler/testData/codegen/light-analysis/super/kt4173.txt +++ b/compiler/testData/codegen/light-analysis/super/kt4173.txt @@ -6,7 +6,6 @@ public final class B { public final method setX(p0: int): void } - public class C { private final @org.jetbrains.annotations.NotNull field f: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void @@ -14,7 +13,6 @@ public class C { public final method test(): void } - public final class Kt4173Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt4173_2.txt b/compiler/testData/codegen/light-analysis/super/kt4173_2.txt index 0c17c913200..19040066eaf 100644 --- a/compiler/testData/codegen/light-analysis/super/kt4173_2.txt +++ b/compiler/testData/codegen/light-analysis/super/kt4173_2.txt @@ -6,7 +6,6 @@ public final class B { public final method setX(p0: int): void } - public class C { private final @org.jetbrains.annotations.NotNull field f: X public method (@org.jetbrains.annotations.NotNull p0: X): void @@ -14,12 +13,10 @@ public class C { public final method test(): void } - public final class Kt4173_2Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class X { private @org.jetbrains.annotations.NotNull field s: kotlin.jvm.functions.Function0 public method (@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/super/kt4173_3.txt b/compiler/testData/codegen/light-analysis/super/kt4173_3.txt index 7b0d7c541c5..aff3640206d 100644 --- a/compiler/testData/codegen/light-analysis/super/kt4173_3.txt +++ b/compiler/testData/codegen/light-analysis/super/kt4173_3.txt @@ -6,13 +6,11 @@ public final class B { public final method setX(p0: int): void } - public class C { public method (p0: int): void public final method test(): void } - public final class Kt4173_3Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/kt4982.txt b/compiler/testData/codegen/light-analysis/super/kt4982.txt index dfad93ab57f..a3b9eed370a 100644 --- a/compiler/testData/codegen/light-analysis/super/kt4982.txt +++ b/compiler/testData/codegen/light-analysis/super/kt4982.txt @@ -2,7 +2,6 @@ public final class Kt4982Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class WaitFor { public method (): void public abstract method condition(): boolean diff --git a/compiler/testData/codegen/light-analysis/super/multipleSuperTraits.txt b/compiler/testData/codegen/light-analysis/super/multipleSuperTraits.txt index 5e21d684830..165686648ef 100644 --- a/compiler/testData/codegen/light-analysis/super/multipleSuperTraits.txt +++ b/compiler/testData/codegen/light-analysis/super/multipleSuperTraits.txt @@ -3,30 +3,25 @@ public final class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class MultipleSuperTraitsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface T1 { inner class T1/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class T1/DefaultImpls { inner class T1/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: T1): java.lang.String } - public interface T2 { inner class T2/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class T2/DefaultImpls { inner class T2/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: T2): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/super/traitproperty.txt b/compiler/testData/codegen/light-analysis/super/traitproperty.txt index b08763a5a2d..d906a675bff 100644 --- a/compiler/testData/codegen/light-analysis/super/traitproperty.txt +++ b/compiler/testData/codegen/light-analysis/super/traitproperty.txt @@ -6,14 +6,12 @@ public interface M { public abstract method setBackingB(p0: int): void } - public final class M/DefaultImpls { inner class M/DefaultImpls public static method getB(p0: M): int public static method setB(p0: M, p1: int): void } - public final class N { private field b: int private field backingB: int @@ -26,7 +24,6 @@ public final class N { public method setBackingB(p0: int): void } - public final class TraitpropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/unqualifiedSuper.txt b/compiler/testData/codegen/light-analysis/super/unqualifiedSuper.txt index e0e9442352c..87924f568d1 100644 --- a/compiler/testData/codegen/light-analysis/super/unqualifiedSuper.txt +++ b/compiler/testData/codegen/light-analysis/super/unqualifiedSuper.txt @@ -1,6 +1,5 @@ public interface AnotherInterface - public class Base { public method (): void public @org.jetbrains.annotations.NotNull method baseFun(): java.lang.String @@ -8,7 +7,6 @@ public class Base { public @org.jetbrains.annotations.NotNull method unambiguous(): java.lang.String } - public final class Derived { public method (): void public @org.jetbrains.annotations.NotNull method baseFun(): java.lang.String @@ -21,7 +19,6 @@ public final class Derived { public @org.jetbrains.annotations.NotNull method unambiguous(): java.lang.String } - public interface DerivedInterface { inner class DerivedInterface/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method callsFunFromSuperInterface(): java.lang.String @@ -29,7 +26,6 @@ public interface DerivedInterface { public abstract @org.jetbrains.annotations.NotNull method unambiguous(): java.lang.String } - public final class DerivedInterface/DefaultImpls { inner class DerivedInterface/DefaultImpls public static @org.jetbrains.annotations.NotNull method callsFunFromSuperInterface(p0: DerivedInterface): java.lang.String @@ -37,20 +33,17 @@ public final class DerivedInterface/DefaultImpls { public static @org.jetbrains.annotations.NotNull method unambiguous(p0: DerivedInterface): java.lang.String } - public interface Interface { inner class Interface/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method interfaceFun(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method unambiguous(): java.lang.String } - public final class Interface/DefaultImpls { inner class Interface/DefaultImpls public static @org.jetbrains.annotations.NotNull method interfaceFun(p0: Interface): java.lang.String } - public final class UnqualifiedSuperKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithDeeperHierarchies.txt b/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithDeeperHierarchies.txt index 39d1c6c664c..c29c2913329 100644 --- a/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithDeeperHierarchies.txt +++ b/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithDeeperHierarchies.txt @@ -2,7 +2,6 @@ public class DeepBase { public method (): void } - public final class DeepDerived { public method (): void public final @org.jetbrains.annotations.NotNull method callsSuperDeepInterfaceFun(): java.lang.String @@ -17,13 +16,11 @@ public final class DeepDerived { public final @org.jetbrains.annotations.NotNull method getsSuperDeeperInterfaceProp(): java.lang.String } - public interface DeepInterface { inner class DeepInterface/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method deepInterfaceFun(): java.lang.String } - public final class DeepInterface/DefaultImpls { inner class DeepInterface/DefaultImpls public static @org.jetbrains.annotations.NotNull method deepInterfaceFun(p0: DeepInterface): java.lang.String @@ -31,28 +28,24 @@ public final class DeepInterface/DefaultImpls { public static @org.jetbrains.annotations.NotNull method getDeeperInterfaceProp(p0: DeepInterface): java.lang.String } - public class DeeperBase { public method (): void public @org.jetbrains.annotations.NotNull method deeperBaseFun(): java.lang.String public @org.jetbrains.annotations.NotNull method getDeeperBaseProp(): java.lang.String } - public interface DeeperInterface { inner class DeeperInterface/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method deeperInterfaceFun(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method getDeeperInterfaceProp(): java.lang.String } - public final class DeeperInterface/DefaultImpls { inner class DeeperInterface/DefaultImpls public static @org.jetbrains.annotations.NotNull method deeperInterfaceFun(p0: DeeperInterface): java.lang.String public static @org.jetbrains.annotations.NotNull method getDeeperInterfaceProp(p0: DeeperInterface): java.lang.String } - public final class UnqualifiedSuperWithDeeperHierarchiesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithMethodsOfAny.txt b/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithMethodsOfAny.txt index 1407c7c29d8..449580fd320 100644 --- a/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithMethodsOfAny.txt +++ b/compiler/testData/codegen/light-analysis/super/unqualifiedSuperWithMethodsOfAny.txt @@ -3,27 +3,22 @@ public final class C1 { public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class C2 { public method (): void public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public class ClassWithToString { public method (): void public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public interface ISomething - public interface IWithToString { public abstract @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public final class UnqualifiedSuperWithMethodsOfAnyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/synchronized/nonLocalReturn.txt b/compiler/testData/codegen/light-analysis/synchronized/nonLocalReturn.txt index 7588af198d8..10727dba16d 100644 --- a/compiler/testData/codegen/light-analysis/synchronized/nonLocalReturn.txt +++ b/compiler/testData/codegen/light-analysis/synchronized/nonLocalReturn.txt @@ -11,12 +11,10 @@ public enum class ExecutionType { public static method values(): ExecutionType[] } - public final class MyException { public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class NonLocalReturnKt { private final static field count: int private final static @org.jetbrains.annotations.NotNull field doneSignal: java.util.concurrent.CountDownLatch @@ -38,7 +36,6 @@ public final class NonLocalReturnKt { public final static @org.jetbrains.annotations.NotNull method testTemplate(@org.jetbrains.annotations.NotNull p0: ExecutionType, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String } - public final class TestLocal { private final @org.jetbrains.annotations.NotNull field executionType: ExecutionType private final @org.jetbrains.annotations.NotNull field name: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtected.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtected.txt index b763b257dcd..95c093f13e7 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtected.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtected.txt @@ -2,19 +2,16 @@ public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class a/A { public method (): void protected final @org.jetbrains.annotations.NotNull method protectedFun(): java.lang.String } - public final class a/BSamePackage { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class b/B { public method (): void public final @org.jetbrains.annotations.NotNull method test(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtectedInvokeVirtual.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtectedInvokeVirtual.txt index 37af4647adb..636c95c346b 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtectedInvokeVirtual.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/accessorForProtectedInvokeVirtual.txt @@ -3,7 +3,6 @@ public class B { public final @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class C { public method (): void protected @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String @@ -11,12 +10,10 @@ public final class C { protected method setProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class _1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class test/A { private @org.jetbrains.annotations.NotNull field state: java.lang.String public method (): void diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt10047.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt10047.txt index b95170d0c4d..e4e23595932 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt10047.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt10047.txt @@ -2,7 +2,6 @@ public class test/Actor { public method (): void } - public abstract class test/O2dScriptAction { private @org.jetbrains.annotations.Nullable field owner: test.Actor public method (): void @@ -11,17 +10,14 @@ public abstract class test/O2dScriptAction { private final method setOwner(p0: test.Actor): void } - public final class test2/AKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class test2/CompositeActor { public method (): void } - public class test2/O2dDialog { public method (): void public final @org.jetbrains.annotations.Nullable method test(): test2.CompositeActor diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717.txt index 479dce32881..3419fa2ea32 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717.txt @@ -2,7 +2,6 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Test { public final static field INSTANCE: Test private final static @org.jetbrains.annotations.NotNull field test: java.lang.String @@ -10,7 +9,6 @@ public final class Test { public final @org.jetbrains.annotations.NotNull method getTest(): java.lang.String } - public final class VarsKt { private static @org.jetbrains.annotations.NotNull field OK: java.lang.String public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717DifferentPackages.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717DifferentPackages.txt index f2c090174b3..fa9650f4f22 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717DifferentPackages.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9717DifferentPackages.txt @@ -2,7 +2,6 @@ public final class a/AKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class b/B { private @org.jetbrains.annotations.NotNull field OK: java.lang.String public method (): void @@ -10,7 +9,6 @@ public class b/B { protected final method setOK(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class b/BB { public method (): void public final @org.jetbrains.annotations.NotNull method ok(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958.txt index 2c484a27f35..a9e084c159f 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958.txt @@ -2,26 +2,22 @@ public final class a/AKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class a/B { public final static field Companion: a.B.Companion inner class a/B/Companion public method (): void } - public final static class a/B/Companion { inner class a/B/Companion private method (): void } - public abstract class b/A { public method (): void protected final method foo(): void } - public final class b/BKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958Interface.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958Interface.txt index e4161d10cc3..08a1bcd80d7 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958Interface.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/kt9958Interface.txt @@ -2,7 +2,6 @@ public final class a/AKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface a/B { public final static field Companion: a.B.Companion inner class a/B/Companion @@ -10,31 +9,26 @@ public interface a/B { public abstract method test(): void } - public final static class a/B/Companion { inner class a/B/Companion private method (): void } - public final class a/B/DefaultImpls { inner class a/B/DefaultImpls public static method test(p0: a.B): void } - public final class a/C { public method (): void public method test(): void } - public abstract class b/A { public method (): void protected final method foo(): void } - public final class b/BKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/protectedFromLambda.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/protectedFromLambda.txt index 407687aad56..a076620a537 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/protectedFromLambda.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/protectedFromLambda.txt @@ -3,19 +3,16 @@ public class first/A { protected @org.jetbrains.annotations.NotNull method test(): java.lang.String } - public final class first/AKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public abstract class second/B { private final @org.jetbrains.annotations.NotNull field value: kotlin.jvm.functions.Function0 public method (): void public final @org.jetbrains.annotations.NotNull method getValue(): kotlin.jvm.functions.Function0 } - public final class second/C { public method (): void protected @org.jetbrains.annotations.NotNull method test(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/syntheticAccessors/syntheticAccessorNames.txt b/compiler/testData/codegen/light-analysis/syntheticAccessors/syntheticAccessorNames.txt index 1a4c73d6233..ba2661e2419 100644 --- a/compiler/testData/codegen/light-analysis/syntheticAccessors/syntheticAccessorNames.txt +++ b/compiler/testData/codegen/light-analysis/syntheticAccessors/syntheticAccessorNames.txt @@ -4,7 +4,6 @@ public final class PrivateMethod { private final method foo(): java.lang.String } - public final class PrivateMethod/Inner { private final @org.jetbrains.annotations.NotNull field a: java.lang.String synthetic final field this$0: PrivateMethod @@ -13,14 +12,12 @@ public final class PrivateMethod/Inner { public final @org.jetbrains.annotations.NotNull method getA(): java.lang.String } - public final class PrivatePropertyGet { private final field x: int inner class PrivatePropertyGet/Inner public method (): void } - public final class PrivatePropertyGet/Inner { private final field a: int synthetic final field this$0: PrivatePropertyGet @@ -29,21 +26,18 @@ public final class PrivatePropertyGet/Inner { public final method getA(): int } - public final class PrivatePropertySet { private field x: java.lang.String inner class PrivatePropertySet/Inner public method (): void } - public final class PrivatePropertySet/Inner { synthetic final field this$0: PrivatePropertySet inner class PrivatePropertySet/Inner public method (p0: PrivatePropertySet): void } - public final class SyntheticAccessorNamesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: java.lang.Class): void diff --git a/compiler/testData/codegen/light-analysis/toArray/toArray.txt b/compiler/testData/codegen/light-analysis/toArray/toArray.txt index 6ad48451b92..5dde600a445 100644 --- a/compiler/testData/codegen/light-analysis/toArray/toArray.txt +++ b/compiler/testData/codegen/light-analysis/toArray/toArray.txt @@ -18,7 +18,6 @@ public final class MyCollection { public method toArray(p0: java.lang.Object[]): java.lang.Object[] } - public final class ToArrayKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/toArray/toArrayAlreadyPresent.txt b/compiler/testData/codegen/light-analysis/toArray/toArrayAlreadyPresent.txt index 56c3793f7f9..8cec7600e49 100644 --- a/compiler/testData/codegen/light-analysis/toArray/toArrayAlreadyPresent.txt +++ b/compiler/testData/codegen/light-analysis/toArray/toArrayAlreadyPresent.txt @@ -18,7 +18,6 @@ public final class MyCollection { public final @org.jetbrains.annotations.NotNull method toArray(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.Object[] } - public final class ToArrayAlreadyPresentKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublic.txt b/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublic.txt index de5a011bb9d..f965c92660a 100644 --- a/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublic.txt +++ b/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublic.txt @@ -2,7 +2,6 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class test/SingletonCollection { private final field size: int private final field value: java.lang.Object @@ -14,7 +13,6 @@ public class test/SingletonCollection { public final @org.jetbrains.annotations.NotNull method toArray(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.Object[] } - public final class test2/DerivedSingletonCollection { public method (p0: java.lang.Object): void } diff --git a/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublicWithJava.txt b/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublicWithJava.txt index 7b6a3b3ad37..2f25c991308 100644 --- a/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublicWithJava.txt +++ b/compiler/testData/codegen/light-analysis/toArray/toArrayShouldBePublicWithJava.txt @@ -2,7 +2,6 @@ public final class BoxKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class test/SingletonCollection { private final field size: int private final field value: java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.txt b/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.txt index d5432711fa2..3f0427d9562 100644 --- a/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.txt +++ b/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.txt @@ -2,7 +2,6 @@ public final class test/TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - synthetic final class test/TestKt__NoPrivateNoAccessorsInMultiFileFacadeKt { private static field prop: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.txt b/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.txt index ed01ab56fe1..cbb571e786b 100644 --- a/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.txt +++ b/compiler/testData/codegen/light-analysis/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.txt @@ -3,7 +3,6 @@ public final class test/TestKt { public final static @org.jetbrains.annotations.NotNull method getProp(): java.lang.String } - synthetic final class test/TestKt__NoPrivateNoAccessorsInMultiFileFacade2Kt { private static @org.jetbrains.annotations.NotNull field prop: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/topLevelPrivate/syntheticAccessorInMultiFile.txt b/compiler/testData/codegen/light-analysis/topLevelPrivate/syntheticAccessorInMultiFile.txt index b58cf826ccf..8642dfe5a9f 100644 --- a/compiler/testData/codegen/light-analysis/topLevelPrivate/syntheticAccessorInMultiFile.txt +++ b/compiler/testData/codegen/light-analysis/topLevelPrivate/syntheticAccessorInMultiFile.txt @@ -2,7 +2,6 @@ public final class test/TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - synthetic final class test/TestKt__SyntheticAccessorInMultiFileKt { private final static field prop: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/abstractClassInheritsFromInterface.txt b/compiler/testData/codegen/light-analysis/traits/abstractClassInheritsFromInterface.txt index 6814380e222..133b05793c1 100644 --- a/compiler/testData/codegen/light-analysis/traits/abstractClassInheritsFromInterface.txt +++ b/compiler/testData/codegen/light-analysis/traits/abstractClassInheritsFromInterface.txt @@ -3,18 +3,15 @@ public abstract class KC { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class KCKt { public final static method box(): java.lang.String } - public interface T { inner class T/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class T/DefaultImpls { inner class T/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: T): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/diamondPropertyAccessors.txt b/compiler/testData/codegen/light-analysis/traits/diamondPropertyAccessors.txt index 692c6dd36d5..c9c8c0530be 100644 --- a/compiler/testData/codegen/light-analysis/traits/diamondPropertyAccessors.txt +++ b/compiler/testData/codegen/light-analysis/traits/diamondPropertyAccessors.txt @@ -4,57 +4,48 @@ public interface A { public abstract method setBar(p0: boolean): void } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method getBar(p0: A): boolean public static method setBar(p0: A, p1: boolean): void } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static method getBar(p0: B): boolean public static method setBar(p0: B, p1: boolean): void } - public interface C { inner class C/DefaultImpls public abstract method getBar(): boolean public abstract method setBar(p0: boolean): void } - public final class C/DefaultImpls { inner class C/DefaultImpls public static method getBar(p0: C): boolean public static method setBar(p0: C, p1: boolean): void } - public interface D { inner class D/DefaultImpls } - public final class D/DefaultImpls { inner class D/DefaultImpls public static method getBar(p0: D): boolean public static method setBar(p0: D, p1: boolean): void } - public final class DiamondPropertyAccessorsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Impl { public method (): void public method getBar(): boolean diff --git a/compiler/testData/codegen/light-analysis/traits/genericMethod.txt b/compiler/testData/codegen/light-analysis/traits/genericMethod.txt index 3dfa6e975d1..86031fc03c6 100644 --- a/compiler/testData/codegen/light-analysis/traits/genericMethod.txt +++ b/compiler/testData/codegen/light-analysis/traits/genericMethod.txt @@ -4,13 +4,11 @@ public interface A { public abstract method getProperty(): java.lang.Object } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method a(p0: A): java.lang.Object } - public class B { private final @org.jetbrains.annotations.NotNull field property: java.lang.Object public method (): void @@ -18,14 +16,12 @@ public class B { public @org.jetbrains.annotations.NotNull method getProperty(): java.lang.Object } - public class C { private final @org.jetbrains.annotations.NotNull field property: java.lang.Object public method (): void public @org.jetbrains.annotations.NotNull method getProperty(): java.lang.Object } - public final class GenericMethodKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/indirectlyInheritPropertyGetter.txt b/compiler/testData/codegen/light-analysis/traits/indirectlyInheritPropertyGetter.txt index 1e33e8eaf26..38af68824e7 100644 --- a/compiler/testData/codegen/light-analysis/traits/indirectlyInheritPropertyGetter.txt +++ b/compiler/testData/codegen/light-analysis/traits/indirectlyInheritPropertyGetter.txt @@ -3,30 +3,25 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method getStr(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method getStr(p0: A): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method getStr(p0: B): java.lang.String } - public final class Impl { public method (): void public @org.jetbrains.annotations.NotNull method getStr(): java.lang.String } - public final class IndirectlyInheritPropertyGetterKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/inheritJavaInterface.txt b/compiler/testData/codegen/light-analysis/traits/inheritJavaInterface.txt index d1aecab77ab..d5cfe6a5979 100644 --- a/compiler/testData/codegen/light-analysis/traits/inheritJavaInterface.txt +++ b/compiler/testData/codegen/light-analysis/traits/inheritJavaInterface.txt @@ -3,19 +3,16 @@ public interface A { public abstract @org.jetbrains.annotations.Nullable method test(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.Nullable method test(p0: A): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.Nullable method test(): java.lang.String } - public final class TestKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/inheritedFun.txt b/compiler/testData/codegen/light-analysis/traits/inheritedFun.txt index 81171552688..dc10ad37af0 100644 --- a/compiler/testData/codegen/light-analysis/traits/inheritedFun.txt +++ b/compiler/testData/codegen/light-analysis/traits/inheritedFun.txt @@ -3,19 +3,16 @@ public interface A { public abstract method f(): int } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method f(p0: A): int } - public final class B { public method (): void public method f(): int } - public final class InheritedFunKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/inheritedVar.txt b/compiler/testData/codegen/light-analysis/traits/inheritedVar.txt index 5f22c1e8f96..e6541892690 100644 --- a/compiler/testData/codegen/light-analysis/traits/inheritedVar.txt +++ b/compiler/testData/codegen/light-analysis/traits/inheritedVar.txt @@ -4,21 +4,18 @@ public interface A { public abstract method setA(p0: int): void } - public final class A/DefaultImpls { inner class A/DefaultImpls public static method getA(p0: A): int public static method setA(p0: A, p1: int): void } - public final class B { public method (): void public method getA(): int public method setA(p0: int): void } - public final class InheritedVarKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/interfaceDefaultImpls.txt b/compiler/testData/codegen/light-analysis/traits/interfaceDefaultImpls.txt index 6634b0fe6e4..b98168c34cd 100644 --- a/compiler/testData/codegen/light-analysis/traits/interfaceDefaultImpls.txt +++ b/compiler/testData/codegen/light-analysis/traits/interfaceDefaultImpls.txt @@ -3,13 +3,11 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A): java.lang.String } - public final class MainKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/kt1936.txt b/compiler/testData/codegen/light-analysis/traits/kt1936.txt index f93d2df79a8..3c183fda82e 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt1936.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt1936.txt @@ -6,7 +6,6 @@ public class B { public method setProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt1936Kt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String @@ -14,7 +13,6 @@ public final class Kt1936Kt { public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public interface MyTrait { inner class MyTrait/DefaultImpls public abstract method foo(): void @@ -22,7 +20,6 @@ public interface MyTrait { public abstract method setProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyTrait/DefaultImpls { inner class MyTrait/DefaultImpls public static method foo(p0: MyTrait): void diff --git a/compiler/testData/codegen/light-analysis/traits/kt1936_1.txt b/compiler/testData/codegen/light-analysis/traits/kt1936_1.txt index 376c4ee2bad..f6d0a86dc0b 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt1936_1.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt1936_1.txt @@ -6,12 +6,10 @@ public class B { public method setProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt1936_1Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface MyTrait { inner class MyTrait/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String @@ -19,7 +17,6 @@ public interface MyTrait { public abstract method setProperty(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class MyTrait/DefaultImpls { inner class MyTrait/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: MyTrait): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/kt2260.txt b/compiler/testData/codegen/light-analysis/traits/kt2260.txt index 127fd33aa30..98147dbf386 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt2260.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt2260.txt @@ -3,13 +3,11 @@ public interface Flusher { public abstract @org.jetbrains.annotations.NotNull method flush(): java.lang.String } - public final class Flusher/DefaultImpls { inner class Flusher/DefaultImpls public static @org.jetbrains.annotations.NotNull method flush(p0: Flusher): java.lang.String } - public final class Kt2260Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method flushIt(@org.jetbrains.annotations.NotNull p0: Flusher): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/kt2399.txt b/compiler/testData/codegen/light-analysis/traits/kt2399.txt index 5a1520cbcb8..4cc1296a050 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt2399.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt2399.txt @@ -2,52 +2,43 @@ public final class JsonArray { public method (): void } - public final class JsonObject { public method (): void } - public interface JsonParser { inner class JsonParser/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method parse(@org.jetbrains.annotations.NotNull p0: JsonArray): java.util.Collection } - public final class JsonParser/DefaultImpls { inner class JsonParser/DefaultImpls public static @org.jetbrains.annotations.NotNull method parse(@org.jetbrains.annotations.NotNull p0: JsonParser, p1: JsonArray): java.util.Collection } - public final class Kt2399Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface MultiParser { public abstract @org.jetbrains.annotations.NotNull method parse(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.util.Collection } - public interface Parser { public abstract @org.jetbrains.annotations.NotNull method parse(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } - public final class ProjectApiContext { private final @org.jetbrains.annotations.NotNull field projectInfoJsonParser: ProjectInfoJsonParser public method (): void public final @org.jetbrains.annotations.NotNull method getProjectInfoJsonParser(): ProjectInfoJsonParser } - public final class ProjectInfo { public method (): void public @org.jetbrains.annotations.NotNull method toString(): java.lang.String } - public abstract class ProjectInfoJsonParser { public method (): void public @org.jetbrains.annotations.NotNull method parse(@org.jetbrains.annotations.NotNull p0: JsonArray): java.util.Collection diff --git a/compiler/testData/codegen/light-analysis/traits/kt2541.txt b/compiler/testData/codegen/light-analysis/traits/kt2541.txt index ab5d5713def..28b53a293da 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt2541.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt2541.txt @@ -3,20 +3,17 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A, p1: java.lang.Object, p2: java.lang.Object): java.lang.String } - public final class B { public method (): void public @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, p1: int): java.lang.String public synthetic method foo(p0: java.lang.Object, p1: java.lang.Object): java.lang.String } - public final class Kt2541Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/kt3315.txt b/compiler/testData/codegen/light-analysis/traits/kt3315.txt index caf36d967db..5c879ddfaec 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt3315.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt3315.txt @@ -4,19 +4,16 @@ public final class A { public synthetic method foo(p0: java.lang.Object): java.lang.Object } - public interface B { inner class B/DefaultImpls public abstract method foo(p0: java.lang.Object): java.lang.Object } - public final class B/DefaultImpls { inner class B/DefaultImpls public static method foo(p0: B, p1: java.lang.Object): java.lang.Object } - public final class Kt3315Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/kt3500.txt b/compiler/testData/codegen/light-analysis/traits/kt3500.txt index a9f4609668c..e2391dc6e21 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt3500.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt3500.txt @@ -3,31 +3,26 @@ public final class A { public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public interface BK { inner class BK/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class BK/DefaultImpls { inner class BK/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: BK): java.lang.String } - public interface KTrait { inner class KTrait/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class KTrait/DefaultImpls { inner class KTrait/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: KTrait): java.lang.String } - public final class Kt3500Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/kt3579.txt b/compiler/testData/codegen/light-analysis/traits/kt3579.txt index 4acb4b2eaff..521ed75cf9b 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt3579.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt3579.txt @@ -1,16 +1,13 @@ public interface Hierarchy - public final class Kt3579Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Location { public method (): void } - public class Persistent { private final @org.jetbrains.annotations.NotNull field p: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/traits/kt3579_2.txt b/compiler/testData/codegen/light-analysis/traits/kt3579_2.txt index c1898535a20..6ac6843d5e9 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt3579_2.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt3579_2.txt @@ -1,18 +1,15 @@ public interface First - public final class Kt3579_2Kt { private final static @org.jetbrains.annotations.Nullable field a: Some public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method getA(): Some } - public final class MClass { private final @org.jetbrains.annotations.NotNull field p: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String } - public interface Some diff --git a/compiler/testData/codegen/light-analysis/traits/kt5393.txt b/compiler/testData/codegen/light-analysis/traits/kt5393.txt index 34f1a578821..d64ad9df5a5 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt5393.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt5393.txt @@ -3,30 +3,25 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.lang.String } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class Kt5393Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/kt5393_property.txt b/compiler/testData/codegen/light-analysis/traits/kt5393_property.txt index 903c5f55218..1387e7b3a91 100644 --- a/compiler/testData/codegen/light-analysis/traits/kt5393_property.txt +++ b/compiler/testData/codegen/light-analysis/traits/kt5393_property.txt @@ -4,33 +4,28 @@ public interface A { public abstract method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method getFoo(p0: A): java.lang.String public static method setFoo(@org.jetbrains.annotations.NotNull p0: A, p1: java.lang.String): void } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method getFoo(p0: B): java.lang.String public static method setFoo(@org.jetbrains.annotations.NotNull p0: B, p1: java.lang.String): void } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String public method setFoo(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class Kt5393_propertyKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/multiple.txt b/compiler/testData/codegen/light-analysis/traits/multiple.txt index 08815db8454..c4c4071b0cf 100644 --- a/compiler/testData/codegen/light-analysis/traits/multiple.txt +++ b/compiler/testData/codegen/light-analysis/traits/multiple.txt @@ -3,31 +3,26 @@ public interface AL { public abstract @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Object } - public final class AL/DefaultImpls { inner class AL/DefaultImpls public static @org.jetbrains.annotations.Nullable method get(p0: AL, p1: int): java.lang.Object } - public interface ALE { inner class ALE/DefaultImpls public abstract method getOrNull(p0: int, p1: java.lang.Object): java.lang.Object } - public final class ALE/DefaultImpls { inner class ALE/DefaultImpls public static @org.jetbrains.annotations.Nullable method get(p0: ALE, p1: int): java.lang.Object public static method getOrNull(p0: ALE, p1: int, p2: java.lang.Object): java.lang.Object } - public final class MultipleKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public class SmartArrayList { public method (): void public @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Object @@ -35,7 +30,6 @@ public class SmartArrayList { public synthetic method getOrNull(p0: int, p1: java.lang.Object): java.lang.Object } - public final class SmartArrayList2 { public method (): void } diff --git a/compiler/testData/codegen/light-analysis/traits/noPrivateDelegation.txt b/compiler/testData/codegen/light-analysis/traits/noPrivateDelegation.txt index 195b7122ce4..d3043306e5e 100644 --- a/compiler/testData/codegen/light-analysis/traits/noPrivateDelegation.txt +++ b/compiler/testData/codegen/light-analysis/traits/noPrivateDelegation.txt @@ -2,18 +2,15 @@ public final class NoPrivateDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls } - public final class Z/DefaultImpls { inner class Z/DefaultImpls private static method extension(p0: Z): java.lang.String } - public final class Z2 { public final static field INSTANCE: Z2 private method (): void diff --git a/compiler/testData/codegen/light-analysis/traits/syntheticAccessor.txt b/compiler/testData/codegen/light-analysis/traits/syntheticAccessor.txt index d65be80d2c5..29ec7144c5d 100644 --- a/compiler/testData/codegen/light-analysis/traits/syntheticAccessor.txt +++ b/compiler/testData/codegen/light-analysis/traits/syntheticAccessor.txt @@ -3,25 +3,21 @@ public interface B { inner class B/Z } - public final class B/DefaultImpls { inner class B/DefaultImpls private static method test(p0: B): void } - public final static class B/Z { inner class B/Z public method (): void public final method ztest(@org.jetbrains.annotations.NotNull p0: B): void } - public final class C { public method (): void } - public final class SyntheticAccessorKt { private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/traits/traitImplDelegationWithCovariantOverride.txt b/compiler/testData/codegen/light-analysis/traits/traitImplDelegationWithCovariantOverride.txt index 32f8926294e..d73b29b392a 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitImplDelegationWithCovariantOverride.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitImplDelegationWithCovariantOverride.txt @@ -3,31 +3,26 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.Number } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A): java.lang.Number } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.lang.Number } - public final class C { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.Integer public synthetic method foo(): java.lang.Number } - public final class TraitImplDelegationWithCovariantOverrideKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/traitImplDiamond.txt b/compiler/testData/codegen/light-analysis/traits/traitImplDiamond.txt index 231718fc361..735783a0425 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitImplDiamond.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitImplDiamond.txt @@ -3,53 +3,44 @@ public interface A { public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: A): java.lang.String } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: B): java.lang.String } - public interface C { inner class C/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class C/DefaultImpls { inner class C/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: C): java.lang.String } - public interface D { inner class D/DefaultImpls } - public final class D/DefaultImpls { inner class D/DefaultImpls public static @org.jetbrains.annotations.NotNull method foo(p0: D): java.lang.String } - public final class Impl { public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class TraitImplDiamondKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/traitImplGenericDelegation.txt b/compiler/testData/codegen/light-analysis/traits/traitImplGenericDelegation.txt index ed8a277afd6..a1b447d7183 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitImplGenericDelegation.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitImplGenericDelegation.txt @@ -3,24 +3,20 @@ public interface A { public abstract @org.jetbrains.annotations.Nullable method foo(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.Number): java.lang.Object } - public final class A/DefaultImpls { inner class A/DefaultImpls public static @org.jetbrains.annotations.Nullable method foo(p0: A, @org.jetbrains.annotations.NotNull p1: java.lang.Object, p2: java.lang.Number): java.lang.Object } - public interface B { inner class B/DefaultImpls } - public final class B/DefaultImpls { inner class B/DefaultImpls public static @org.jetbrains.annotations.Nullable method foo(p0: B, p1: java.lang.Object, p2: int): java.lang.Object } - public final class C { public method (): void public @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): Runnable @@ -28,12 +24,10 @@ public final class C { public synthetic method foo(p0: java.lang.Object, p1: java.lang.Number): java.lang.Object } - public interface Runnable { public abstract method run(): void } - public final class TraitImplGenericDelegationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateExtension.txt b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateExtension.txt index 3c62872f7af..05ca9b19881 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateExtension.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateExtension.txt @@ -4,24 +4,20 @@ public class B { public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String } - public final class BB { public method (): void } - public final class TraitWithPrivateExtensionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method getString(@org.jetbrains.annotations.NotNull p0: B): java.lang.String public abstract @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: B): java.lang.String } - public final class Z/DefaultImpls { inner class Z/DefaultImpls private static method extension(@org.jetbrains.annotations.NotNull p0: Z, p1: B): java.lang.String @@ -29,7 +25,6 @@ public final class Z/DefaultImpls { public static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Z, p1: B): java.lang.String } - public final class Z2 { public final static field INSTANCE: Z2 private method (): void diff --git a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMember.txt b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMember.txt index f8e5ca0f885..794daf2ae90 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMember.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMember.txt @@ -2,14 +2,12 @@ public final class TraitWithPrivateMemberKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method testFun(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method testProperty(): java.lang.String } - public final class Z/DefaultImpls { inner class Z/DefaultImpls private static method getPrivateProp(p0: Z): java.lang.String @@ -18,7 +16,6 @@ public final class Z/DefaultImpls { public static @org.jetbrains.annotations.NotNull method testProperty(p0: Z): java.lang.String } - public final class Z2 { public final static field INSTANCE: Z2 private method (): void diff --git a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMemberAccessFromLambda.txt b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMemberAccessFromLambda.txt index b6a92f1adb0..e01cd897d0d 100644 --- a/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMemberAccessFromLambda.txt +++ b/compiler/testData/codegen/light-analysis/traits/traitWithPrivateMemberAccessFromLambda.txt @@ -2,14 +2,12 @@ public final class TraitWithPrivateMemberAccessFromLambdaKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public interface Z { inner class Z/DefaultImpls public abstract @org.jetbrains.annotations.NotNull method testFun(): java.lang.String public abstract @org.jetbrains.annotations.NotNull method testProperty(): java.lang.String } - public final class Z/DefaultImpls { inner class Z/DefaultImpls private static method getPrivateProp(p0: Z): java.lang.String @@ -18,7 +16,6 @@ public final class Z/DefaultImpls { public static @org.jetbrains.annotations.NotNull method testProperty(p0: Z): java.lang.String } - public final class Z2 { public final static field INSTANCE: Z2 private method (): void diff --git a/compiler/testData/codegen/light-analysis/typeInfo/ifOrWhenSpecialCall.txt b/compiler/testData/codegen/light-analysis/typeInfo/ifOrWhenSpecialCall.txt index 3121ed25876..f0d9574dc7c 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/ifOrWhenSpecialCall.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/ifOrWhenSpecialCall.txt @@ -4,7 +4,6 @@ public final class IfOrWhenSpecialCallKt { public final static @org.jetbrains.annotations.NotNull method whenTest(p0: int): Option } - public final class None { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void @@ -13,12 +12,10 @@ public final class None { public @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public interface Option { public abstract @org.jetbrains.annotations.NotNull method getS(): java.lang.String } - public final class Some { private final @org.jetbrains.annotations.NotNull field s: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/typeInfo/implicitSmartCastThis.txt b/compiler/testData/codegen/light-analysis/typeInfo/implicitSmartCastThis.txt index 08ec4f8efec..6bfe24f14b5 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/implicitSmartCastThis.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/implicitSmartCastThis.txt @@ -2,13 +2,11 @@ public class A { public method (): void } - public final class B { public method (): void public final method foo(p0: int): int } - public final class ImplicitSmartCastThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method test(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/typeInfo/inheritance.txt b/compiler/testData/codegen/light-analysis/typeInfo/inheritance.txt index 7f9c6b3bd0d..a3871282e01 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/inheritance.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/inheritance.txt @@ -3,7 +3,6 @@ public class A { public final @org.jetbrains.annotations.NotNull method plus(p0: java.lang.Object): B } - public final class B { private final field e: java.lang.Object public method (p0: java.lang.Object): void @@ -11,7 +10,6 @@ public final class B { public final method getE(): java.lang.Object } - public final class InheritanceKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typeInfo/kt2811.txt b/compiler/testData/codegen/light-analysis/typeInfo/kt2811.txt index 06a568781c9..7f891c9b816 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/kt2811.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/kt2811.txt @@ -3,13 +3,11 @@ public final class Kt2811Kt { public final static @org.jetbrains.annotations.NotNull method test2(@org.jetbrains.annotations.NotNull p0: Test1): java.lang.String } - public class Test1 { public method (): void public final @org.jetbrains.annotations.NotNull method test1(): java.lang.String } - public final class Test2 { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/typeInfo/primitiveTypeInfo.txt b/compiler/testData/codegen/light-analysis/typeInfo/primitiveTypeInfo.txt index 86995fd16e1..c68b3fc0e5b 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/primitiveTypeInfo.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/primitiveTypeInfo.txt @@ -5,7 +5,6 @@ public final class Box { public final method setValue(p0: java.lang.Object): void } - public final class PrimitiveTypeInfoKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method isIntBox(@org.jetbrains.annotations.NotNull p0: Box): boolean diff --git a/compiler/testData/codegen/light-analysis/typeInfo/smartCastThis.txt b/compiler/testData/codegen/light-analysis/typeInfo/smartCastThis.txt index 91cdd48fa60..5602a138185 100644 --- a/compiler/testData/codegen/light-analysis/typeInfo/smartCastThis.txt +++ b/compiler/testData/codegen/light-analysis/typeInfo/smartCastThis.txt @@ -3,13 +3,11 @@ public class h/A { public final @org.jetbrains.annotations.NotNull method bar(): java.lang.String } - public final class h/B { public method (): void public final @org.jetbrains.annotations.NotNull method foo(): java.lang.String } - public final class h/SmartCastThisKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typeMapping/genericTypeWithNothing.txt b/compiler/testData/codegen/light-analysis/typeMapping/genericTypeWithNothing.txt index 52fc7b12a9f..39f4d1d87d7 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/genericTypeWithNothing.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/genericTypeWithNothing.txt @@ -2,19 +2,16 @@ public final class foo/A { public method (): void } - public final class foo/B { public method (): void } - public abstract class foo/C { public method (): void public abstract @org.jetbrains.annotations.Nullable method bar(): foo.A public abstract @org.jetbrains.annotations.NotNull method getFoo(): foo.A } - public final class foo/C1 { private final @org.jetbrains.annotations.NotNull field foo: foo.A public method (): void @@ -22,7 +19,6 @@ public final class foo/C1 { public @org.jetbrains.annotations.NotNull method getFoo(): foo.A } - public final class foo/C2 { private final @org.jetbrains.annotations.NotNull field foo: foo.A public method (): void @@ -30,13 +26,11 @@ public final class foo/C2 { public @org.jetbrains.annotations.NotNull method getFoo(): foo.A } - public final class foo/GenericTypeWithNothingKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method testAllDeclaredMembers(@org.jetbrains.annotations.NotNull p0: kotlin.reflect.KClass, p1: boolean): java.lang.String } - public final class foo/TestNotRaw { private final @org.jetbrains.annotations.NotNull field a1: foo.A private final @org.jetbrains.annotations.Nullable field a2: foo.A @@ -59,7 +53,6 @@ public final class foo/TestNotRaw { public final @org.jetbrains.annotations.NotNull method test2(@org.jetbrains.annotations.Nullable p0: foo.A, @org.jetbrains.annotations.NotNull p1: foo.B): foo.B } - public final class foo/TestRaw { private final @org.jetbrains.annotations.NotNull field a1: foo.A private final @org.jetbrains.annotations.Nullable field a2: foo.A diff --git a/compiler/testData/codegen/light-analysis/typeMapping/kt309.txt b/compiler/testData/codegen/light-analysis/typeMapping/kt309.txt index 82744104022..44f723c1d11 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/kt309.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/kt309.txt @@ -2,7 +2,6 @@ public final class Kt309Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class N { public method (): void public final @org.jetbrains.annotations.Nullable method foo(): java.lang.Void diff --git a/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt b/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt index a8644ad5b1f..96ea7926617 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt @@ -3,14 +3,12 @@ public final class Kt3863Kt { public final static @org.jetbrains.annotations.NotNull method notImplemented(): java.lang.Void } - public final class NotImplemented { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.Object public final @org.jetbrains.annotations.NotNull method setValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty, p2: java.lang.Object): java.lang.Void } - public final class Test { private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: NotImplemented diff --git a/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt b/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt index 916bbab79fb..08e43de6e6f 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt @@ -6,7 +6,6 @@ public final class Kt3976Kt { public final static method setCurrentAccountId(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): void } - public final class SessionAccessor { public method (): void public final method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Void, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/typeMapping/typeParameterMultipleBounds.txt b/compiler/testData/codegen/light-analysis/typeMapping/typeParameterMultipleBounds.txt index 9e7e443a31d..e16562d0732 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/typeParameterMultipleBounds.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/typeParameterMultipleBounds.txt @@ -2,13 +2,10 @@ public class C { public method (): void } - public interface I1 - public interface I2 - public interface K { public abstract method c1(@org.jetbrains.annotations.NotNull p0: C): void public abstract method c2(@org.jetbrains.annotations.NotNull p0: C): void @@ -18,7 +15,6 @@ public interface K { public abstract method i2(@org.jetbrains.annotations.NotNull p0: I2): void } - public final class TypeParameterMultipleBoundsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/genericTypeAliasConstructor.txt b/compiler/testData/codegen/light-analysis/typealias/genericTypeAliasConstructor.txt index 3ecf48fcb0c..db1fa63ded5 100644 --- a/compiler/testData/codegen/light-analysis/typealias/genericTypeAliasConstructor.txt +++ b/compiler/testData/codegen/light-analysis/typealias/genericTypeAliasConstructor.txt @@ -4,7 +4,6 @@ public final class Cell { public final method getX(): java.lang.Object } - public final class GenericTypeAliasConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructor.txt b/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructor.txt index 50af437b98a..c3accbd256b 100644 --- a/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructor.txt +++ b/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructor.txt @@ -2,7 +2,6 @@ public final class InnerClassTypeAliasConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field x: java.lang.String inner class Outer/Inner @@ -10,7 +9,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class Outer/Inner { synthetic final field this$0: Outer private final @org.jetbrains.annotations.NotNull field y: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructorInSupertypes.txt b/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructorInSupertypes.txt index 4b6c45aab23..95b61f8ddf3 100644 --- a/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructorInSupertypes.txt +++ b/compiler/testData/codegen/light-analysis/typealias/innerClassTypeAliasConstructorInSupertypes.txt @@ -2,7 +2,6 @@ public final class InnerClassTypeAliasConstructorInSupertypesKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class Outer { private final @org.jetbrains.annotations.NotNull field x: java.lang.String inner class Outer/Inner @@ -11,7 +10,6 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class Outer/Inner { synthetic final field this$0: Outer private final @org.jetbrains.annotations.NotNull field y: java.lang.String @@ -22,7 +20,6 @@ public final class Outer/Inner { public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String } - public abstract class Outer/InnerBase { synthetic final field this$0: Outer inner class Outer/InnerBase diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasCompanion.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasCompanion.txt index f7d1b0f37f3..794caacaf85 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasCompanion.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasCompanion.txt @@ -5,14 +5,12 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String } - public final class TypeAliasCompanionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructor.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructor.txt index 0bac592bbbe..f35a79665a6 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructor.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructor.txt @@ -4,7 +4,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class TypeAliasConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorAccessor.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorAccessor.txt index a842c19aff7..2345a44af20 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorAccessor.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorAccessor.txt @@ -5,14 +5,12 @@ public final class Outer { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final static class Outer/Nested { inner class Outer/Nested public method (): void public final @org.jetbrains.annotations.NotNull method foo(): Outer } - public final class TypeAliasConstructorAccessorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorInSuperCall.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorInSuperCall.txt index 0382297b5f6..17528fc851a 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorInSuperCall.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasConstructorInSuperCall.txt @@ -2,19 +2,16 @@ public final class C1 { public method (): void } - public final class C2 { public method (): void } - public class Cell { private final field value: java.lang.Object public method (p0: java.lang.Object): void public final method getValue(): java.lang.Object } - public final class TypeAliasConstructorInSuperCallKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasInAnonymousObjectType.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasInAnonymousObjectType.txt index d8d1b0e860a..9d4ef698e20 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasInAnonymousObjectType.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasInAnonymousObjectType.txt @@ -4,7 +4,6 @@ public class Foo { public final method getX(): java.lang.Object } - public final class TypeAliasInAnonymousObjectTypeKt { private final static @org.jetbrains.annotations.NotNull field test: Foo public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasObject.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasObject.txt index 7762f904ae3..6e4dda1fd53 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasObject.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasObject.txt @@ -5,14 +5,12 @@ public final class KHolder { public method (): void } - public final static class KHolder/Companion { inner class KHolder/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String } - public final class OHolder { public final static field INSTANCE: OHolder private final static @org.jetbrains.annotations.NotNull field O: java.lang.String @@ -20,7 +18,6 @@ public final class OHolder { public final @org.jetbrains.annotations.NotNull method getO(): java.lang.String } - public final class TypeAliasObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasObjectCallable.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasObjectCallable.txt index 8c12dcc6cb2..1f926f189b2 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasObjectCallable.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasObjectCallable.txt @@ -6,7 +6,6 @@ public final class O { public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String } - public final class TypeAliasObjectCallableKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/typealias/typeAliasSecondaryConstructor.txt b/compiler/testData/codegen/light-analysis/typealias/typeAliasSecondaryConstructor.txt index 2ecf1d8a2e3..4048b0ff5f2 100644 --- a/compiler/testData/codegen/light-analysis/typealias/typeAliasSecondaryConstructor.txt +++ b/compiler/testData/codegen/light-analysis/typealias/typeAliasSecondaryConstructor.txt @@ -5,7 +5,6 @@ public final class C { public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String } - public final class TypeAliasSecondaryConstructorKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/unit/ifElse.txt b/compiler/testData/codegen/light-analysis/unit/ifElse.txt index fe076ddc449..6f309c3f904 100644 --- a/compiler/testData/codegen/light-analysis/unit/ifElse.txt +++ b/compiler/testData/codegen/light-analysis/unit/ifElse.txt @@ -16,7 +16,6 @@ public final class A { public final method setCond2(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } - public final class IfElseKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/callProperty.txt b/compiler/testData/codegen/light-analysis/when/callProperty.txt index 0897edbe0ef..630661b3aea 100644 --- a/compiler/testData/codegen/light-analysis/when/callProperty.txt +++ b/compiler/testData/codegen/light-analysis/when/callProperty.txt @@ -4,7 +4,6 @@ public final class C { public final method getP(): boolean } - public final class CallPropertyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/emptyWhen.txt b/compiler/testData/codegen/light-analysis/when/emptyWhen.txt index 849f39582ac..d5c87d55b32 100644 --- a/compiler/testData/codegen/light-analysis/when/emptyWhen.txt +++ b/compiler/testData/codegen/light-analysis/when/emptyWhen.txt @@ -6,7 +6,6 @@ public enum class A { public static method values(): A[] } - public final class EmptyWhenKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/bigEnum.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/bigEnum.txt index b0576964bbd..c0fbf604f15 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/bigEnum.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/bigEnum.txt @@ -24,7 +24,6 @@ public enum class BigEnum { public static method values(): BigEnum[] } - public final class BigEnumKt { public final static @org.jetbrains.annotations.NotNull method bar1(@org.jetbrains.annotations.NotNull p0: BigEnum): java.lang.String public final static @org.jetbrains.annotations.NotNull method bar2(@org.jetbrains.annotations.NotNull p0: BigEnum): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/duplicatingItems.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/duplicatingItems.txt index 9b9b47ba1fa..78c30eace29 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/duplicatingItems.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/duplicatingItems.txt @@ -3,7 +3,6 @@ public final class DuplicatingItemsKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/enumInsideClassObject.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/enumInsideClassObject.txt index 69ce5cfb7f3..5bcd2503fc2 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/enumInsideClassObject.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/enumInsideClassObject.txt @@ -4,14 +4,12 @@ public final class A { public method (): void } - public final static class A/Companion { inner class A/Companion inner class A/Companion/Season private method (): void } - public static enum class A/Companion/Season { public final static field AUTUMN: A.Companion.Season public final static field SPRING: A.Companion.Season @@ -24,7 +22,6 @@ public static enum class A/Companion/Season { public static method values(): A.Companion.Season[] } - public final class EnumInsideClassObjectKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A.Companion.Season): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/expression.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/expression.txt index df3f1c9fa7f..538b1f3279b 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/expression.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/expression.txt @@ -4,7 +4,6 @@ public final class ExpressionKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/functionLiteralInTopLevel.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/functionLiteralInTopLevel.txt index 64528ecd830..dada9afc3b4 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/functionLiteralInTopLevel.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/functionLiteralInTopLevel.txt @@ -3,7 +3,6 @@ public final class FunctionLiteralInTopLevelKt { public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Season, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.String } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/manyWhensWithinClass.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/manyWhensWithinClass.txt index 3ef9bc8480a..fffd88c69ac 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/manyWhensWithinClass.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/manyWhensWithinClass.txt @@ -5,12 +5,10 @@ public final class A { private final method bar3(p0: Season, p1: kotlin.jvm.functions.Function1): java.lang.String } - public final class ManyWhensWithinClassKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/nonConstantEnum.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/nonConstantEnum.txt index 76aa51a9056..e362cff34f7 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/nonConstantEnum.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/nonConstantEnum.txt @@ -4,7 +4,6 @@ public final class NonConstantEnumKt { public final static @org.jetbrains.annotations.NotNull method foo(): Season } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/nullability.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/nullability.txt index 71ef13b7f3b..c845e1b3dcb 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/nullability.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/nullability.txt @@ -4,7 +4,6 @@ public final class NullabilityKt { public final static @org.jetbrains.annotations.NotNull method foo2(@org.jetbrains.annotations.Nullable p0: Season): java.lang.String } - public enum class Season { public final static field AUTUMN: Season public final static field SPRING: Season diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/nullableEnum.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/nullableEnum.txt index f03ceb0994a..e9d0cc19474 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/nullableEnum.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/nullableEnum.txt @@ -6,7 +6,6 @@ public enum class E { public static method values(): E[] } - public final class NullableEnumKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.Nullable p0: E): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/subjectAny.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/subjectAny.txt index 7ff9c6fa58c..174d870a795 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/subjectAny.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/subjectAny.txt @@ -8,7 +8,6 @@ public enum class Season { public static method values(): Season[] } - public final class SubjectAnyKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/when/enumOptimization/withoutElse.txt b/compiler/testData/codegen/light-analysis/when/enumOptimization/withoutElse.txt index fd09f98a181..a84b1cc86b7 100644 --- a/compiler/testData/codegen/light-analysis/when/enumOptimization/withoutElse.txt +++ b/compiler/testData/codegen/light-analysis/when/enumOptimization/withoutElse.txt @@ -8,7 +8,6 @@ public enum class Season { public static method values(): Season[] } - public final class WithoutElseKt { public final static @org.jetbrains.annotations.NotNull method bar1(@org.jetbrains.annotations.NotNull p0: Season): java.lang.String public final static @org.jetbrains.annotations.NotNull method bar2(@org.jetbrains.annotations.NotNull p0: Season): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/when/exhaustiveBreakContinue.txt b/compiler/testData/codegen/light-analysis/when/exhaustiveBreakContinue.txt index 8b475bde847..e6604fbe245 100644 --- a/compiler/testData/codegen/light-analysis/when/exhaustiveBreakContinue.txt +++ b/compiler/testData/codegen/light-analysis/when/exhaustiveBreakContinue.txt @@ -7,7 +7,6 @@ public enum class Color { public static method values(): Color[] } - public final class ExhaustiveBreakContinueKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: Color[]): Color diff --git a/compiler/testData/codegen/light-analysis/when/exhaustiveWhenInitialization.txt b/compiler/testData/codegen/light-analysis/when/exhaustiveWhenInitialization.txt index 5d746fcb04f..bac9e46b353 100644 --- a/compiler/testData/codegen/light-analysis/when/exhaustiveWhenInitialization.txt +++ b/compiler/testData/codegen/light-analysis/when/exhaustiveWhenInitialization.txt @@ -5,7 +5,6 @@ public enum class A { public static method values(): A[] } - public final class ExhaustiveWhenInitializationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/exhaustiveWhenReturn.txt b/compiler/testData/codegen/light-analysis/when/exhaustiveWhenReturn.txt index d30921c9711..e3bea8203be 100644 --- a/compiler/testData/codegen/light-analysis/when/exhaustiveWhenReturn.txt +++ b/compiler/testData/codegen/light-analysis/when/exhaustiveWhenReturn.txt @@ -5,7 +5,6 @@ public enum class A { public static method values(): A[] } - public final class ExhaustiveWhenReturnKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/kt5448.txt b/compiler/testData/codegen/light-analysis/when/kt5448.txt index 89a32a74618..374399a49ca 100644 --- a/compiler/testData/codegen/light-analysis/when/kt5448.txt +++ b/compiler/testData/codegen/light-analysis/when/kt5448.txt @@ -2,21 +2,18 @@ public final class A { public method (): void } - public final class B { private final @org.jetbrains.annotations.NotNull field items: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void public final @org.jetbrains.annotations.NotNull method getItems(): java.util.Collection } - public final class C { public method (): void public final @org.jetbrains.annotations.NotNull method bar(): B public final method foo(p0: int): void } - public final class Kt5448Kt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/longInRange.txt b/compiler/testData/codegen/light-analysis/when/longInRange.txt index 793ff2a4ae2..2e23eee881d 100644 --- a/compiler/testData/codegen/light-analysis/when/longInRange.txt +++ b/compiler/testData/codegen/light-analysis/when/longInRange.txt @@ -2,7 +2,6 @@ public final class LongInRangeKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } - public final class LongR { public method (): void public final method contains(p0: long): boolean diff --git a/compiler/testData/codegen/light-analysis/when/noElseExhaustive.txt b/compiler/testData/codegen/light-analysis/when/noElseExhaustive.txt index 760e0b51b0a..f3ed4957d2b 100644 --- a/compiler/testData/codegen/light-analysis/when/noElseExhaustive.txt +++ b/compiler/testData/codegen/light-analysis/when/noElseExhaustive.txt @@ -6,7 +6,6 @@ public enum class En { public static method values(): En[] } - public final class NoElseExhaustiveKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/noElseExhaustiveStatement.txt b/compiler/testData/codegen/light-analysis/when/noElseExhaustiveStatement.txt index 4df11670f62..cbb6de50b7b 100644 --- a/compiler/testData/codegen/light-analysis/when/noElseExhaustiveStatement.txt +++ b/compiler/testData/codegen/light-analysis/when/noElseExhaustiveStatement.txt @@ -6,7 +6,6 @@ public enum class En { public static method values(): En[] } - public final class NoElseExhaustiveStatementKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/noElseExhaustiveUnitExpected.txt b/compiler/testData/codegen/light-analysis/when/noElseExhaustiveUnitExpected.txt index feafa8fd2d0..3ce710b973e 100644 --- a/compiler/testData/codegen/light-analysis/when/noElseExhaustiveUnitExpected.txt +++ b/compiler/testData/codegen/light-analysis/when/noElseExhaustiveUnitExpected.txt @@ -6,7 +6,6 @@ public enum class En { public static method values(): En[] } - public final class NoElseExhaustiveUnitExpectedKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/when/sealedWhenInitialization.txt b/compiler/testData/codegen/light-analysis/when/sealedWhenInitialization.txt index 8efd41e69cf..00d49c0ddc2 100644 --- a/compiler/testData/codegen/light-analysis/when/sealedWhenInitialization.txt +++ b/compiler/testData/codegen/light-analysis/when/sealedWhenInitialization.txt @@ -4,20 +4,17 @@ public abstract class A { private method (): void } - public final class A/B { public final static field INSTANCE: A.B inner class A/B private method (): void } - public final static class A/C { inner class A/C public method (): void } - public final class SealedWhenInitializationKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt index 9d8ac3be068..96080a0d7a0 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt @@ -83,7 +83,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() { val visitor = TextCollectingVisitor() cr.accept(visitor, ClassReader.SKIP_CODE) KotlinTestUtils.replaceHash(visitor.text, "HASH") - }.joinToString("\n\n") + }.joinToString("\n\n", postfix = "\n") KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles) } @@ -130,7 +130,9 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() { val text: String get() = StringBuilder().apply { - append(classAnnotations.joinToString("\n", postfix = "\n")) + if (classAnnotations.isNotEmpty()) { + append(classAnnotations.joinToString("\n", postfix = "\n")) + } arrayListOf().apply { handleModifiers(classAccess, this) }.forEach { append(it) } append(classOrInterface(classAccess)) append(" ")