From 2e2e6331136ff75e9eb9be778207774b2b8e3969 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 22 Dec 2022 16:38:49 +0100 Subject: [PATCH] [LC] fix PsiClassRenderer --- .../AbstractSymbolLightClassesTestBase.kt | 7 +- .../AnnotatedParameterInEnumConstructor.java | 1 - ...tatedParameterInInnerClassConstructor.java | 15 ++- .../AnnotatedPropertyWithSites.fir.java | 1 - .../AnnotatedPropertyWithSites.java | 3 +- .../lightClassByFqName/AnnotationClass.java | 1 - .../AnnotationJavaRepeatable.java | 1 - .../AnnotationJvmRepeatable.java | 3 +- .../AnnotationKotlinAndJavaRepeatable.java | 3 +- .../AnnotationKotlinAndJvmRepeatable.java | 3 +- .../AnnotationRepeatable.java | 13 +- .../lightClassByFqName/Constructors.java | 3 +- ...ClassWithCustomImplementedMembers.fir.java | 99 ++++++++------- ...DataClassWithCustomImplementedMembers.java | 93 +++++++------- .../DelegatedNested.fir.java | 21 ++-- .../lightClassByFqName/DelegatedNested.java | 17 ++- .../lightClassByFqName/Delegation.fir.java | 1 - .../lightClassByFqName/Delegation.java | 1 - .../DeprecatedEnumEntry.java | 1 - .../DeprecatedNotHiddenInClass.java | 3 +- .../lightClassByFqName/DollarsInName.java | 21 ++-- .../DollarsInNameNoPackage.java | 21 ++-- .../lightClassByFqName/EnumClass.java | 1 - .../EnumClassWithEnumEntries.java | 1 - .../lightClassByFqName/EnumEntry.fir.java | 1 - .../lightClassByFqName/EnumEntry.java | 1 - .../lightClassByFqName/EnumEntry.lib.java | 1 - ...xtendingInterfaceWithDefaultImpls.fir.java | 11 +- .../ExtendingInterfaceWithDefaultImpls.java | 19 ++- .../HiddenDeprecatedInClass.java | 3 +- ...eritingInterfaceDefaultImpls.compiled.java | 3 +- .../InheritingInterfaceDefaultImpls.fir.java | 1 - .../InheritingInterfaceDefaultImpls.java | 1 - .../InheritingInterfaceDefaultImpls.lib.java | 1 - .../lightClassByFqName/InlineReified.java | 3 +- .../lightClassByFqName/JavaBetween.java | 3 +- .../lightClassByFqName/JvmNameOnMember.java | 3 +- .../lightClassByFqName/JvmStatic.java | 27 ++-- .../lightClassByFqName/LocalFunctions.java | 3 +- .../LocalFunctions.lib.java | 1 - .../lightClassByFqName/NestedObjects.java | 59 +++++---- ...onDataClassWithComponentFunctions.fir.java | 1 - .../NonDataClassWithComponentFunctions.java | 1 - .../OnlySecondaryConstructors.java | 1 - .../lightClassByFqName/PublishedApi.java | 3 +- .../SpecialAnnotationsOnAnnotationClass.java | 19 ++- .../StubOrderForOverloads.java | 3 +- .../TypePararametersInClass.java | 15 ++- .../lightClassByFqName/VarArgs.java | 3 +- .../compilationErrors/ActualClass.java | 3 +- .../AnnotationModifiers.fir.java | 1 - .../AnnotationModifiers.java | 1 - .../compilationErrors/EnumNameOverride.java | 1 - .../FunctionWithoutName.fir.java | 1 - .../FunctionWithoutName.java | 3 +- .../compilationErrors/JvmPackageName.java | 3 +- .../compilationErrors/PrivateInTrait.fir.java | 13 +- .../compilationErrors/PrivateInTrait.java | 13 +- .../PropertyWithoutName.java | 1 - .../RepetableAnnotations.java | 3 +- .../compilationErrors/SameName.java | 3 +- .../TopLevelDestructuring.java | 3 +- .../TraitClassObjectField.java | 17 ++- .../compilationErrors/TwoOverrides.fir.java | 1 - .../compilationErrors/TwoOverrides.java | 3 +- .../WrongAnnotations.fir.java | 33 +++-- .../compilationErrors/WrongAnnotations.java | 33 +++-- .../delegation/Function.fir.java | 1 - .../delegation/Function.java | 1 - .../delegation/Property.fir.java | 1 - .../delegation/Property.java | 3 +- .../lightClassByFqName/facades/MultiFile.java | 3 +- .../facades/SingleFile.java | 3 +- .../facades/SingleJvmClassName.java | 3 +- .../AllOpenAnnotatedClasses.fir.java | 21 ++-- .../AllOpenAnnotatedClasses.java | 21 ++-- ...ImplementingCharSequenceAndNumber.fir.java | 59 +++++---- .../ImplementingCharSequenceAndNumber.java | 42 +++---- .../ideRegression/ImplementingMap.fir.java | 1 - .../ideRegression/ImplementingMap.java | 3 +- .../ImplementingMutableSet.fir.java | 21 ++-- .../ideRegression/ImplementingMutableSet.java | 21 ++-- .../InheritingInterfaceDefaultImpls.fir.java | 1 - .../InheritingInterfaceDefaultImpls.java | 1 - .../InheritingInterfaceDefaultImpls.lib.java | 1 - .../OverridingFinalInternal.fir.java | 1 - .../OverridingFinalInternal.java | 3 +- .../ideRegression/OverridingInternal.fir.java | 1 - .../ideRegression/OverridingInternal.java | 3 +- .../OverridingProtected.fir.java | 1 - .../ideRegression/OverridingProtected.java | 3 +- .../nullabilityAnnotations/Class.java | 3 +- .../ClassObjectField.java | 13 +- .../ClassWithConstructor.java | 3 +- .../ClassWithConstructorAndProperties.java | 3 +- .../nullabilityAnnotations/FileFacade.java | 3 +- .../nullabilityAnnotations/Generic.java | 3 +- .../IntOverridesAny.fir.java | 1 - .../IntOverridesAny.java | 3 +- .../nullabilityAnnotations/JvmOverloads.java | 3 +- .../NullableUnitReturn.java | 3 +- .../OverrideAnyWithUnit.fir.java | 1 - .../OverrideAnyWithUnit.java | 1 - .../nullabilityAnnotations/PlatformTypes.java | 3 +- .../nullabilityAnnotations/Primitives.java | 3 +- .../PrivateInClass.java | 3 +- .../nullabilityAnnotations/Synthetic.java | 11 +- .../nullabilityAnnotations/Trait.java | 3 +- .../UnitAsGenericArgument.fir.java | 1 - .../UnitAsGenericArgument.java | 1 - .../nullabilityAnnotations/UnitParameter.java | 3 +- .../nullabilityAnnotations/VoidReturn.java | 3 +- .../object/SimpleObject.java | 3 +- .../publicField/CompanionObject.java | 9 +- .../publicField/Simple.java | 3 +- .../lightClassByFqName/script/HelloWorld.java | 3 +- .../script/InnerClasses.java | 27 ++-- .../LateinitProperties.fir.java | 12 +- .../lightClassByPsi/LateinitProperties.java | 12 +- .../LateinitProperties.lib.java | 12 +- ...nnotationWithSetParamPropertyModifier.java | 3 +- .../lightClassByPsi/annotations.fir.java | 15 +-- .../lightClassByPsi/annotations.java | 15 +-- .../lightClassByPsi/classModifiers.java | 21 +--- .../lightClassByPsi/classModifiers.lib.java | 21 +--- .../lightClassByPsi/constructors.fir.java | 17 +-- .../lightClassByPsi/constructors.java | 17 +-- .../lightClassByPsi/constructors.lib.java | 17 +-- .../lightClassByPsi/coroutines.fir.java | 5 - .../lightClassByPsi/coroutines.java | 5 - .../lightClassByPsi/coroutines.lib.java | 5 - .../lightClassByPsi/dataClasses.java | 4 +- ...faultMethodInKotlinWithSettingAll.fir.java | 4 +- .../defaultMethodInKotlinWithSettingAll.java | 3 +- ...odInKotlinWithSettingAllCompatibility.java | 4 +- .../delegatesWithAnnotations.fir.java | 4 - .../delegatesWithAnnotations.java | 6 +- .../delegatesWithAnnotations.lib.java | 4 - .../delegatingToInterfaces.fir.java | 3 - .../delegatingToInterfaces.java | 5 +- .../lightClassByPsi/dollarsInNameLocal.java | 16 +-- .../dollarsInNameLocal.lib.java | 1 - .../lightClasses/lightClassByPsi/enums.java | 49 +++----- .../lightClassByPsi/facades/coroutines.java | 3 +- .../facades/importAliases.java | 1 - .../lightClassByPsi/facades/inlineOnly.java | 1 - .../facades/inlineOnly.lib.java | 1 - .../lightClassByPsi/facades/jvmField.fir.java | 1 - .../lightClassByPsi/facades/jvmField.java | 3 +- .../lightClassByPsi/facades/jvmName.java | 3 +- .../facades/jvmWildcardAnnotations.fir.java | 7 -- .../facades/jvmWildcardAnnotations.java | 7 -- .../facades/lateinitProperty.fir.java | 1 - .../facades/lateinitProperty.java | 3 +- .../facades/multifileFacade.fir.java | 1 - .../facades/multifileFacade.java | 3 +- .../facades/multifileFacade.lib.java | 1 - .../facades/multifileFacadeJvmName.fir.java | 1 - .../facades/multifileFacadeJvmName.java | 4 +- .../facades/multifileFacadeJvmName.lib.java | 1 - .../facades/properties.fir.java | 1 - .../lightClassByPsi/facades/properties.java | 3 +- .../facades/simpleFunctions.fir.java | 1 - .../facades/simpleFunctions.java | 3 +- .../facades/throwsAnnotation.fir.java | 2 - .../facades/throwsAnnotation.java | 2 - .../facades/throwsAnnotation.lib.java | 2 - .../facades/wildcardOptimization.java | 7 -- .../facades/wildcardOptimization.lib.java | 7 -- .../lightClassByPsi/generics.fir.java | 3 - .../lightClassByPsi/generics.java | 5 +- .../implementingKotlinCollections.fir.java | 3 - .../implementingKotlinCollections.java | 5 +- .../lightClassByPsi/importAliases.java | 3 +- .../inferringAnonymousObjectTypes.fir.java | 10 -- .../inferringAnonymousObjectTypes.java | 12 +- .../lightClassByPsi/inheritance.fir.java | 6 - .../lightClassByPsi/inheritance.java | 8 +- .../lightClassByPsi/inlineClasses.fir.java | 4 - .../lightClassByPsi/inlineClasses.java | 3 - .../lightClassByPsi/inlineOnly.java | 1 - .../lightClassByPsi/inlineOnly.lib.java | 1 - .../lightClassByPsi/inlineReified.java | 3 +- .../lightClassByPsi/jvmField.java | 13 +- .../lightClasses/lightClassByPsi/jvmName.java | 3 +- .../lightClassByPsi/jvmOverloads.fir.java | 5 +- .../lightClassByPsi/jvmOverloads.java | 5 +- .../lightClassByPsi/jvmRecord.java | 1 - .../jvmStaticOnPropertySetter.fir.java | 5 +- .../jvmStaticOnPropertySetter.java | 5 +- .../jvmStaticOnPropertySetter.lib.java | 5 +- .../lightClassByPsi/jvmSynthetic.fir.java | 1 - .../lightClassByPsi/jvmSynthetic.java | 1 - .../lightClassByPsi/jvmSynthetic.lib.java | 1 - .../jvmSyntheticForAccessors.fir.java | 1 - .../jvmSyntheticForAccessors.java | 3 +- .../jvmSyntheticForAccessors.lib.java | 1 - .../jvmWildcardAnnotations.fir.java | 9 -- .../jvmWildcardAnnotations.java | 11 +- .../jvmWildcardAnnotations.lib.java | 9 -- .../lightClassByPsi/lateinitProperty.fir.java | 4 - .../lightClassByPsi/lateinitProperty.java | 4 - .../localClassDerived.fir.java | 3 - .../lightClassByPsi/localClassDerived.java | 5 +- .../lightClassByPsi/objects.fir.java | 26 +--- .../lightClasses/lightClassByPsi/objects.java | 26 +--- .../lightClassByPsi/properties.java | 11 +- .../lightClassByPsi/script.lib.java | 1 - .../lightClassByPsi/simpleFunctions.fir.java | 5 +- .../lightClassByPsi/simpleFunctions.java | 5 +- .../lightClassByPsi/throwsAnnotation.fir.java | 2 - .../lightClassByPsi/throwsAnnotation.java | 2 - .../lightClassByPsi/throwsAnnotation.lib.java | 2 - .../lightClassByPsi/typeAliases.java | 1 - .../lightClassByPsi/typeAliases.lib.java | 1 - .../lightClassByPsi/typeAnnotations.fir.java | 3 - .../lightClassByPsi/typeAnnotations.java | 5 +- .../lightClassByPsi/wildcardOptimization.java | 9 +- .../wildcardOptimization.lib.java | 7 -- .../ultraLightScripts/FunsPropsAndFields.java | 3 +- .../ultraLightScripts/HelloWorld.java | 3 +- .../ultraLightScripts/InnerClasses.java | 4 +- compiler/tests-common/build.gradle.kts | 1 + .../kotlin/asJava/PsiClassRenderer.kt | 117 +++++++++--------- 224 files changed, 595 insertions(+), 1143 deletions(-) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt index d94e15e82fd..dcda0008b08 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt @@ -103,11 +103,8 @@ abstract class AbstractSymbolLightClassesTestBase( testServices: TestServices, actual: String, ) { - if (currentResultPath().exists()) { - testServices.assertions.assertEqualsToFile(currentResultPath(), actual) - } else { - testServices.assertions.assertEqualsToFile(javaPath(), actual) - } + val path: Path = currentResultPath().takeIf { it.exists() } ?: javaPath() + testServices.assertions.assertEqualsToFile(path, actual) } private fun removeIgnoreFir(module: TestModule) { diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java index 8ea9ad2c0b6..b7e61e6389b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java @@ -8,5 +8,4 @@ public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnum public static test.AnnotatedParameterInEnumConstructor[] values();// values() private AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java index 09263b278b3..e8b7368a478 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java @@ -1,12 +1,11 @@ public final class AnnotatedParameterInInnerClassConstructor /* test.AnnotatedParameterInInnerClassConstructor*/ { public AnnotatedParameterInInnerClassConstructor();// .ctor() + public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ { + public Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String) + } - -public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ { - public Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String) - -}public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/ { - public InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(T, java.lang.String) - -}} \ No newline at end of file + public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/ { + public InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(T, java.lang.String) + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java index 2b2d7ea0854..33b3d3b3c77 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java @@ -20,5 +20,4 @@ public final class Test /* Test*/ { public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);// fooWithNullableReceiver(java.lang.Integer, long) public final void setFooP(@MyAnnotation7() @org.jetbrains.annotations.NotNull() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);// setFooP(int, kotlin.Unit) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java index 94c1c74b00e..70105399756 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java @@ -20,5 +20,4 @@ public final class Test /* Test*/ { public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);// fooWithNullableReceiver(java.lang.Integer, long) public final void setFooP(@MyAnnotation7() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);// setFooP(int, kotlin.Unit) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java index 722eaff771f..e798f32e8fc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java @@ -11,5 +11,4 @@ public abstract @interface Anno /* Anno*/ { public abstract int[] ia2() default {1, 2, 3};// ia2() public abstract java.lang.String value() default "a";// value() - } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java index 830e4a90cf7..40f5bb71323 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java @@ -2,5 +2,4 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Two /* Two*/ { public abstract java.lang.String name();// name() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java index 8680b3814a7..40f5bb71323 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java @@ -2,5 +2,4 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Two /* Two*/ { public abstract java.lang.String name();// name() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java index b0a0e83e2a3..6b6485da231 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java @@ -3,5 +3,4 @@ @kotlin.annotation.Repeatable() public abstract @interface Two /* Two*/ { public abstract java.lang.String name();// name() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java index b0a0e83e2a3..6b6485da231 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java @@ -3,5 +3,4 @@ @kotlin.annotation.Repeatable() public abstract @interface Two /* Two*/ { public abstract java.lang.String name();// name() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java index d900225c12b..18de8da1e4a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java @@ -4,10 +4,9 @@ public abstract @interface One /* simple.One*/ { public abstract java.lang.String value();// value() - -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kotlin.jvm.internal.RepeatableContainer() -public static abstract @interface Container /* simple.One.Container*/ { - public abstract simple.One[] value();// value() - -}} \ No newline at end of file + @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) + @kotlin.jvm.internal.RepeatableContainer() + public static abstract @interface Container /* simple.One.Container*/ { + public abstract simple.One[] value();// value() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java index 82f1c944e99..49f7e80914b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java @@ -8,5 +8,4 @@ public final class Constructors /* Constructors*/ { public Constructors(int);// .ctor(int) public final int getValInPrimary();// getValInPrimary() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java index fe218250d55..21be9b16c76 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java @@ -1,76 +1,75 @@ public final class Wrapper /* p.Wrapper*/ { public Wrapper();// .ctor() + public static final class Equals /* p.Wrapper.Equals*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; + @java.lang.Override() + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() -public static final class Equals /* p.Wrapper.Equals*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() - @java.lang.Override() - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) + public int hashCode();// hashCode() + } - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() + public static final class HashCode /* p.Wrapper.HashCode*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; - public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) + @java.lang.Override() + public int hashCode();// hashCode() - public int hashCode();// hashCode() + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() -}public static final class HashCode /* p.Wrapper.HashCode*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() - @java.lang.Override() - public int hashCode();// hashCode() + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + } - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() + public static final class ToString /* p.Wrapper.ToString*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; - public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() -}public static final class ToString /* p.Wrapper.ToString*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() - @java.lang.Override() - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - - public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - - public int hashCode();// hashCode() - -}} + public int hashCode();// hashCode() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java index 098b3f162a6..99b1e498346 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java @@ -1,73 +1,72 @@ public final class Wrapper /* p.Wrapper*/ { public Wrapper();// .ctor() + public static final class Equals /* p.Wrapper.Equals*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() -public static final class Equals /* p.Wrapper.Equals*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() + public int hashCode();// hashCode() + } - public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) + public static final class HashCode /* p.Wrapper.HashCode*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() - public int hashCode();// hashCode() + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() -}public static final class HashCode /* p.Wrapper.HashCode*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() + public int hashCode();// hashCode() + } - public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) + public static final class ToString /* p.Wrapper.ToString*/ { + @org.jetbrains.annotations.NotNull() + private final p.G code; - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + @org.jetbrains.annotations.NotNull() + public final p.G component1();// component1() - public int hashCode();// hashCode() + @org.jetbrains.annotations.NotNull() + public final p.G getCode();// getCode() -}public static final class ToString /* p.Wrapper.ToString*/ { - @org.jetbrains.annotations.NotNull() - private final p.G code; + @org.jetbrains.annotations.NotNull() + public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) - @org.jetbrains.annotations.NotNull() - public final p.G component1();// component1() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() - @org.jetbrains.annotations.NotNull() - public final p.G getCode();// getCode() + public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - @org.jetbrains.annotations.NotNull() - public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G) + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() - - public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G) - - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - - public int hashCode();// hashCode() - -}} + public int hashCode();// hashCode() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java index 161dfc7876f..26ee9a7ff1e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java @@ -1,17 +1,16 @@ public final class B /* p.B*/ { public B();// .ctor() + public static final class A /* p.B.A*/ implements p.I { + @org.jetbrains.annotations.NotNull() + private final p.I f; -public static final class A /* p.B.A*/ implements p.I { - @org.jetbrains.annotations.NotNull() - private final p.I f; + @java.lang.Override() + public void f();// f() - @java.lang.Override() - public void f();// f() + @java.lang.Override() + public void g();// g() - @java.lang.Override() - public void g();// g() - - public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I) - -}} + public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I) + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java index 3c01b4ec7f1..93a2ed20316 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java @@ -1,15 +1,14 @@ public final class B /* p.B*/ { public B();// .ctor() + public static final class A /* p.B.A*/ implements p.I { + @org.jetbrains.annotations.NotNull() + private final p.I f; -public static final class A /* p.B.A*/ implements p.I { - @org.jetbrains.annotations.NotNull() - private final p.I f; + public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I) - public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I) + public void f();// f() - public void f();// f() - - public void g();// g() - -}} + public void g();// g() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java index 2afa56ca65c..d8d76a066b7 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java @@ -9,5 +9,4 @@ public final class B /* p.B*/ implements p.I { public void g();// g() public B(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java index 6594074ce2e..26043552cb4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java @@ -7,5 +7,4 @@ public final class B /* p.B*/ implements p.I { public void f();// f() public void g();// g() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java index da83e10201d..eecad91d232 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java @@ -10,5 +10,4 @@ public enum E /* p.E*/ { public static p.E[] values();// values() private E();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java index f93fd607ac5..e50fb692912 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java @@ -3,5 +3,4 @@ public final class A /* a.A*/ { public final void f();// f() public A();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java index f4e579c16e1..b32d65705d2 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java @@ -1,16 +1,15 @@ public final class A$B /* c.b.a.A$B*/ { public A$B();// .ctor() + public final class C$D /* c.b.a.A$B.C$D*/ { + public C$D();// .ctor() + } + public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ { + public $$$$$$$();// .ctor() -public final class C$D /* c.b.a.A$B.C$D*/ { - public C$D();// .ctor() - -}public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ { - public $$$$$$$();// .ctor() - - -public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ { - public G$G$();// .ctor() - -}}} \ No newline at end of file + public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ { + public G$G$();// .ctor() + } + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java index 9386817cb32..bb3b78050ae 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java @@ -1,16 +1,15 @@ public final class A$B /* A$B*/ { public A$B();// .ctor() + public final class C$D /* A$B.C$D*/ { + public C$D();// .ctor() + } + public static final class $$$$$$$ /* A$B.$$$$$$$*/ { + public $$$$$$$();// .ctor() -public final class C$D /* A$B.C$D*/ { - public C$D();// .ctor() - -}public static final class $$$$$$$ /* A$B.$$$$$$$*/ { - public $$$$$$$();// .ctor() - - -public final class G$G$ /* A$B.$$$$$$$.G$G$*/ { - public G$G$();// .ctor() - -}}} \ No newline at end of file + public final class G$G$ /* A$B.$$$$$$$.G$G$*/ { + public G$G$();// .ctor() + } + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java index 41cf25f0784..b9fb1c14c15 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java @@ -10,5 +10,4 @@ public enum MyEnumClass /* one.MyEnumClass*/ { private MyEnumClass();// .ctor() public final int foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java index 6de553cf51a..30801ca9362 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java @@ -13,5 +13,4 @@ public enum MyEnumClass /* one.MyEnumClass*/ { private MyEnumClass();// .ctor() public final int doo();// doo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java index 7efedea858c..e4b226fe29c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java @@ -13,5 +13,4 @@ static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.KotlinEnum public final int getVariable();// getVariable() public final void firstEntryFun();// firstEntryFun() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java index 94c4a338712..53e20e76729 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java @@ -12,5 +12,4 @@ public static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.Kotl public final void firstEntryFun();// firstEntryFun() public void abstractFun();// abstractFun() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java index b5a7322b4b9..3aadc13f31e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java @@ -12,5 +12,4 @@ static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.KotlinEnum public final void firstEntryFun();// firstEntryFun() public void abstractFun();// abstractFun() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java index 3ede4b52513..6f4b1d7e432 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java @@ -2,9 +2,8 @@ public abstract interface C /* p.C*/ extends p.B { @org.jetbrains.annotations.NotNull() public abstract java.lang.String c();// c() - -public static final class DefaultImpls /* p.C.DefaultImpls*/ { - @org.jetbrains.annotations.NotNull() - public java.lang.String c();// c() - -}} \ No newline at end of file + public static final class DefaultImpls /* p.C.DefaultImpls*/ { + @org.jetbrains.annotations.NotNull() + public java.lang.String c();// c() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java index c4391759c9f..9c9fa6d4e3e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java @@ -2,15 +2,14 @@ public abstract interface C /* p.C*/ extends p.B { @org.jetbrains.annotations.NotNull() public abstract java.lang.String c();// c() + public static final class DefaultImpls /* p.C.DefaultImpls*/ { + @org.jetbrains.annotations.NotNull() + public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);// a(p.C) -public static final class DefaultImpls /* p.C.DefaultImpls*/ { - @org.jetbrains.annotations.NotNull() - public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);// a(p.C) + @org.jetbrains.annotations.NotNull() + public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);// b(p.C) - @org.jetbrains.annotations.NotNull() - public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);// b(p.C) - - @org.jetbrains.annotations.NotNull() - public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);// c(p.C) - -}} \ No newline at end of file + @org.jetbrains.annotations.NotNull() + public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);// c(p.C) + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java index 3156b77e63f..4fd0902e177 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java @@ -1,4 +1,3 @@ public final class A /* a.A*/ { public A();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java index 24a76ce99f2..db3548c7f3f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java @@ -10,5 +10,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public final void f();// f() public void g();// g() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java index 5872a6d61dd..b9402f615b4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java @@ -5,5 +5,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public Inheritor();// .ctor() public final void f();// f() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java index 62488bf54ee..95cb513f696 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java @@ -4,5 +4,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public final void f();// f() public void g();// g() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java index 633617cf629..db3548c7f3f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java @@ -10,5 +10,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public final void f();// f() public void g();// g() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java index 77527c39a7c..26b927713d2 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java @@ -1,4 +1,3 @@ public final class InlineReified /* a.InlineReified*/ { public InlineReified();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java index ed179e05a2e..2984e5d5834 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java @@ -1,4 +1,3 @@ public class AKotlin /* test.AKotlin*/ { public AKotlin();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java index c70163f8ad0..1351c37252b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java @@ -6,5 +6,4 @@ public final class C /* C*/ { public final void myFun(@org.jetbrains.annotations.NotNull() C, @org.jetbrains.annotations.NotNull() C);// myFun(C, C) public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java index 7a455d72380..85296b2204e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java @@ -7,21 +7,20 @@ public final class A /* A*/ { public A();// .ctor() + public static final class B /* A.B*/ { + @org.jetbrains.annotations.NotNull() + public static final A.B INSTANCE; + @kotlin.jvm.JvmStatic() + public static final void g();// g() -public static final class B /* A.B*/ { - @org.jetbrains.annotations.NotNull() - public static final A.B INSTANCE; + private B();// .ctor() + } - @kotlin.jvm.JvmStatic() - public static final void g();// g() + public static final class Companion /* A.Companion*/ { + @kotlin.jvm.JvmStatic() + public final void f();// f() - private B();// .ctor() - -}public static final class Companion /* A.Companion*/ { - @kotlin.jvm.JvmStatic() - public final void f();// f() - - private Companion();// .ctor() - -}} \ No newline at end of file + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java index 383ff46dddb..192016886ef 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java @@ -4,5 +4,4 @@ public final class A /* p.A*/ { public final int getProperty();// getProperty() public final void memberFun();// memberFun() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java index ad9604dbaa7..0d82538d31b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java @@ -12,5 +12,4 @@ public final class A /* p.A*/ { public final int getProperty();// getProperty() public final void memberFun();// memberFun() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java index 5236f5b73a5..21f078c2e15 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java @@ -1,43 +1,42 @@ public final class A /* A*/ { public A();// .ctor() + public static final class B /* A.B*/ { + public B();// .ctor() + public static final class I /* A.B.I*/ { + @org.jetbrains.annotations.NotNull() + public static final A.B.I INSTANCE; -public static final class B /* A.B*/ { - public B();// .ctor() + private I();// .ctor() + } + public static final class II /* A.B.II*/ { + @org.jetbrains.annotations.NotNull() + public static final A.B.II INSTANCE; + private II();// .ctor() + } + } -public static final class I /* A.B.I*/ { - @org.jetbrains.annotations.NotNull() - public static final A.B.I INSTANCE; + public static final class C /* A.C*/ { + @org.jetbrains.annotations.NotNull() + public static final A.C INSTANCE; - private I();// .ctor() + private C();// .ctor() -}public static final class II /* A.B.II*/ { - @org.jetbrains.annotations.NotNull() - public static final A.B.II INSTANCE; + public static final class D /* A.C.D*/ { + @org.jetbrains.annotations.NotNull() + public static final A.C.D INSTANCE; - private II();// .ctor() + private D();// .ctor() -}}public static final class C /* A.C*/ { - @org.jetbrains.annotations.NotNull() - public static final A.C INSTANCE; + public static final class G /* A.C.D.G*/ { + @org.jetbrains.annotations.NotNull() + public static final A.C.D.G INSTANCE; - private C();// .ctor() - - -public static final class D /* A.C.D*/ { - @org.jetbrains.annotations.NotNull() - public static final A.C.D INSTANCE; - - private D();// .ctor() - - -public static final class G /* A.C.D.G*/ { - @org.jetbrains.annotations.NotNull() - public static final A.C.D.G INSTANCE; - - private G();// .ctor() - -}}}} \ No newline at end of file + private G();// .ctor() + } + } + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java index b9c610c42ec..550ff9ed185 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java @@ -16,5 +16,4 @@ public final class A /* p.A*/ { public final int component1();// component1() public final int getY();// getY() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java index f4820f08e6b..d9d3bc16367 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java @@ -13,5 +13,4 @@ public final class A /* p.A*/ { public final int getY();// getY() public int hashCode();// hashCode() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java index d6951f5903d..9ad9006fddd 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java @@ -2,5 +2,4 @@ public final class OnlySecondaryConstructors /* OnlySecondaryConstructors*/ { public OnlySecondaryConstructors();// .ctor() public OnlySecondaryConstructors(int);// .ctor(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java index ae7f2121962..a56436fb224 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java @@ -5,5 +5,4 @@ public final class A /* A*/ { public A();// .ctor() public final void test();// test() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java index df002a5c890..4c31a1f1885 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java @@ -9,13 +9,12 @@ public abstract @interface Anno /* Anno*/ { public abstract int i();// i() - -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE) -@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE_PARAMETER, java.lang.annotation.ElementType.TYPE_USE}) -@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE) -@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE}) -@kotlin.jvm.internal.RepeatableContainer() -public static abstract @interface Container /* Anno.Container*/ { - public abstract Anno[] value();// value() - -}} \ No newline at end of file + @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE) + @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE_PARAMETER, java.lang.annotation.ElementType.TYPE_USE}) + @kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE) + @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE}) + @kotlin.jvm.internal.RepeatableContainer() + public static abstract @interface Container /* Anno.Container*/ { + public abstract Anno[] value();// value() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java index 5bfd4a61f6b..2c023c0552d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java @@ -4,5 +4,4 @@ public final class A /* A*/ { public final void foo(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function4, ? extends java.lang.Object>);// foo(kotlin.jvm.functions.Function4, ? extends java.lang.Object>) public final void foo(@org.jetbrains.annotations.Nullable() P, @org.jetbrains.annotations.Nullable() P);// foo(P, P) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java index 937092c9a85..a21d7d066bd 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java @@ -1,12 +1,11 @@ public abstract class A /* A*/> extends B> implements C { public A();// .ctor() + public class Inner /* A.Inner*/ extends B> implements C { + public Inner();// .ctor() + } - -public class Inner /* A.Inner*/ extends B> implements C { - public Inner();// .ctor() - -}public final class Inner2 /* A.Inner2*/ extends A.Inner implements C { - public Inner2();// .ctor() - -}} \ No newline at end of file + public final class Inner2 /* A.Inner2*/ extends A.Inner implements C { + public Inner2();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java index 3ebd35cc9d5..3e0ef164023 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java @@ -4,5 +4,4 @@ public final class C /* C*/ { public final /* vararg */ void f(@org.jetbrains.annotations.NotNull() int...);// f(int[]) public final /* vararg */ void p(int, @org.jetbrains.annotations.NotNull() java.lang.String...);// p(int, java.lang.String[]) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java index bd5698c3a90..f29e41b22ce 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java @@ -1,4 +1,3 @@ public final class B /* p.B*/ { public B();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java index 719d1e0c420..3f404b6568d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java @@ -14,5 +14,4 @@ public final class A /* A*/ { public A();// .ctor() public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);// setC(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java index 04b042681ba..fd8daf6a4fc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java @@ -14,5 +14,4 @@ public final class A /* A*/ { public A();// .ctor() public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);// setC(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java index 3c9392769df..b93058f0c1c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java @@ -8,5 +8,4 @@ public enum EnumNameOverride /* EnumNameOverride*/ implements Bar { public static EnumNameOverride[] values();// values() private EnumNameOverride();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java index ed78c35fe1b..c948c4d6d2e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java @@ -1,5 +1,4 @@ public abstract interface Foo /* test.Foo*/ { @org.jetbrains.annotations.NotNull() public abstract java.lang.String foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java index f3ea30d10dd..1ce07b497c9 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java @@ -3,5 +3,4 @@ public abstract interface Foo /* test.Foo*/ { public abstract java.lang.String foo();// foo() public abstract int ();// () - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java index ef12094c13d..d4165b9b182 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java @@ -1,5 +1,4 @@ @kotlin.jvm.JvmPackageName(name = "a.b.c") public final class JvmPackageNameKt /* a.b.c.JvmPackageNameKt*/ { public static final void f();// f() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java index d95561dbd26..c126aa13469 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java @@ -5,12 +5,11 @@ public abstract interface PrivateInTrait /* PrivateInTrait*/ { private abstract void setNn(java.lang.String);// setNn(java.lang.String) + public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ { + private final java.lang.String getN();// getN() -public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ { - private final java.lang.String getN();// getN() + private final java.lang.String getNn();// getNn() - private final java.lang.String getNn();// getNn() - - private final void setNn(java.lang.String);// setNn(java.lang.String) - -}} + private final void setNn(java.lang.String);// setNn(java.lang.String) + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java index 7fcabbd4787..ca9b0ba840b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java @@ -1,10 +1,9 @@ public abstract interface PrivateInTrait /* PrivateInTrait*/ { + public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ { + private static java.lang.String getN(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getN(PrivateInTrait) -public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ { - private static java.lang.String getN(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getN(PrivateInTrait) + private static java.lang.String getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getNn(PrivateInTrait) - private static java.lang.String getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getNn(PrivateInTrait) - - private static void setNn(@org.jetbrains.annotations.NotNull() PrivateInTrait, java.lang.String);// setNn(PrivateInTrait, java.lang.String) - -}} \ No newline at end of file + private static void setNn(@org.jetbrains.annotations.NotNull() PrivateInTrait, java.lang.String);// setNn(PrivateInTrait, java.lang.String) + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java index 93f80e047d3..d3872db4297 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java @@ -1,5 +1,4 @@ public abstract interface Foo /* test.Foo*/ { @org.jetbrains.annotations.NotNull() public abstract java.lang.String getFoo();// getFoo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java index e99b60a7a46..2fb2816b915 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java @@ -15,5 +15,4 @@ public final class Annotations /* p.Annotations*/ { public final void repeatables2();// repeatables2() public Annotations();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java index 880b0e98ae5..c49551d1cd8 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java @@ -20,5 +20,4 @@ public final class A /* A*/ { public final void f(int, double);// f(int, double) public final void f(int, double);// f(int, double) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java index 1b9c8b8349f..265bfcac366 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java @@ -2,5 +2,4 @@ public final class TopLevelDestructuringKt /* TopLevelDestructuringKt*/ { private static final int z; public static final int getZ();// getZ() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java index ef6c8127b55..327eb447978 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java @@ -5,14 +5,13 @@ public abstract interface TraitClassObjectField /* TraitClassObjectField*/ { @org.jetbrains.annotations.Nullable() public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value */; + public static final class Companion /* TraitClassObjectField.Companion*/ { + @org.jetbrains.annotations.Nullable() + private static final java.lang.String y; -public static final class Companion /* TraitClassObjectField.Companion*/ { - @org.jetbrains.annotations.Nullable() - private static final java.lang.String y; + @org.jetbrains.annotations.Nullable() + public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value */; - @org.jetbrains.annotations.Nullable() - public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value */; - - private Companion();// .ctor() - -}} \ No newline at end of file + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java index 6cacc5de1af..4eebbee698a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java @@ -8,5 +8,4 @@ public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable< public java.lang.Void iterator();// iterator() public TwoOverrides();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java index 1aa12862a7c..81119c44cb1 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java @@ -6,5 +6,4 @@ public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable< public java.lang.Void iterator();// iterator() public TwoOverrides();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java index fb52d0908fa..000a4391ecb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java @@ -7,26 +7,25 @@ public final class A /* A*/ { public A();// .ctor() + public static final class Companion /* A.Companion*/ { + @kotlin.jvm.JvmName() + public final void f4();// f4() -public static final class Companion /* A.Companion*/ { - @kotlin.jvm.JvmName() - public final void f4();// f4() + @kotlin.jvm.JvmName(name = "realName") + public final void realName();// realName() - @kotlin.jvm.JvmName(name = "realName") - public final void realName();// realName() + @kotlin.jvm.JvmName(name = 1L) + public final void f2();// f2() - @kotlin.jvm.JvmName(name = 1L) - public final void f2();// f2() + @kotlin.jvm.JvmOverloads() + public final void f5();// f5() - @kotlin.jvm.JvmOverloads() - public final void f5();// f5() + @kotlin.jvm.JvmOverloads() + public final void f6();// f6() - @kotlin.jvm.JvmOverloads() - public final void f6();// f6() + @kotlin.jvm.JvmStatic() + public final void f3();// f3() - @kotlin.jvm.JvmStatic() - public final void f3();// f3() - - private Companion();// .ctor() - -}} + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java index f3173040d6a..e02fc7fae13 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java @@ -7,26 +7,25 @@ public final class A /* A*/ { public A();// .ctor() + public static final class Companion /* A.Companion*/ { + @kotlin.jvm.JvmName() + public final void f4();// f4() -public static final class Companion /* A.Companion*/ { - @kotlin.jvm.JvmName() - public final void f4();// f4() + @kotlin.jvm.JvmName(name = "realName") + public final void realName();// realName() - @kotlin.jvm.JvmName(name = "realName") - public final void realName();// realName() + @kotlin.jvm.JvmName(name = 1) + public final void f2();// f2() - @kotlin.jvm.JvmName(name = 1) - public final void f2();// f2() + @kotlin.jvm.JvmOverloads() + public final void f5();// f5() - @kotlin.jvm.JvmOverloads() - public final void f5();// f5() + @kotlin.jvm.JvmOverloads() + public final void f6();// f6() - @kotlin.jvm.JvmOverloads() - public final void f6();// f6() + @kotlin.jvm.JvmStatic() + public final void f3();// f3() - @kotlin.jvm.JvmStatic() - public final void f3();// f3() - - private Companion();// .ctor() - -}} \ No newline at end of file + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java index 9a17d5706d4..5e9b1aa5287 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java @@ -4,5 +4,4 @@ public final class Derived /* Derived*/ implements Base { public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);// baz(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java index c2828e37460..65abd7d1791 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java @@ -3,5 +3,4 @@ public final class Derived /* Derived*/ implements Base { public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);// baz(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java index decc42a2fb3..e8450b3e0d7 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java @@ -1,4 +1,3 @@ public final class Derived /* Derived*/ implements Base { public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java index e2216c10499..90c0aa8daaa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java @@ -3,5 +3,4 @@ public final class Derived /* Derived*/ implements Base { public java.lang.String getBoo();// getBoo() public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java index 4691470a543..01e9ff97a82 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java @@ -1,4 +1,3 @@ public final class MultiFile /* test.MultiFile*/ { public static final int getFoo();// getFoo() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java index fd093f36deb..8459e60b682 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java @@ -1,4 +1,3 @@ public final class SingleFileKt /* SingleFileKt*/ { public static final void foo();// foo() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java index f251d914f26..7e572dbbd25 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java @@ -1,5 +1,4 @@ @kotlin.jvm.JvmName(name = "NewName") public final class NewName /* NewName*/ { public static final void foo();// foo() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java index e87d11d3fbd..e76c968adf0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java @@ -10,17 +10,16 @@ public final class C /* test.C*/ { public final void g();// g() + @test.AllOpen() + public static final class H /* test.C.H*/ { + public H();// .ctor() + public final void j();// j() + } -@test.AllOpen() -public static final class H /* test.C.H*/ { - public H();// .ctor() + public static final class D /* test.C.D*/ { + public D();// .ctor() - public final void j();// j() - -}public static final class D /* test.C.D*/ { - public D();// .ctor() - - public final void z();// z() - -}} + public final void z();// z() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java index c5c8fcd5376..8900459592e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java @@ -10,17 +10,16 @@ public class C /* test.C*/ { public void g();// g() + @test.AllOpen() + public static class H /* test.C.H*/ { + public H();// .ctor() + public void j();// j() + } -@test.AllOpen() -public static class H /* test.C.H*/ { - public H();// .ctor() + public static final class D /* test.C.D*/ { + public D();// .ctor() - public void j();// j() - -}public static final class D /* test.C.D*/ { - public D();// .ctor() - - public final void z();// z() - -}} \ No newline at end of file + public final void z();// z() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java index 049c01701ea..f37ef0bd768 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java @@ -1,46 +1,45 @@ public final class Container /* p1.Container*/ { public Container();// .ctor() + public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number { + @java.lang.Override() + public byte toByte();// toByte() + @java.lang.Override() + public char toChar();// toChar() -public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number { - @java.lang.Override() - public byte toByte();// toByte() + @java.lang.Override() + public double toDouble();// toDouble() - @java.lang.Override() - public char toChar();// toChar() + @java.lang.Override() + public float toFloat();// toFloat() - @java.lang.Override() - public double toDouble();// toDouble() + @java.lang.Override() + public int toInt();// toInt() - @java.lang.Override() - public float toFloat();// toFloat() + @java.lang.Override() + public long toLong();// toLong() - @java.lang.Override() - public int toInt();// toInt() + @java.lang.Override() + public short toShort();// toShort() - @java.lang.Override() - public long toLong();// toLong() + public MyNumber();// .ctor() + } - @java.lang.Override() - public short toShort();// toShort() + public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence { + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public java.lang.CharSequence subSequence(int, int);// subSequence(int, int) - public MyNumber();// .ctor() + @java.lang.Override() + public char get(int);// get(int) -}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence { - @java.lang.Override() - @org.jetbrains.annotations.NotNull() - public java.lang.CharSequence subSequence(int, int);// subSequence(int, int) + public MyString();// .ctor() - @java.lang.Override() - public char get(int);// get(int) + public error.NonExistentClass chars();// chars() - public MyString();// .ctor() + public error.NonExistentClass codePoints();// codePoints() - public error.NonExistentClass chars();// chars() - - public error.NonExistentClass codePoints();// codePoints() - - public int getLength();// getLength() - -}} + public int getLength();// getLength() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java index 1b55bdf131a..047258859b9 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java @@ -1,38 +1,36 @@ public final class Container /* p1.Container*/ { public Container();// .ctor() + public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number { + public MyNumber();// .ctor() + public byte toByte();// toByte() -public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number { - public MyNumber();// .ctor() + public char toChar();// toChar() - public byte toByte();// toByte() + public double toDouble();// toDouble() - public char toChar();// toChar() + public float toFloat();// toFloat() - public double toDouble();// toDouble() + public int toInt();// toInt() - public float toFloat();// toFloat() + public long toLong();// toLong() - public int toInt();// toInt() + public short toShort();// toShort() + } - public long toLong();// toLong() + public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence { + @org.jetbrains.annotations.NotNull() + public java.lang.CharSequence subSequence(int, int);// subSequence(int, int) - public short toShort();// toShort() + public MyString();// .ctor() -}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence { - @org.jetbrains.annotations.NotNull() - public java.lang.CharSequence subSequence(int, int);// subSequence(int, int) + public char get(int);// get(int) - public MyString();// .ctor() + public error.NonExistentClass chars();// chars() - public char get(int);// get(int) - - public error.NonExistentClass chars();// chars() - - public error.NonExistentClass codePoints();// codePoints() - - public int getLength();// getLength() - -}} + public error.NonExistentClass codePoints();// codePoints() + public int getLength();// getLength() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java index d248ba14ce3..a6dbd162610 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java @@ -3,5 +3,4 @@ public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/ implements public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class);// containsKey(java.lang.Class) public TypeHierarchyMap();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java index 9eb86337fbf..884c7482cfb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java @@ -2,5 +2,4 @@ public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/ implements public TypeHierarchyMap();// .ctor() public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class);// containsKey(java.lang.Class) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java index d0eedb9aba6..76f53d9cd95 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java @@ -33,16 +33,15 @@ public final class SmartSet /* SmartSet*/ extends kotlin.collections.Abstrac public void setSize(int);// setSize(int) + public static final class Companion /* SmartSet.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final SmartSet create();// create() -public static final class Companion /* SmartSet.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final SmartSet create();// create() + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final SmartSet create(@org.jetbrains.annotations.NotNull() java.util.Collection);// create(java.util.Collection) - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final SmartSet create(@org.jetbrains.annotations.NotNull() java.util.Collection);// create(java.util.Collection) - - private Companion();// .ctor() - -}} + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java index 9e0b7b4dc18..2e05d7ff3ed 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java @@ -30,16 +30,15 @@ public final class SmartSet /* SmartSet*/ extends kotlin.collections.Abstrac public void setSize(int);// setSize(int) + public static final class Companion /* SmartSet.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final SmartSet create();// create() -public static final class Companion /* SmartSet.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final SmartSet create();// create() + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final SmartSet create(@org.jetbrains.annotations.NotNull() java.util.Collection);// create(java.util.Collection) - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final SmartSet create(@org.jetbrains.annotations.NotNull() java.util.Collection);// create(java.util.Collection) - - private Companion();// .ctor() - -}} \ No newline at end of file + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java index 5872a6d61dd..b9402f615b4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java @@ -5,5 +5,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public Inheritor();// .ctor() public final void f();// f() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java index 62488bf54ee..95cb513f696 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java @@ -4,5 +4,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public final void f();// f() public void g();// g() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java index 69b1eb1b158..1dc6bcc1a88 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java @@ -12,5 +12,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 { public final void f();// f() public void g();// g() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java index 7314bddfe8a..43cd93eb88c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java @@ -4,5 +4,4 @@ public final class C /* p.C*/ { public int af();// af() public int getAp();// getAp() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java index b37bb087d72..0781f972bfc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java @@ -4,5 +4,4 @@ public final class C /* p.C*/ extends p.A { public int af$light_idea_test_case();// af$light_idea_test_case() public int getAp$light_idea_test_case();// getAp$light_idea_test_case() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java index 41f97b77eac..fac57c15b37 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java @@ -8,5 +8,4 @@ public final class C /* p.C*/ { public int getAp();// getAp() public int getIp();// getIp() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java index f29d8bfa5c2..bb3b8291cb6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java @@ -10,5 +10,4 @@ public final class C /* p.C*/ extends p.A implements p.I { public int getAp$light_idea_test_case();// getAp$light_idea_test_case() public int getIp$light_idea_test_case();// getIp$light_idea_test_case() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java index 7314bddfe8a..43cd93eb88c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java @@ -4,5 +4,4 @@ public final class C /* p.C*/ { public int af();// af() public int getAp();// getAp() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java index e51eef0f375..956ea43eada 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java @@ -4,5 +4,4 @@ public final class C /* p.C*/ extends p.A { protected int getAp();// getAp() public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java index 5c2069217b4..2818130d220 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java @@ -83,5 +83,4 @@ public final class Class /* Class*/ { public final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String) public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java index 8b185e2cb6c..917cca90851 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java @@ -10,11 +10,10 @@ public final class ClassObjectField /* ClassObjectField*/ { public ClassObjectField();// .ctor() + public static final class Companion /* ClassObjectField.Companion*/ { + @org.jetbrains.annotations.Nullable() + public final java.lang.String getX();// getX() -public static final class Companion /* ClassObjectField.Companion*/ { - @org.jetbrains.annotations.Nullable() - public final java.lang.String getX();// getX() - - private Companion();// .ctor() - -}} \ No newline at end of file + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java index 6e5a7539b6a..cd5577a06a8 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java @@ -1,4 +1,3 @@ public final class ClassWithConstructor /* ClassWithConstructor*/ { public ClassWithConstructor(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java index de6f9e75be4..db18f3c2bfd 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java @@ -12,5 +12,4 @@ public final class ClassWithConstructorAndProperties /* ClassWithConstructorAndP public final java.lang.String getNullable();// getNullable() public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java index dcfb679fa05..3eb33b40d45 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java @@ -76,5 +76,4 @@ public final class FileFacadeKt /* FileFacadeKt*/ { public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String) public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java index fc8d14ff400..cb9ea1be831 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java @@ -9,5 +9,4 @@ public abstract interface Generic /* Generic*/ { public abstract NN b1(@org.jetbrains.annotations.Nullable() NN);// b1(NN) public abstract N a(N);// a(N) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java index f6abe58c1ed..1aca2857ff5 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java @@ -7,5 +7,4 @@ public final class C /* C*/ implements Tr { public C();// .ctor() public int getV();// getV() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java index d8164bd4d13..4c4cf4d51aa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java @@ -8,5 +8,4 @@ public final class C /* C*/ implements Tr { public java.lang.Integer getV();// getV() public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java index 75acf5b479f..bade409e367 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java @@ -12,5 +12,4 @@ public final class C /* C*/ { public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// foo(java.lang.String, java.lang.String) public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java index ac28bcdcf6f..7554948e17d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java @@ -1,5 +1,4 @@ public final class NullableUnitReturnKt /* NullableUnitReturnKt*/ { @org.jetbrains.annotations.Nullable() public static final kotlin.Unit foo();// foo() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java index 15fe272c5e3..aaf8b60ae15 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java @@ -3,5 +3,4 @@ public final class C /* C*/ implements Base { public void foo();// foo() public C();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java index 832e13fd9b0..5d52f64f2ca 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java @@ -2,5 +2,4 @@ public final class C /* C*/ implements Base { public C();// .ctor() public void foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java index 2cc07ffc667..62f020c6116 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java @@ -8,5 +8,4 @@ public final class PlatformTypes /* PlatformTypes*/ { public PlatformTypes();// .ctor() public final java.lang.String simplyPlatform();// simplyPlatform() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java index 7eb6159112f..5785ffd8e4a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java @@ -40,5 +40,4 @@ public abstract interface Primitives /* Primitives*/ { public abstract long getLong();// getLong() public abstract short getShort();// getShort() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java index 44c96e7a93a..de05a3ee10d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java @@ -8,5 +8,4 @@ public final class PrivateInClass /* PrivateInClass*/ { private final java.lang.String getNn();// getNn() private final void setNn(java.lang.String);// setNn(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java index e39a05cab92..61037b8dcd8 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java @@ -3,10 +3,9 @@ public final class Synthetic /* Synthetic*/ { public Synthetic();// .ctor() + public final class Inner /* Synthetic.Inner*/ { + public Inner();// .ctor() -public final class Inner /* Synthetic.Inner*/ { - public Inner();// .ctor() - - public final void test();// test() - -}} \ No newline at end of file + public final void test();// test() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java index c8780a425fe..b18c4102e4d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java @@ -34,5 +34,4 @@ public abstract interface Trait /* Trait*/ { public abstract void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String) public abstract void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java index d3f81e07572..cb6096a5516 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java @@ -3,5 +3,4 @@ public final class C /* C*/ implements Base { public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit) public C();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java index 0ebcaad658b..ecaf74273cc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java @@ -2,5 +2,4 @@ public final class C /* C*/ implements Base { public C();// .ctor() public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java index 3b05104abcf..4ff5200d0ec 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java @@ -1,4 +1,3 @@ public final class UnitParameterKt /* UnitParameterKt*/ { public static final void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java index 79679e25201..e1655e94392 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java @@ -1,4 +1,3 @@ public final class VoidReturnKt /* VoidReturnKt*/ { public static final void foo(@org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java index 846db2cc8e0..04503293fa1 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java @@ -22,5 +22,4 @@ public final class A /* pack.A*/ { public final int getC();// getC() public final void setV(@org.jetbrains.annotations.NotNull() java.lang.String);// setV(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java index 6f49f641808..a443485d4f3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java @@ -8,8 +8,7 @@ public final class C /* C*/ { public C();// .ctor() - -public static final class Companion /* C.Companion*/ { - private Companion();// .ctor() - -}} \ No newline at end of file + public static final class Companion /* C.Companion*/ { + private Companion();// .ctor() + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java index 68ce61d31e3..b9d094ebda6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java @@ -4,5 +4,4 @@ public final class C /* C*/ { public final java.lang.String foo; public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java index 1b0b1af7276..655f8b4a6d4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java @@ -2,5 +2,4 @@ public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[]) public static final void main(java.lang.String[]);// main(java.lang.String[]) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java index 05b0ee4bdfc..b033a050494 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java @@ -3,24 +3,23 @@ public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.stan public static final void main(java.lang.String[]);// main(java.lang.String[]) + public static final class Bar /* InnerClasses.Bar*/ { + private final int a; -public static final class Bar /* InnerClasses.Bar*/ { - private final int a; + private final int b; - private final int b; + public Bar(int);// .ctor(int) - public Bar(int);// .ctor(int) + public final int getA();// getA() - public final int getA();// getA() + public final int getAPlusB();// getAPlusB() - public final int getAPlusB();// getAPlusB() + public final int getB();// getB() - public final int getB();// getB() + public static final class Baz /* InnerClasses.Bar.Baz*/ { + public Baz();// .ctor() - -public static final class Baz /* InnerClasses.Bar.Baz*/ { - public Baz();// .ctor() - - public final void doSomething();// doSomething() - -}}} \ No newline at end of file + public final void doSomething();// doSomething() + } + } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java index c805751c67e..12332b959f6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java @@ -21,10 +21,8 @@ public final class KotlinClass /* KotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* KotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -38,7 +36,6 @@ public static final class Companion /* KotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { @@ -64,10 +61,8 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* AbstractKotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -81,12 +76,10 @@ public static final class Companion /* AbstractKotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } public final class Custom /* Custom*/ { public Custom();// .ctor() - } public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { @@ -96,5 +89,4 @@ public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { public static final Custom getTopLevelLateinit();// getTopLevelLateinit() public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);// setTopLevelLateinit(Custom) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java index 9c21c3cc338..8b17df3f71b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java @@ -20,10 +20,8 @@ public final class KotlinClass /* KotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* KotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -37,7 +35,6 @@ public static final class Companion /* KotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { @@ -62,10 +59,8 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* AbstractKotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -79,12 +74,10 @@ public static final class Companion /* AbstractKotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } public final class Custom /* Custom*/ { public Custom();// .ctor() - } public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { @@ -94,5 +87,4 @@ public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { public static final Custom getTopLevelLateinit();// getTopLevelLateinit() public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);// setTopLevelLateinit(Custom) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java index 0b83ae3cf81..6bbf374709c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java @@ -20,10 +20,8 @@ public final class KotlinClass /* KotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* KotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -37,12 +35,10 @@ public static final class Companion /* KotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } public final class Custom /* Custom*/ { public Custom();// .ctor() - } public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { @@ -52,7 +48,6 @@ public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { public static final Custom getTopLevelLateinit();// getTopLevelLateinit() public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);// setTopLevelLateinit(Custom) - } public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { @@ -77,10 +72,8 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - class Companion ... - - } +} public static final class Companion /* AbstractKotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() @@ -94,5 +87,4 @@ public static final class Companion /* AbstractKotlinClass.Companion*/ { public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java index 7c15fdbd770..13347610e6e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java @@ -10,5 +10,4 @@ public final class TestClass /* TestClass*/ { public final int getHello();// getHello() public final void setHello(@Anno() int);// setHello(int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java index ecc5448f789..deaa71ea82a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java @@ -36,16 +36,13 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ { @org.jetbrains.annotations.NotNull() public static final AnnoWithCompanion.Companion Companion; - class Companion ... - - } +} public static final class Companion /* AnnoWithCompanion.Companion*/ { private Companion();// .ctor() public final void foo();// foo() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -53,7 +50,6 @@ public abstract @interface Anno /* Anno*/ { public abstract Anno[] x() default {Anno(p = "a"), Anno(p = "b")};// x() public abstract java.lang.String p() default "";// p() - } @Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other")) @@ -69,14 +65,12 @@ public abstract @interface Fancy /* Fancy*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface ReplaceWith /* ReplaceWith*/ { public abstract java.lang.String expression();// expression() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ { @Anno() public abstract java.lang.String x();// x() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -84,7 +78,6 @@ public abstract @interface Deprecated /* Deprecated*/ { public abstract ReplaceWith replaceWith() default @ReplaceWith(expression = "");// replaceWith() public abstract java.lang.String message();// message() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -92,7 +85,6 @@ public abstract @interface Ann /* Ann*/ { public abstract java.lang.Class arg2();// arg2() public abstract java.lang.Class arg1();// arg1() - } @Anno() @@ -110,7 +102,6 @@ public final class F /* F*/ implements java.lang.Runnable { public F();// .ctor() public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp(java.lang.String) - } public final class Foo /* Foo*/ { @@ -128,13 +119,11 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.Nullable() public final java.lang.String getX();// getX() - } @Ann(arg1 = java.lang.String.class, arg2 = int.class) public final class MyClass /* MyClass*/ { public MyClass();// .ctor() - } public final class Example /* Example*/ { @@ -159,7 +148,6 @@ public final class Example /* Example*/ { public final java.lang.String getQuux();// getQuux() public Example(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @Ann() @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String, java.lang.String) - } public final class CtorAnnotations /* CtorAnnotations*/ { @@ -183,5 +171,4 @@ public final class CtorAnnotations /* CtorAnnotations*/ { public final java.lang.String getZ();// getZ() public CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String, java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java index dd31e4afb19..759ed05a625 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java @@ -36,16 +36,13 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ { @org.jetbrains.annotations.NotNull() public static final AnnoWithCompanion.Companion Companion; - class Companion ... - - } +} public static final class Companion /* AnnoWithCompanion.Companion*/ { private Companion();// .ctor() public final void foo();// foo() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -53,7 +50,6 @@ public abstract @interface Anno /* Anno*/ { public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};// x() public abstract java.lang.String p() default "";// p() - } @Deprecated(message = "This anno is deprecated, use === instead", replaceWith = @ReplaceWith(expression = "this === other")) @@ -69,14 +65,12 @@ public abstract @interface Fancy /* Fancy*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface ReplaceWith /* ReplaceWith*/ { public abstract java.lang.String expression();// expression() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ { @Anno() public abstract java.lang.String x();// x() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -84,7 +78,6 @@ public abstract @interface Deprecated /* Deprecated*/ { public abstract ReplaceWith replaceWith() default @ReplaceWith(expression = "");// replaceWith() public abstract java.lang.String message();// message() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -92,7 +85,6 @@ public abstract @interface Ann /* Ann*/ { public abstract java.lang.Class arg2();// arg2() public abstract java.lang.Class arg1();// arg1() - } @Anno() @@ -109,7 +101,6 @@ public final class F /* F*/ implements java.lang.Runnable { public F();// .ctor() public final void setProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp(java.lang.String) - } public final class Foo /* Foo*/ { @@ -127,13 +118,11 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.Nullable() public final java.lang.String getX();// getX() - } @Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class) public final class MyClass /* MyClass*/ { public MyClass();// .ctor() - } public final class Example /* Example*/ { @@ -158,7 +147,6 @@ public final class Example /* Example*/ { public final java.lang.String getQuux();// getQuux() public Example(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @Ann() @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String, java.lang.String) - } public final class CtorAnnotations /* CtorAnnotations*/ { @@ -181,5 +169,4 @@ public final class CtorAnnotations /* CtorAnnotations*/ { public final java.lang.String getZ();// getZ() public CtorAnnotations(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @Anno() @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String, java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java index 5b5ea9e2d01..3ff01425b94 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java @@ -1,53 +1,41 @@ public class Open /* pkg.Open*/ { public Open();// .ctor() - - - class Private ... - class Private2 ... + class Private2 ... - class StaticInternal ... - - } + class StaticInternal ... +} private static final class Private /* pkg.Open.Private*/ extends pkg.Open { public Private();// .ctor() - } protected final class Private2 /* pkg.Open.Private2*/ { public Private2();// .ctor() - } public static final class StaticInternal /* pkg.Open.StaticInternal*/ { public StaticInternal();// .ctor() - } public final class OuterInternal /* pkg.OuterInternal*/ { public OuterInternal();// .ctor() - } final class TopLevelPrivate /* pkg.TopLevelPrivate*/ { public TopLevelPrivate();// .ctor() - } public abstract class Season /* pkg.Season*/ { protected Season();// .ctor() - class Nested ... - - } +} public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { public Nested();// .ctor() - } public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { @@ -56,5 +44,4 @@ public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { protected SealedWithArgs(int);// .ctor(int) public final int getA();// getA() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java index b5352d1ff54..47f3bbc2c45 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java @@ -1,53 +1,41 @@ public abstract class Season /* pkg.Season*/ { private Season();// .ctor() - class Nested ... - - } +} public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { public Nested();// .ctor() - } public class Open /* pkg.Open*/ { public Open();// .ctor() - - - class Private ... - class Private2 ... + class Private2 ... - class StaticInternal ... - - } + class StaticInternal ... +} private static final class Private /* pkg.Open.Private*/ extends pkg.Open { public Private();// .ctor() - } protected final class Private2 /* pkg.Open.Private2*/ { public Private2();// .ctor() - } public static final class StaticInternal /* pkg.Open.StaticInternal*/ { public StaticInternal();// .ctor() - } final class TopLevelPrivate /* pkg.TopLevelPrivate*/ { public TopLevelPrivate();// .ctor() - } public final class OuterInternal /* pkg.OuterInternal*/ { public OuterInternal();// .ctor() - } public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { @@ -56,5 +44,4 @@ public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { private SealedWithArgs(int);// .ctor(int) public final int getA();// getA() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java index abbcb61fdf7..134352b0ef3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java @@ -1,11 +1,9 @@ public final class TestConstructor /* TestConstructor*/ { private TestConstructor(int);// .ctor(int) - } public final class AAA /* AAA*/ { public /* vararg */ AAA(@org.jetbrains.annotations.NotNull() int..., @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) - } public final class B /* B*/ { @@ -14,24 +12,19 @@ public final class B /* B*/ { public final class Outer /* Outer*/ { public Outer();// .ctor() - - class Inner ... - class Nested ... - - } + class Nested ... +} public final class Inner /* Outer.Inner*/ { public Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public static final class Nested /* Outer.Nested*/ { public Nested();// .ctor() public Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public abstract class A /* A*/ { @@ -43,14 +36,11 @@ public abstract class A /* A*/ { protected A(@org.jetbrains.annotations.Nullable() java.lang.String);// .ctor(java.lang.String) - class C ... - - } +} public static final class C /* A.C*/ extends A { public C();// .ctor() - } public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { @@ -61,5 +51,4 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { public final java.util.Set getProperty();// getProperty() private ClassWithPrivateCtor(java.util.Set);// .ctor(java.util.Set) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java index e289a438453..c6ef745a847 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java @@ -1,11 +1,9 @@ public final class TestConstructor /* TestConstructor*/ { private TestConstructor(int);// .ctor(int) - } public final class AAA /* AAA*/ { public AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) - } public final class B /* B*/ { @@ -14,24 +12,19 @@ public final class B /* B*/ { public final class Outer /* Outer*/ { public Outer();// .ctor() - - class Inner ... - class Nested ... - - } + class Nested ... +} public final class Inner /* Outer.Inner*/ { public Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public static final class Nested /* Outer.Nested*/ { public Nested();// .ctor() public Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public abstract class A /* A*/ { @@ -43,14 +36,11 @@ public abstract class A /* A*/ { protected A(@org.jetbrains.annotations.Nullable() java.lang.String);// .ctor(java.lang.String) - class C ... - - } +} public static final class C /* A.C*/ extends A { public C();// .ctor() - } public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { @@ -61,5 +51,4 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { public final java.util.Set getProperty();// getProperty() private ClassWithPrivateCtor(java.util.Set);// .ctor(java.util.Set) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java index 555b2dede48..3892111d475 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java @@ -6,7 +6,6 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { public final java.util.Set getProperty();// getProperty() private ClassWithPrivateCtor(java.util.Set);// .ctor(java.util.Set) - } public final class B /* B*/ { @@ -14,30 +13,24 @@ public final class B /* B*/ { public final class AAA /* AAA*/ { public AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) - } public final class Outer /* Outer*/ { public Outer();// .ctor() - - class Inner ... - class Nested ... - - } + class Nested ... +} public final class Inner /* Outer.Inner*/ { public Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public static final class Nested /* Outer.Nested*/ { public Nested();// .ctor() public Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) - } public abstract class A /* A*/ { @@ -49,17 +42,13 @@ public abstract class A /* A*/ { private A(java.lang.String);// .ctor(java.lang.String) - class C ... - - } +} public static final class C /* A.C*/ extends A { public C();// .ctor() - } public final class TestConstructor /* TestConstructor*/ { private TestConstructor(int);// .ctor(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java index e576373f273..f1bd8d4e45a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java @@ -3,27 +3,23 @@ public final class Foo /* Foo*/ { public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Foo();// .ctor() - } public final class Boo /* Boo*/ { private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Boo();// .ctor() - } public final class Bar /* Bar*/ { public Bar();// .ctor() public final void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1, ? extends java.lang.Object>);// async(kotlin.jvm.functions.Function1, ? extends java.lang.Object>) - } public abstract interface Base /* Base*/ { @org.jetbrains.annotations.Nullable() public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) - } public final class Derived /* Derived*/ implements Base { @@ -32,5 +28,4 @@ public final class Derived /* Derived*/ implements Base { public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) public Derived();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java index cbcc9b1e094..51a9a219dfa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java @@ -3,27 +3,23 @@ public final class Foo /* Foo*/ { public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Foo();// .ctor() - } public final class Boo /* Boo*/ { private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Boo();// .ctor() - } public final class Bar /* Bar*/ { public Bar();// .ctor() public final void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1, ? extends java.lang.Object>);// async(kotlin.jvm.functions.Function1, ? extends java.lang.Object>) - } public abstract interface Base /* Base*/ { @org.jetbrains.annotations.Nullable() public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) - } public final class Derived /* Derived*/ implements Base { @@ -31,5 +27,4 @@ public final class Derived /* Derived*/ implements Base { public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) public Derived();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java index 2fc31a01f24..48c53de89f6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java @@ -1,7 +1,6 @@ public abstract interface Base /* Base*/ { @org.jetbrains.annotations.Nullable() public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) - } public final class Derived /* Derived*/ implements Base { @@ -9,7 +8,6 @@ public final class Derived /* Derived*/ implements Base { public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// foo(kotlin.coroutines.Continuation) public Derived();// .ctor() - } public final class Foo /* Foo*/ { @@ -17,19 +15,16 @@ public final class Foo /* Foo*/ { public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Foo();// .ctor() - } public final class Bar /* Bar*/ { public Bar();// .ctor() public final void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1, ? extends java.lang.Object>);// async(kotlin.jvm.functions.Function1, ? extends java.lang.Object>) - } public final class Boo /* Boo*/ { private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation);// doSomething(Foo, kotlin.coroutines.Continuation) public Boo();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java index bd9b3b2bf2b..2ad0caad6e5 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java @@ -27,7 +27,6 @@ public final class User /* User*/ { public final int getAge();// getAge() public int hashCode();// hashCode() - } public final class Person /* Person*/ { @@ -57,5 +56,4 @@ public final class Person /* Person*/ { public final void setAge(int);// setAge(int) public int hashCode();// hashCode() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java index 44122cd3bce..ce4ce976180 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java @@ -3,7 +3,5 @@ public abstract interface KtInterface /* KtInterface*/ { public abstract void withoutBody();// withoutBody() - class DefaultImpls ... - - } +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java index 3b63abe3ba3..b2896723d06 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java @@ -2,5 +2,4 @@ public abstract interface KtInterface /* KtInterface*/ { public abstract void defaultFun();// defaultFun() public abstract void withoutBody();// withoutBody() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java index 3a077b6fef9..ce4ce976180 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java @@ -3,7 +3,5 @@ public abstract interface KtInterface /* KtInterface*/ { public abstract void withoutBody();// withoutBody() - class DefaultImpls ... - - } \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java index 2d0448f68a7..c712f98537f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java @@ -1,7 +1,6 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface SimpleAnn /* SimpleAnn*/ { public abstract java.lang.String value();// value() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -17,13 +16,11 @@ public abstract @interface Ann /* Ann*/ { public abstract java.lang.String y();// y() public abstract kotlin.DeprecationLevel depr();// depr() - } public abstract interface Base /* Base*/ { @Ann(x = 1L, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("243"), SimpleAnn("4324")}) public abstract void foo(@Ann(x = 2L, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) - } public final class Derived /* Derived*/ implements Base { @@ -32,5 +29,4 @@ public final class Derived /* Derived*/ implements Base { public void foo(@Ann(x = 2L, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java index 9aa226bd9e4..08dfe28597f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java @@ -1,7 +1,6 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface SimpleAnn /* SimpleAnn*/ { public abstract java.lang.String value();// value() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -17,13 +16,11 @@ public abstract @interface Ann /* Ann*/ { public abstract java.lang.String y();// y() public abstract kotlin.DeprecationLevel depr();// depr() - } public abstract interface Base /* Base*/ { @Ann(x = 1, y = "134", z = kotlin.String.class, e = {kotlin.Int.class, kotlin.Double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")}) public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {kotlin.Byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) - } public final class Derived /* Derived*/ implements Base { @@ -31,5 +28,4 @@ public final class Derived /* Derived*/ implements Base { public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java index 9d2fa5bff7f..38402b9db0b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java @@ -1,7 +1,6 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface SimpleAnn /* SimpleAnn*/ { public abstract java.lang.String value();// value() - } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @@ -17,13 +16,11 @@ public abstract @interface Ann /* Ann*/ { public abstract java.lang.String y();// y() public abstract kotlin.DeprecationLevel depr();// depr() - } public abstract interface Base /* Base*/ { @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn("243"), @SimpleAnn("4324")}) public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn("687"), @SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) - } public final class Derived /* Derived*/ implements Base { @@ -31,5 +28,4 @@ public final class Derived /* Derived*/ implements Base { public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn("687"), @SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java index c6eab6c3441..4fefd9b5eed 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java @@ -10,7 +10,6 @@ public abstract interface Base /* Base*/ { public abstract void printMessageLine();// printMessageLine() public abstract void setY(int);// setY(int) - } public final class BaseImpl /* BaseImpl*/ implements Base { @@ -25,7 +24,6 @@ public final class BaseImpl /* BaseImpl*/ implements Base { public BaseImpl(int);// .ctor(int) public final int getX();// getX() - } public final class Derived /* Derived*/ implements Base { @@ -39,5 +37,4 @@ public final class Derived /* Derived*/ implements Base { public void printMessageLine();// printMessageLine() public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java index 4d04235309b..de462c46ed1 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java @@ -10,7 +10,6 @@ public abstract interface Base /* Base*/ { public abstract void printMessageLine();// printMessageLine() public abstract void setY(int);// setY(int) - } public final class BaseImpl /* BaseImpl*/ implements Base { @@ -23,7 +22,6 @@ public final class BaseImpl /* BaseImpl*/ implements Base { public void printMessage();// printMessage() public void printMessageLine();// printMessageLine() - } public final class Derived /* Derived*/ implements Base { @@ -40,5 +38,4 @@ public final class Derived /* Derived*/ implements Base { public void printMessageLine();// printMessageLine() public void setY(int);// setY(int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java index 2f12236d8f8..68928956a38 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java @@ -2,34 +2,26 @@ public final class Foo /* c.b.a.Foo*/ { public Foo();// .ctor() public final void bar();// bar() - } public static final class A$B /* null*/ { public A$B();// .ctor() - - class $$$$$$$ ... - class C$D ... - - } + class C$D ... +} public final class C$D /* null*/ { public C$D();// .ctor() - } public final class $$$$$$$ /* null*/ { public $$$$$$$();// .ctor() - class G$G$ ... - - } +} public final class G$G$ /* null*/ { public G$G$();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java index f4e41c46944..2cbdeb49dd9 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java @@ -2,5 +2,4 @@ public final class Foo /* c.b.a.Foo*/ { public Foo();// .ctor() public final void bar();// bar() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java index 65ce1bd639d..dcfdad1175d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java @@ -15,7 +15,6 @@ public enum Direction /* Direction*/ { public static Direction[] values();// values() private Direction();// .ctor() - } public enum Color /* Color*/ { @@ -36,23 +35,20 @@ public enum Color /* Color*/ { private Color(int);// .ctor(int) public final int getRgb();// getRgb() - } public enum ProtocolState /* ProtocolState*/ { WAITING { - WAITING();// .ctor() - - @org.jetbrains.annotations.NotNull() - public ProtocolState signal();// signal() + WAITING();// .ctor() + @org.jetbrains.annotations.NotNull() + public ProtocolState signal();// signal() }, TALKING { - TALKING();// .ctor() - - @org.jetbrains.annotations.NotNull() - public ProtocolState signal();// signal() + TALKING();// .ctor() + @org.jetbrains.annotations.NotNull() + public ProtocolState signal();// signal() }; @org.jetbrains.annotations.NotNull() @@ -66,20 +62,16 @@ public enum ProtocolState /* ProtocolState*/ { private ProtocolState();// .ctor() - - class TALKING ... - class WAITING ... - - } + class WAITING ... +} public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { WAITING();// .ctor() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() - } public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState { @@ -87,23 +79,20 @@ public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolSta @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() - } public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.BinaryOperator, java.util.function.IntBinaryOperator { PLUS { - PLUS();// .ctor() - - @org.jetbrains.annotations.NotNull() - public java.lang.Integer apply(int, int);// apply(int, int) + PLUS();// .ctor() + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) }, TIMES { - TIMES();// .ctor() - - @org.jetbrains.annotations.NotNull() - public java.lang.Integer apply(int, int);// apply(int, int) + TIMES();// .ctor() + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) }; @org.jetbrains.annotations.NotNull() @@ -116,20 +105,16 @@ public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.Bin public int applyAsInt(int, int);// applyAsInt(int, int) - - class PLUS ... - class TIMES ... - - } + class TIMES ... +} public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { PLUS();// .ctor() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) - } public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { @@ -137,7 +122,6 @@ public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) - } public final class C /* C*/ { @@ -148,5 +132,4 @@ public final class C /* C*/ { public final Direction getEnumConst();// getEnumConst() public C();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java index 612af128285..088037579bf 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/coroutines.java @@ -3,5 +3,4 @@ public final class CoroutinesKt /* CoroutinesKt*/ { public static final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation);// doSomething(java.lang.String, kotlin.coroutines.Continuation) public static final void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1, ? extends java.lang.Object>);// async(kotlin.jvm.functions.Function1, ? extends java.lang.Object>) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java index 4f4b1443661..48987395812 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/importAliases.java @@ -1,5 +1,4 @@ public final class ImportAliasesKt /* ImportAliasesKt*/ { @kotlin.jvm.JvmName(name = "notFoo") public static final void notFoo();// notFoo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java index 18a54ad8374..6f109415ef3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java @@ -2,5 +2,4 @@ public final class InlineOnlyKt /* InlineOnlyKt*/ { @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.internal.InlineOnly() private static final void foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java index 9aa25ce62fb..764678337c5 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.lib.java @@ -1,5 +1,4 @@ public final class InlineOnlyKt /* InlineOnlyKt*/ { @kotlin.internal.InlineOnly() private static final void foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java index 2ca9b4e35fd..3489ad7acdc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.fir.java @@ -5,5 +5,4 @@ public final class JvmFieldKt /* JvmFieldKt*/ { @kotlin.jvm.JvmField() public static int b = 1 /* initializer type: int */; - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java index bbe623141be..92792525f28 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmField.java @@ -5,5 +5,4 @@ public final class JvmFieldKt /* JvmFieldKt*/ { @kotlin.jvm.JvmField() public static int b; - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java index 5a1225e3b85..7b24c625403 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmName.java @@ -23,5 +23,4 @@ public final class JvmNameKt /* JvmNameKt*/ { public static final void foo(@org.jetbrains.annotations.NotNull() java.util.List);// foo(java.util.List) public static final void setRwProp(int);// setRwProp(int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java index 5387f77d861..4c933d24a62 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { @@ -59,5 +53,4 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { public static final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java index c67842b43c9..aada6c1450f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { @@ -59,5 +53,4 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { public static final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java index 50cddacf204..aeea970f0f3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.fir.java @@ -24,5 +24,4 @@ public final class LateinitPropertyKt /* LateinitPropertyKt*/ { public static final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);// setA(java.lang.String) public static final void setD(@org.jetbrains.annotations.NotNull() java.lang.String);// setD(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java index 772ab9613c8..7e98379d292 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/lateinitProperty.java @@ -24,5 +24,4 @@ public final class LateinitPropertyKt /* LateinitPropertyKt*/ { public static final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);// setA(java.lang.String) public static final void setD(@org.jetbrains.annotations.NotNull() java.lang.String);// setD(java.lang.String) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java index 557a4ef9262..845adc0ccbb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java @@ -4,5 +4,4 @@ public final class multifileFacade /* multifileFacade*/ { public static final int foo();// foo() public static final int getX();// getX() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java index db61ca28918..d0f1f846914 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java @@ -10,5 +10,4 @@ public final class multifileFacade /* multifileFacade*/ { public static final int getX();// getX() public static final int getY();// getY() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java index 557a4ef9262..845adc0ccbb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java @@ -4,5 +4,4 @@ public final class multifileFacade /* multifileFacade*/ { public static final int foo();// foo() public static final int getX();// getX() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java index 3c9763d615a..39848580665 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java @@ -1,4 +1,3 @@ public final class multifileFacade /* multifileFacade*/ { public static final int foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java index 17d78c68854..c0630b1fcd0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.java @@ -1,9 +1,7 @@ public final class multifileFacade /* multifileFacade*/ { public static final int foo();// foo() - } public final class otherMultifileFacade /* otherMultifileFacade*/ { public static final int bar();// bar() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java index 3c9763d615a..39848580665 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java @@ -1,4 +1,3 @@ public final class multifileFacade /* multifileFacade*/ { public static final int foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java index 9d416ff8f1c..9996a6ecf40 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java @@ -176,5 +176,4 @@ public final class PropertiesKt /* PropertiesKt*/ { public static final void setSubject(error.NonExistentClass);// setSubject(error.NonExistentClass) public static final void setValue(error.NonExistentClass, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty, int);// setValue(error.NonExistentClass, kotlin.reflect.KProperty, int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java index 8a0493c05e9..3db27919f60 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.java @@ -171,5 +171,4 @@ public final class PropertiesKt /* PropertiesKt*/ { public static final void setSubject(error.NonExistentClass);// setSubject(error.NonExistentClass) public static final void setValue(error.NonExistentClass, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty, int);// setValue(error.NonExistentClass, kotlin.reflect.KProperty, int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java index c12cdb7fc17..34776fa55fc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.fir.java @@ -15,5 +15,4 @@ public final class SimpleFunctionsKt /* SimpleFunctionsKt*/ { public static final void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, error.NonExistentClass);// bar(int, java.lang.Object, error.NonExistentClass) public static final void bar2(error.NonExistentClass, error.NonExistentClass);// bar2(error.NonExistentClass, error.NonExistentClass) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java index 7c785f9434c..c8c0597062b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/simpleFunctions.java @@ -15,5 +15,4 @@ public final class SimpleFunctionsKt /* SimpleFunctionsKt*/ { public static final void bar2(error.NonExistentClass, error.NonExistentClass);// bar2(error.NonExistentClass, error.NonExistentClass) public static void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, error.NonExistentClass);// bar(int, java.lang.Object, error.NonExistentClass) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java index 8156ff8d200..5ca3b6f53ee 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @@ -10,5 +9,4 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class}) public static final void baz() throws java.lang.Throwable;// baz() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java index 486e106329a..185dad0fdfa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @@ -10,5 +9,4 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) public static final void baz() throws java.lang.Throwable;// baz() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java index d4e650e6874..f585ce1d265 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.lib.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @@ -8,5 +7,4 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String) public static final void baz() throws java.lang.Throwable;// baz() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java index c14d2141422..c4a424b84c4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ { @@ -103,5 +97,4 @@ public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ { public static final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOpen(Out) public static final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOutOpen(Out) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java index 1e6efdda795..60e04de1b67 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.lib.java @@ -1,21 +1,17 @@ public final class Out /* Out*/ { public Out();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ { @@ -93,15 +89,12 @@ public final class WildcardOptimizationKt /* WildcardOptimizationKt*/ { public static final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOpen(Out) public static final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOutOpen(Out) - } public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java index 42de8a94871..dd9e1a195cd 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java @@ -67,15 +67,12 @@ public abstract class C /* C*/ { public final void setSMutableSetProp(@org.jetbrains.annotations.Nullable() java.util.Set);// setSMutableSetProp(java.util.Set) public final void setSSetProp(@org.jetbrains.annotations.Nullable() java.util.Set);// setSSetProp(java.util.Set) - } public class K /* K*/> { public K();// .ctor() - } public final class Sub /* Sub*/ extends K> { public Sub();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java index 6cef4df46d5..d80dccb4b3d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java @@ -67,15 +67,12 @@ public abstract class C /* C*/ { public final void setSMutableSetProp(@org.jetbrains.annotations.Nullable() java.util.Set);// setSMutableSetProp(java.util.Set) public final void setSSetProp(@org.jetbrains.annotations.Nullable() java.util.Set);// setSSetProp(java.util.Set) - } public class K /* K*/> { public K();// .ctor() - } public final class Sub /* Sub*/ extends K> { public Sub();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java index a72d3becbf7..880cbd4941b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java @@ -4,7 +4,6 @@ public final class MyList /* MyList*/ implements java.util.List extends java.util.Collection, kotlin.collections.MutableCollection, kotlin.jvm.internal.markers.KMutableCollection { @@ -14,7 +13,6 @@ public abstract class MySet /* MySet*/ implements ASet { public MySet();// .ctor() public boolean remove(@org.jetbrains.annotations.NotNull() java.lang.String);// remove(java.lang.String) - } public abstract class SmartSet /* SmartSet*/ extends kotlin.collections.AbstractMutableSet { @@ -26,5 +24,4 @@ public abstract class SmartSet /* SmartSet*/ extends kotlin.collections.Abst public boolean add(T);// add(T) private SmartSet();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java index 2e7d216db9f..3c752febb18 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java @@ -3,7 +3,6 @@ public final class MyList /* MyList*/ implements java.util.List extends java.util.Collection, kotlin.collections.MutableCollection, kotlin.jvm.internal.markers.KMutableCollection { @@ -13,7 +12,6 @@ public abstract class MySet /* MySet*/ implements ASet { public MySet();// .ctor() public boolean remove(@org.jetbrains.annotations.NotNull() java.lang.String);// remove(java.lang.String) - } public abstract class SmartSet /* SmartSet*/ extends kotlin.collections.AbstractMutableSet { @@ -23,5 +21,4 @@ public abstract class SmartSet /* SmartSet*/ extends kotlin.collections.Abst private SmartSet();// .ctor() public boolean add(T);// add(T) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java index 26fb3b8200b..66a561d4e8e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java @@ -6,5 +6,4 @@ public final class O /* O*/ { public static final void foo();// foo() private O();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java index 39006776184..2bba22d06d8 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java @@ -3,12 +3,10 @@ public final class Prop /* Prop*/ { private final java.lang.Object someProp; public Prop();// .ctor() - } final class null /* null*/ { private ();// .ctor() - } final class C /* C*/ { @@ -23,7 +21,6 @@ final class C /* C*/ { public C(int);// .ctor(int) public final int getY();// getY() - } final class null /* null*/ { @@ -32,7 +29,6 @@ final class null /* null*/ { public java.lang.String toString();// toString() private ();// .ctor() - } public final class ValidPublicSupertype /* ValidPublicSupertype*/ { @@ -46,7 +42,6 @@ public final class ValidPublicSupertype /* ValidPublicSupertype*/ { public final java.lang.Runnable getX();// getX() public ValidPublicSupertype();// .ctor() - } final class null /* null*/ implements java.lang.Runnable { @@ -54,7 +49,6 @@ final class null /* null*/ implements java.lang.Runnable { public void run();// run() private ();// .ctor() - } final class null /* null*/ implements java.lang.Runnable { @@ -62,7 +56,6 @@ final class null /* null*/ implements java.lang.Runnable { public void run();// run() private ();// .ctor() - } public abstract interface I /* I*/ { @@ -79,7 +72,6 @@ public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ { public final java.lang.Runnable getX();// getX() public InvalidPublicSupertype();// .ctor() - } final class null /* null*/ implements I, java.lang.Runnable { @@ -87,7 +79,6 @@ final class null /* null*/ implements I, java.lang.Runnable { public void run();// run() private ();// .ctor() - } final class null /* null*/ implements I, java.lang.Runnable { @@ -95,5 +86,4 @@ final class null /* null*/ implements I, java.lang.Runnable { public void run();// run() private ();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java index e6cfaa9cf8f..7d3906ea4f0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java @@ -3,12 +3,10 @@ public final class Prop /* Prop*/ { private final java.lang.Object someProp; public Prop();// .ctor() - } final class null /* null*/ { private ();// .ctor() - } final class C /* C*/ { @@ -23,7 +21,6 @@ final class C /* C*/ { public C(int);// .ctor(int) public final int getY();// getY() - } final class null /* null*/ { @@ -31,7 +28,6 @@ final class null /* null*/ { public java.lang.String toString();// toString() private ();// .ctor() - } public final class ValidPublicSupertype /* ValidPublicSupertype*/ { @@ -45,21 +41,18 @@ public final class ValidPublicSupertype /* ValidPublicSupertype*/ { public final java.lang.Runnable getX();// getX() public ValidPublicSupertype();// .ctor() - } final class null /* null*/ implements java.lang.Runnable { private ();// .ctor() public void run();// run() - } final class null /* null*/ implements java.lang.Runnable { private ();// .ctor() public void run();// run() - } public abstract interface I /* I*/ { @@ -76,19 +69,16 @@ public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ { public final java.lang.Runnable getX();// getX() public InvalidPublicSupertype();// .ctor() - } final class null /* null*/ implements I, java.lang.Runnable { private ();// .ctor() public void run();// run() - } final class null /* null*/ implements I, java.lang.Runnable { private ();// .ctor() public void run();// run() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java index f4279dacf3b..621f31ca8a4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java @@ -1,11 +1,9 @@ public abstract interface Intf /* Intf*/ { public abstract int v();// v() - } public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf { public abstract int getX();// getX() - } public abstract class Base /* Base*/ { @@ -31,7 +29,6 @@ public abstract class Base /* Base*/ { public int getY();// getY() public void setY(int);// setY(int) - } public final class Derived /* Derived*/ extends Base implements IntfWithProp { @@ -46,7 +43,6 @@ public final class Derived /* Derived*/ extends Base implements IntfWithProp { public Derived(int);// .ctor(int) public int getX();// getX() - } public abstract class AnotherDerived /* AnotherDerived*/ extends Base { @@ -70,12 +66,10 @@ public abstract class AnotherDerived /* AnotherDerived*/ extends Base { public int getX$light_idea_test_case();// getX$light_idea_test_case() public int getY();// getY() - } final class Private /* Private*/ { public Private();// .ctor() public boolean getOverridesNothing();// getOverridesNothing() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java index ce488c04a12..fb282f64d47 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java @@ -1,11 +1,9 @@ public abstract interface Intf /* Intf*/ { public abstract int v();// v() - } public abstract interface IntfWithProp /* IntfWithProp*/ extends Intf { public abstract int getX();// getX() - } public abstract class Base /* Base*/ { @@ -31,7 +29,6 @@ public abstract class Base /* Base*/ { public int getY();// getY() public void setY(int);// setY(int) - } public final class Derived /* Derived*/ extends Base implements IntfWithProp { @@ -44,7 +41,6 @@ public final class Derived /* Derived*/ extends Base implements IntfWithProp { public int abs();// abs() public int getX();// getX() - } public abstract class AnotherDerived /* AnotherDerived*/ extends Base { @@ -67,12 +63,10 @@ public abstract class AnotherDerived /* AnotherDerived*/ extends Base { public int getX$light_idea_test_case();// getX$light_idea_test_case() public int getY();// getY() - } final class Private /* Private*/ { public Private();// .ctor() public boolean getOverridesNothing();// getOverridesNothing() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java index f90bada22e9..062ddcc37ae 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java @@ -1,6 +1,5 @@ public final class UInt /* UInt*/ { private final int value; - } public enum Foo /* Foo*/ { @@ -9,14 +8,12 @@ public enum Foo /* Foo*/ { private final int x; public final int getX();// getX() - } public final class InlinedDelegate /* InlinedDelegate*/ { private T node; public final T getNode();// getNode() - } public final class InlineInheritance /* InlineInheritance*/ { @@ -27,5 +24,4 @@ public final class InlineInheritance /* InlineInheritance*/ { public int getX();// getX() public int y();// y() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java index 7d0369ebcb4..62ee58c1944 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java @@ -11,12 +11,10 @@ public enum Foo /* Foo*/ { public static Foo[] values();// values() public final int getX();// getX() - } public final class InlinedDelegate /* InlinedDelegate*/ { public final T getNode();// getNode() - } public final class InlineInheritance /* InlineInheritance*/ { @@ -25,5 +23,4 @@ public final class InlineInheritance /* InlineInheritance*/ { public int getX();// getX() public int y();// y() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java index 72bf1daf503..1a91fb1b79a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java @@ -4,5 +4,4 @@ public final class A /* A*/ { private final void foo();// foo() public A();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java index 4135c12d86f..0378ce73f3c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.lib.java @@ -3,5 +3,4 @@ public final class A /* A*/ { private final void foo();// foo() public A();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java index fe24292674f..77b7c384688 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java @@ -1,4 +1,3 @@ public final class C /* C*/ { public C();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java index 15a1f83b1a0..31c82bd442b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java @@ -18,14 +18,11 @@ public final class A /* A*/ { public A();// .ctor() - class Companion ... - - } +} public static final class Companion /* A.Companion*/ { private Companion();// .ctor() - } public abstract interface B /* B*/ { @@ -36,14 +33,11 @@ public abstract interface B /* B*/ { @org.jetbrains.annotations.NotNull() public static final B.Companion Companion; - class Companion ... - - } +} public static final class Companion /* B.Companion*/ { private Companion();// .ctor() - } public final class C /* C*/ { @@ -57,5 +51,4 @@ public final class C /* C*/ { public C();// .ctor() public C(@org.jetbrains.annotations.NotNull() java.util.Collection, int);// .ctor(java.util.Collection, int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java index 15240bb5c0f..4571abaf205 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java @@ -25,5 +25,4 @@ public final class C /* C*/ { public final void foo(@org.jetbrains.annotations.NotNull() java.util.List);// foo(java.util.List) public final void setRwProp(int);// setRwProp(int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java index e739967e9b8..f0a850aa6d3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.fir.java @@ -84,10 +84,8 @@ public final class C /* C*/ { public final boolean getP1();// getP1() - class Companion ... - - } +} public static final class Companion /* C.Companion*/ { @kotlin.jvm.JvmOverloads() @@ -112,5 +110,4 @@ public static final class Companion /* C.Companion*/ { public final void foo123(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);// foo123(int, double, java.lang.String) private Companion();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java index 6afcd8b40ad..72367a6eb30 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java @@ -84,10 +84,8 @@ public final class C /* C*/ { public final boolean getP1();// getP1() - class Companion ... - - } +} public static final class Companion /* C.Companion*/ { @kotlin.jvm.JvmOverloads() @@ -112,5 +110,4 @@ public static final class Companion /* C.Companion*/ { public final void foo123(int, double, @org.jetbrains.annotations.NotNull() java.lang.String);// foo123(int, double, java.lang.String) private Companion();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java index 26459b28e6f..ca4bb4fd883 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java @@ -20,5 +20,4 @@ public final class MyRec /* pkg.MyRec*/ { public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) public int hashCode();// hashCode() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java index 8590f322330..8f57f30665d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java @@ -16,10 +16,8 @@ public final class MyClass /* MyClass*/ { public MyClass();// .ctor() - class Companion ... - - } +} public static final class Companion /* MyClass.Companion*/ { @kotlin.jvm.JvmStatic() @@ -34,5 +32,4 @@ public static final class Companion /* MyClass.Companion*/ { public final int getProp();// getProp() public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java index 855bee24765..0877bfe639d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java @@ -16,10 +16,8 @@ public final class MyClass /* MyClass*/ { public static final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) - class Companion ... - - } +} public static final class Companion /* MyClass.Companion*/ { @kotlin.jvm.JvmStatic() @@ -34,5 +32,4 @@ public static final class Companion /* MyClass.Companion*/ { public final int getProp();// getProp() public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java index 7f7bf4cb09f..534629d7500 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java @@ -16,10 +16,8 @@ public final class MyClass /* MyClass*/ { public MyClass();// .ctor() - class Companion ... - - } +} public static final class Companion /* MyClass.Companion*/ { @kotlin.jvm.JvmStatic() @@ -34,5 +32,4 @@ public static final class Companion /* MyClass.Companion*/ { public final int getProp();// getProp() public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java index e35975d7ff4..e47de9bb479 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java @@ -10,5 +10,4 @@ public final class A /* A*/ { public final void setF(@org.jetbrains.annotations.NotNull() A);// setF(A) public final void setX(int);// setX(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java index 2034247ee01..e77b7cc6a56 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java @@ -8,5 +8,4 @@ public final class A /* A*/ { public final void setF(@org.jetbrains.annotations.NotNull() A);// setF(A) public final void setX(int);// setX(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java index ccdfb7162d7..e6a52de79aa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.lib.java @@ -10,5 +10,4 @@ public final class A /* A*/ { public final void setF(@org.jetbrains.annotations.NotNull() A);// setF(A) public final void setX(int);// setX(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java index 9beee35fa63..df89d6d5488 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java @@ -8,5 +8,4 @@ public final class X /* X*/ { public final int getW();// getW() public final void setV(int);// setV(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java index 935e1b848e2..1692c330141 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java @@ -4,5 +4,4 @@ public final class X /* X*/ { public final int getW();// getW() public final void setV(int);// setV(int) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java index 949ad0536f4..21131aa827a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java @@ -8,5 +8,4 @@ public final class X /* X*/ { public final int getW();// getW() public final void setV(int);// setV(int) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java index b4284362298..9e64b32bb67 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class Container /* Container*/ { @@ -53,19 +47,16 @@ public final class Container /* Container*/ { public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) - } public abstract interface A /* A*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract Out foo();// foo() - } public abstract interface B /* B*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract In foo();// foo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java index f9150fe7baf..10b4ba85d64 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class Container /* Container*/ { @@ -53,19 +47,16 @@ public final class Container /* Container*/ { public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) - } public abstract interface A /* A*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract Out foo();// foo() - } public abstract interface B /* B*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract In foo();// foo() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java index 79fa1042fb6..7676666e19e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java @@ -1,23 +1,19 @@ public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public abstract interface B /* B*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract In foo();// foo() - } public final class Container /* Container*/ { @@ -45,27 +41,22 @@ public final class Container /* Container*/ { public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) - } public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public abstract interface A /* A*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() public abstract Out foo();// foo() - } public final class Final /* Final*/ { public Final();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java index ee595948a58..895c8f2d603 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java @@ -26,7 +26,6 @@ public class A /* A*/ { public final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);// setA(java.lang.String) public final void setD(@org.jetbrains.annotations.NotNull() java.lang.String);// setD(java.lang.String) - } public class B /* B*/ { @@ -57,7 +56,6 @@ public class B /* B*/ { public final void setA$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setA$light_idea_test_case(java.lang.String) public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setD$light_idea_test_case(java.lang.String) - } public class C /* C*/ { @@ -81,7 +79,6 @@ public class C /* C*/ { protected final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);// setC(java.lang.String) public C();// .ctor() - } public class D /* D*/ { @@ -90,5 +87,4 @@ public class D /* D*/ { private java.lang.String b; public D();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java index 26148a0aace..7bd4b7fd21a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java @@ -26,7 +26,6 @@ public class A /* A*/ { public final void setA(@org.jetbrains.annotations.NotNull() java.lang.String);// setA(java.lang.String) public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setD$light_idea_test_case(java.lang.String) - } public class B /* B*/ { @@ -57,7 +56,6 @@ public class B /* B*/ { public final void setA$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setA$light_idea_test_case(java.lang.String) public final void setD$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setD$light_idea_test_case(java.lang.String) - } public class C /* C*/ { @@ -81,7 +79,6 @@ public class C /* C*/ { protected final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);// setC(java.lang.String) public C();// .ctor() - } public class D /* D*/ { @@ -90,5 +87,4 @@ public class D /* D*/ { private java.lang.String b; public D();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java index aebe12fcf98..476fc778940 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java @@ -2,15 +2,12 @@ public final class Boo /* Boo*/ { public Boo();// .ctor() public final void fooBar();// fooBar() - } public static final class LocalClassBase /* null*/ { public LocalClassBase();// .ctor() - } public static final class LocalClassDerived /* null*/ extends Boo.LocalClassBase { public LocalClassDerived();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java index 9244cd1d7ca..eb71a4d1556 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java @@ -2,15 +2,12 @@ public final class Boo /* Boo*/ { public Boo();// .ctor() public final void fooBar();// fooBar() - } public static final class LocalClassBase /* null*/ { public LocalClassBase();// .ctor() - } public static final class LocalClassDerived /* null*/ extends LocalClassBase { public LocalClassDerived();// .ctor() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java index 0ac3e3b54d4..ecc86cd372f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java @@ -35,13 +35,10 @@ public final class C /* C*/ { public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) - - class Companion ... - class Factory ... - - } + class Factory ... +} public static final class Companion /* C.Companion*/ { @kotlin.jvm.JvmStatic() @@ -68,12 +65,10 @@ public static final class Companion /* C.Companion*/ { public final void bar();// bar() public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) - } public static final class Factory /* C.Factory*/ { private Factory();// .ctor() - } public final class C1 /* C1*/ { @@ -82,28 +77,22 @@ public final class C1 /* C1*/ { public C1();// .ctor() - class Companion ... - - } +} private static final class Companion /* C1.Companion*/ { private Companion();// .ctor() - } public abstract interface I /* I*/ { @org.jetbrains.annotations.NotNull() public static final I.Companion Companion; - class Companion ... - - } +} public static final class Companion /* I.Companion*/ { private Companion();// .ctor() - } public final class Obj /* Obj*/ implements java.lang.Runnable { @@ -126,7 +115,6 @@ public final class Obj /* Obj*/ implements java.lang.Runnable { private Obj();// .ctor() public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) - } public final class ConstContainer /* ConstContainer*/ { @@ -149,7 +137,6 @@ public final class ConstContainer /* ConstContainer*/ { public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; private ConstContainer();// .ctor() - } public final class ClassWithConstContainer /* ClassWithConstContainer*/ { @@ -173,12 +160,9 @@ public final class ClassWithConstContainer /* ClassWithConstContainer*/ { public ClassWithConstContainer();// .ctor() - class Companion ... - - } +} public static final class Companion /* ClassWithConstContainer.Companion*/ { private Companion();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java index 5e3dc00cb7a..02ddd1a40cf 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java @@ -25,13 +25,10 @@ public final class C /* C*/ { public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) - - class Companion ... - class Factory ... - - } + class Factory ... +} public static final class Companion /* C.Companion*/ { @kotlin.jvm.JvmStatic() @@ -58,12 +55,10 @@ public static final class Companion /* C.Companion*/ { public final void bar();// bar() public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) - } public static final class Factory /* C.Factory*/ { private Factory();// .ctor() - } public final class C1 /* C1*/ { @@ -72,28 +67,22 @@ public final class C1 /* C1*/ { public C1();// .ctor() - class Companion ... - - } +} private static final class Companion /* C1.Companion*/ { private Companion();// .ctor() - } public abstract interface I /* I*/ { @org.jetbrains.annotations.NotNull() public static final I.Companion Companion; - class Companion ... - - } +} public static final class Companion /* I.Companion*/ { private Companion();// .ctor() - } public final class Obj /* Obj*/ implements java.lang.Runnable { @@ -114,7 +103,6 @@ public final class Obj /* Obj*/ implements java.lang.Runnable { public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) public void run();// run() - } public final class ConstContainer /* ConstContainer*/ { @@ -137,7 +125,6 @@ public final class ConstContainer /* ConstContainer*/ { public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; private ConstContainer();// .ctor() - } public final class ClassWithConstContainer /* ClassWithConstContainer*/ { @@ -161,12 +148,9 @@ public final class ClassWithConstContainer /* ClassWithConstContainer*/ { public ClassWithConstContainer();// .ctor() - class Companion ... - - } +} public static final class Companion /* ClassWithConstContainer.Companion*/ { private Companion();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java index f40492f02de..0d251a89784 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java @@ -26,7 +26,7 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() public final java.lang.String CONSTANT_WITH_ESCAPES = "A\tB\nC\rD'E\"F\\G$H" /* initializer type: java.lang.String */ /* constant value A B C - D'E"F\G$H */; +D'E"F\G$H */; @org.jetbrains.annotations.NotNull() public final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */ /* constant value This subsystem is deprecated */; @@ -187,10 +187,8 @@ public final class Foo /* Foo*/ { public final void setSubject(error.NonExistentClass);// setSubject(error.NonExistentClass) - class Companion ... - - } +} public static final class Companion /* Foo.Companion*/ { private Companion();// .ctor() @@ -202,7 +200,6 @@ public static final class Companion /* Foo.Companion*/ { public final int getProp7();// getProp7() public final void setProp7(int);// setProp7(int) - } public final class MyProperty /* MyProperty*/ { @@ -211,7 +208,6 @@ public final class MyProperty /* MyProperty*/ { public final int getValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty);// getValue(T, kotlin.reflect.KProperty) public final void setValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty, int);// setValue(T, kotlin.reflect.KProperty, int) - } public final class Modifiers /* Modifiers*/ { @@ -220,7 +216,6 @@ public final class Modifiers /* Modifiers*/ { public Modifiers();// .ctor() public final int getPlainField();// getPlainField() - } public abstract interface A /* A*/ { @@ -229,7 +224,6 @@ public abstract interface A /* A*/ { public abstract int getInt2();// getInt2() public abstract void setInt2$light_idea_test_case(int);// setInt2$light_idea_test_case(int) - } public final class Foo /* Foo*/ { @@ -243,5 +237,4 @@ public final class Foo /* Foo*/ { public final Foo getMeNonNullFoo();// getMeNonNullFoo() public Foo();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java index 2cd0bfff169..164ddcfb7db 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java @@ -2,5 +2,4 @@ public final class Script /* Script*/ extends kotlin.script.templates.standard.S public Script(@org.jetbrains.annotations.NotNull() java.lang.String[]);// .ctor(java.lang.String[]) public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);// main(java.lang.String[]) - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java index bc3534ca6f3..1549264623c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java @@ -20,12 +20,9 @@ public final class Foo /* Foo*/ { public void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, @org.jetbrains.annotations.NotNull() Foo);// bar(int, java.lang.Object, Foo) - class Inner ... - - } +} public static final class Inner /* Foo.Inner*/ { public Inner();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java index 43d5a3d6845..9ee003da12f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java @@ -20,12 +20,9 @@ public final class Foo /* Foo*/ { public void bar(int, @org.jetbrains.annotations.NotNull() java.lang.Object, @org.jetbrains.annotations.NotNull() Foo);// bar(int, java.lang.Object, Foo) - class Inner ... - - } +} public static final class Inner /* Foo.Inner*/ { public Inner();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java index 36d13db6850..6a741b15d05 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class C /* C*/ { @@ -15,5 +14,4 @@ public final class C /* C*/ { public final void baz() throws java.lang.Throwable;// baz() public C();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java index 41269c2413d..e7d4a93de83 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class C /* C*/ { @@ -16,5 +15,4 @@ public final class C /* C*/ { @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) public final void baz() throws java.lang.Throwable;// baz() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java index 50e05208505..de20107f6cc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java @@ -1,6 +1,5 @@ public final class MyException /* MyException*/ extends java.lang.Exception { public MyException();// .ctor() - } public final class C /* C*/ { @@ -12,5 +11,4 @@ public final class C /* C*/ { public C(int) throws java.lang.Exception;// .ctor(int) public final void baz() throws java.lang.Throwable;// baz() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java index 10e3106de40..84d0df12c94 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java @@ -12,7 +12,6 @@ public final class O /* O*/ { public final void foo(int, @org.jetbrains.annotations.NotNull() java.lang.String);// foo(int, java.lang.String) private O();// .ctor() - } public final class TypeAliasesKt /* TypeAliasesKt*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java index a725bc7a056..e23382798d4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java @@ -15,5 +15,4 @@ public final class O /* O*/ { public final void foo(int, @org.jetbrains.annotations.NotNull() java.lang.String);// foo(int, java.lang.String) private O();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java index f8809ea51f1..09ed720112b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java @@ -45,12 +45,10 @@ public abstract interface P /* P*/ { public final class X /* X*/ { public X();// .ctor() - } public final class Y /* Y*/ { public Y();// .ctor() - } public final class klass /* klass*/ { @@ -68,5 +66,4 @@ public final class klass /* klass*/ { public klass();// .ctor() public final int getX();// getX() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java index 9ba413b41d9..925c8714762 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java @@ -45,12 +45,10 @@ public abstract interface P /* P*/ { public final class X /* X*/ { public X();// .ctor() - } public final class Y /* Y*/ { public Y();// .ctor() - } public final class klass /* klass*/ { @@ -68,5 +66,4 @@ public final class klass /* klass*/ { public klass();// .ctor() public final @A0() int getX();// getX() - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java index 856fb9975b2..0bc29c9fe4c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java @@ -1,31 +1,25 @@ public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Out /* Out*/ { public Out();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Final /* Final*/ { public Final();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class Container /* Container*/ { @@ -105,5 +99,4 @@ public final class Container /* Container*/ { public final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOpen(Out) public final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOutOpen(Out) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java index 2f8c8088b19..bc179ecdb76 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java @@ -1,26 +1,21 @@ public final class Out /* Out*/ { public Out();// .ctor() - } public class Open /* Open*/ { public Open();// .ctor() - } public final class OutPair /* OutPair*/ { public OutPair();// .ctor() - } public final class In /* In*/ { public In();// .ctor() - } public final class Inv /* Inv*/ { public Inv();// .ctor() - } public final class Container /* Container*/ { @@ -100,10 +95,8 @@ public final class Container /* Container*/ { public final void outOfArrayOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOpen(Out) public final void outOfArrayOutOpen(@org.jetbrains.annotations.NotNull() Out);// outOfArrayOutOpen(Out) - } public final class Final /* Final*/ { public Final();// .ctor() - } diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java index a0bcb47a306..ca2250ac943 100644 --- a/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java +++ b/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java @@ -18,5 +18,4 @@ public class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.te public final void setTestPropVar(int);// setTestPropVar(int) public static final void main(java.lang.String[]);// main(java.lang.String[]) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java index 1b0b1af7276..655f8b4a6d4 100644 --- a/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java +++ b/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java @@ -2,5 +2,4 @@ public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[]) public static final void main(java.lang.String[]);// main(java.lang.String[]) - -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java index bbd12d76700..ef2825e84f5 100644 --- a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java +++ b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java @@ -3,7 +3,5 @@ public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.stan public static final void main(java.lang.String[]);// main(java.lang.String[]) - class Bar ... - - } \ No newline at end of file +} diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 3394d6bb5b3..7cd28613584 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -54,6 +54,7 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(commonDependency("junit:junit")) testApi(commonDependency("com.android.tools:r8")) + testApi(project(":analysis:analysis-internal-utils")) testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testCompileOnly(toolsJar()) testCompileOnly(intellijCore()) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt index 075bda9c3bc..66de22f2143 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.* import com.intellij.psi.util.MethodSignature +import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter +import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint import org.jetbrains.kotlin.asJava.elements.KtLightNullabilityAnnotation import org.jetbrains.kotlin.asJava.elements.KtLightPsiArrayInitializerMemberValue import org.jetbrains.kotlin.asJava.elements.KtLightPsiLiteral @@ -14,6 +16,7 @@ import org.jetbrains.kotlin.load.kotlin.NON_EXISTENT_CLASS_NAME import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.KClassValue +import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty fun PsiClass.renderClass() = PsiClassRenderer.renderClass(this) @@ -45,38 +48,41 @@ class PsiClassRenderer private constructor( PsiClassRenderer(renderInner, membersFilter).renderClass(psiClass) } - private fun renderClass(psiClass: PsiClass): String = - buildString { - val classWord = when { - psiClass.isAnnotationType -> "@interface" - psiClass.isInterface -> "interface" - psiClass.isEnum -> "enum" - else -> "class" - } - - append(psiClass.renderModifiers()) - append("$classWord ") - append("${psiClass.name} /* ${psiClass.qualifiedName}*/") - append(psiClass.typeParameters.renderTypeParams()) - append(psiClass.extendsList.renderRefList("extends")) - append(psiClass.implementsList.renderRefList("implements")) - appendLine(" {") + private fun PrettyPrinter.renderClass(psiClass: PsiClass) { + val classWord = when { + psiClass.isAnnotationType -> "@interface" + psiClass.isInterface -> "interface" + psiClass.isEnum -> "enum" + else -> "class" + } + append(psiClass.renderModifiers()) + append("$classWord ") + append("${psiClass.name} /* ${psiClass.qualifiedName}*/") + append(psiClass.typeParameters.renderTypeParams()) + append(psiClass.extendsList.renderRefList("extends")) + append(psiClass.implementsList.renderRefList("implements")) + appendLine(" {") + withIndent { if (psiClass.isEnum) { - append( - psiClass.fields - .filterIsInstance() - .filter { membersFilter.includeEnumConstant(it) } - .joinToString(",\n") { it.renderEnumConstant() }.prependDefaultIndent() - ) + psiClass.fields + .filterIsInstance() + .filter { membersFilter.includeEnumConstant(it) } + .joinTo(this, ",\n") { it.renderEnumConstant() } + append(";\n\n") } - append(psiClass.renderMembers()) - - append("}") + renderMembers(psiClass) } + append("}") + } + + private fun renderClass(psiClass: PsiClass): String = prettyPrint { + renderClass(psiClass) + } + private fun PsiType.renderType() = StringBuffer().also { renderType(it) }.toString() private fun PsiType.renderType(sb: StringBuffer) { if (extendedTypeRenderer && annotations.isNotEmpty()) { @@ -197,51 +203,50 @@ class PsiClassRenderer private constructor( .joinToString(separator = " ", postfix = " ") .takeIf { it.isNotBlank() } ?: "" - val initializingClass = initializingClass ?: return "$annotations$name" - return buildString { + val initializingClass = initializingClass ?: return "$annotations$name" + return prettyPrint { append(annotations) appendLine("$name {") - append(initializingClass.renderMembers()) + renderMembers(initializingClass) append("}") } } - private fun PsiClass.renderMembers(): String { - return buildString { - appendSorted( - fields - .filterNot { it is PsiEnumConstant } - .filter { membersFilter.includeField(it) } - .map { it.renderVar().prependDefaultIndent() + ";\n\n" } - ) + private fun PrettyPrinter.renderMembers(psiClass: PsiClass) { + var wasRendered = false + val fields = psiClass.fields.filterNot { it is PsiEnumConstant }.filter { membersFilter.includeField(it) } + appendSorted(fields, wasRendered) { + it.renderVar() + ";" + } - appendSorted( - methods - .filter { membersFilter.includeMethod(it) } - .map { it.renderMethod().prependDefaultIndent() + "\n\n" } - ) + fields.ifNotEmpty { wasRendered = true } + val methods = psiClass.methods.filter { membersFilter.includeMethod(it) } + appendSorted(methods, wasRendered) { + it.renderMethod() + } - appendSorted( - innerClasses - .filter { membersFilter.includeClass(it) } - .map { - appendLine() - if (renderInner) - renderClass(it, renderInner) - else - "class ${it.name} ...\n\n".prependDefaultIndent() - } - ) + methods.ifNotEmpty { wasRendered = true } + val classes = psiClass.innerClasses.filter { membersFilter.includeClass(it) } + appendSorted(classes, wasRendered) { + if (renderInner) + renderClass(it, renderInner) + else + "class ${it.name} ..." + } + + classes.ifNotEmpty { wasRendered = true } + if (wasRendered) { + appendLine() } } - private fun StringBuilder.appendSorted(list: List) { - append(list.sorted().joinToString("")) + private fun PrettyPrinter.appendSorted(list: List, addPrefix: Boolean, render: (T) -> String) { + if (list.isEmpty()) return + val prefix = if (addPrefix) "\n\n" else "" + list.map(render).sorted().joinTo(this, separator = "\n\n", prefix = prefix) } - private fun String.prependDefaultIndent() = prependIndent(" ") - private fun PsiAnnotation.renderAnnotation(): String { if (qualifiedName == "kotlin.Metadata") return ""