From 3c8a95e623839c2fc9b551a164802c9ca0e1de12 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Fri, 15 Mar 2024 17:15:55 +0100 Subject: [PATCH] [LC] render all type annotations in tests ^KT-66603 --- .../AbstractSymbolLightClassesByPsiTest.kt | 9 +- .../base/service/symbolLightClassTestUtils.kt | 12 -- ...arameterInEnumConstructor.descriptors.java | 14 +++ ...notatedParameterInEnumConstructor.lib.java | 14 +++ ...nnotatedPropertyWithSites.descriptors.java | 23 ++++ .../AnnotatedPropertyWithSites.java | 14 ++- ...va => AnnotatedPropertyWithSites.lib.java} | 6 +- .../DeprecatedEnumEntry.descriptors.java | 16 +++ .../DeprecatedEnumEntry.lib.java | 16 +++ .../EnumClass.descriptors.java | 16 +++ .../lightClassByFqName/EnumClass.lib.java | 16 +++ .../EnumClassWithEnumEntries.descriptors.java | 16 +++ .../EnumClassWithEnumEntries.lib.java | 16 +++ .../NestedTypeAnnotations.descriptors.java | 8 +- .../NestedTypeAnnotations.java | 4 +- .../StubOrderForOverloads.descriptors.java | 7 ++ .../EnumNameOverride.descriptors.java | 14 +++ .../AnnotationsOnEnumEntry.descriptors.java | 6 +- .../AnnotationsOnEnumEntry.lib.java | 42 +++++++ .../defaultParameterValue.descriptors.java | 6 +- .../defaultParameterValue.lib.java | 6 +- .../enumMembers.descriptors.java | 12 +- .../lightClassByPsi/enumMembers.lib.java | 69 +++++++++++ .../lightClassByPsi/enums.descriptors.java | 24 ++-- .../lightClassByPsi/enums.lib.java | 24 ++-- .../jvmWildcardAnnotations.descriptors.java | 56 +++++++++ .../facades/jvmWildcardAnnotations.java | 12 +- ...r.java => jvmWildcardAnnotations.lib.java} | 2 +- .../inlineClasses.descriptors.java | 26 +++++ .../lightClassByPsi/inlineClasses.fir.java | 29 ----- .../lightClassByPsi/inlineClasses.java | 17 +-- .../lightClassByPsi/inlineClasses.lib.java | 26 +++++ .../jvmWildcardAnnotations.descriptors.java | 24 ++-- .../jvmWildcardAnnotations.java | 14 +-- .../jvmWildcardAnnotations.lib.java | 107 ++++++++++++++++++ .../strangeIdentifiers.descriptors.java | 6 +- .../strangeIdentifiers.lib.java | 6 +- .../kotlin/asJava/PsiClassRenderer.kt | 23 +++- 38 files changed, 615 insertions(+), 143 deletions(-) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.descriptors.java rename compiler/testData/asJava/lightClasses/lightClassByFqName/{AnnotatedPropertyWithSites.fir.java => AnnotatedPropertyWithSites.lib.java} (89%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.descriptors.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/facades/{jvmWildcardAnnotations.fir.java => jvmWildcardAnnotations.lib.java} (96%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.descriptors.java delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt index 2b4c0130df4..ce18d414493 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.asJava.LightClassTestCommon import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.asJava.renderClass import org.jetbrains.kotlin.light.classes.symbol.base.service.getLightClassesFromFile -import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.kotlin.psi.KtFile @@ -55,8 +54,10 @@ abstract class AbstractSymbolLightClassesByPsiTest( TestCase.assertEquals(lc, lcViaFinder) } - return withExtendedTypeRenderer(testDataFile) { - lightClasses.sortedBy { it.qualifiedName ?: it.name.toString() }.joinToString("\n\n") { it.renderClass() } + return lightClasses.sortedBy { + it.qualifiedName ?: it.name.toString() + }.joinToString("\n\n") { + it.renderClass() } } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/service/symbolLightClassTestUtils.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/service/symbolLightClassTestUtils.kt index 846aa5278f4..7de91a7837c 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/service/symbolLightClassTestUtils.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/service/symbolLightClassTestUtils.kt @@ -7,22 +7,10 @@ package org.jetbrains.kotlin.light.classes.symbol.base.service import com.intellij.psi.PsiClass import com.intellij.psi.SyntaxTraverser -import org.jetbrains.kotlin.asJava.PsiClassRenderer import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile -import java.nio.file.Path - -internal inline fun withExtendedTypeRenderer(testDataFile: Path, action: () -> R): R { - val extendedTypeRendererOld = PsiClassRenderer.extendedTypeRenderer.get() - return try { - PsiClassRenderer.extendedTypeRenderer.set(testDataFile.toString().endsWith("typeAnnotations.kt")) - action() - } finally { - PsiClassRenderer.extendedTypeRenderer.set(extendedTypeRendererOld) - } -} internal fun getLightClassesFromFile(ktFile: KtFile): List { val ktClasses = SyntaxTraverser.psiTraverser(ktFile).filter(KtClassOrObject::class.java).toList() diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.descriptors.java new file mode 100644 index 00000000000..7f96619a637 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.descriptors.java @@ -0,0 +1,14 @@ +public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ { + A; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() test.AnnotatedParameterInEnumConstructor[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() test.AnnotatedParameterInEnumConstructor valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + private AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.lib.java new file mode 100644 index 00000000000..a12c654368e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.lib.java @@ -0,0 +1,14 @@ +public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ { + A; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static test.AnnotatedParameterInEnumConstructor valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + 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/AnnotatedPropertyWithSites.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.descriptors.java new file mode 100644 index 00000000000..7a9277afd2e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.descriptors.java @@ -0,0 +1,23 @@ +public final class Test /* Test*/ { + @MyAnnotation5() + @org.jetbrains.annotations.NotNull() + private java.lang.String bar; + + @MyAnnotation() + @org.jetbrains.annotations.NotNull() + public final java.lang.String getBar();// getBar() + + @MyAnnotation2() + public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);// setBar(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final kotlin.Unit getFooP(@MyAnnotation7() @MyAnnotation8() int);// getFooP(@MyAnnotation8() int) + + public Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) + + public final void fooF(@MyAnnotation7() @MyAnnotation8() int);// fooF(@MyAnnotation8() int) + + public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() @MyAnnotation8() java.lang.Integer, long);// fooWithNullableReceiver(@MyAnnotation8() java.lang.Integer, long) + + public final void setFooP(@MyAnnotation7() @MyAnnotation8() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);// setFooP(@MyAnnotation8() int, kotlin.Unit) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java index fb41cc1dc88..26be3f68717 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java @@ -10,14 +10,18 @@ public final class Test /* Test*/ { @MyAnnotation2() public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);// setBar(java.lang.String) + @MyAnnotation4() + @java.lang.Deprecated() + public static void getBar$annotations();// getBar$annotations() + @org.jetbrains.annotations.NotNull() - public final kotlin.Unit getFooP(@MyAnnotation7() int);// getFooP(int) + public final kotlin.Unit getFooP(@MyAnnotation7() @MyAnnotation8() int);// getFooP(@MyAnnotation8() int) public Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) - public final void fooF(@MyAnnotation7() int);// fooF(int) + public final void fooF(@MyAnnotation7() @MyAnnotation8() int);// fooF(@MyAnnotation8() int) - public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() java.lang.Integer, long);// fooWithNullableReceiver(java.lang.Integer, long) + public final void fooWithNullableReceiver(@MyAnnotation7() @org.jetbrains.annotations.Nullable() @MyAnnotation8() java.lang.Integer, long);// fooWithNullableReceiver(@MyAnnotation8() 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 + public final void setFooP(@MyAnnotation7() @MyAnnotation8() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);// setFooP(@MyAnnotation8() int, kotlin.Unit) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.lib.java similarity index 89% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.lib.java index dfa565a30b9..fb41cc1dc88 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.lib.java @@ -10,10 +10,6 @@ public final class Test /* Test*/ { @MyAnnotation2() public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);// setBar(java.lang.String) - @MyAnnotation4() - @java.lang.Deprecated() - public static void getBar$annotations();// getBar$annotations() - @org.jetbrains.annotations.NotNull() public final kotlin.Unit getFooP(@MyAnnotation7() int);// getFooP(int) @@ -24,4 +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/DeprecatedEnumEntry.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.descriptors.java new file mode 100644 index 00000000000..6b92fc203cf --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.descriptors.java @@ -0,0 +1,16 @@ +public enum E /* p.E*/ { + @kotlin.Deprecated(message = "a") Entry1, + Entry2, + @kotlin.Deprecated(message = "b") Entry3; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() p.E[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() p.E valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + private E();// .ctor() +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.lib.java new file mode 100644 index 00000000000..6a90520f48a --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.lib.java @@ -0,0 +1,16 @@ +public enum E /* p.E*/ { + @kotlin.Deprecated(message = "a") Entry1, + Entry2, + @kotlin.Deprecated(message = "b") Entry3; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static p.E valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static p.E[] values();// values() + + private E();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.descriptors.java new file mode 100644 index 00000000000..300bc5ad135 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.descriptors.java @@ -0,0 +1,16 @@ +public enum MyEnumClass /* one.MyEnumClass*/ { + Entry; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() one.MyEnumClass[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + private MyEnumClass();// .ctor() + + public final int foo();// foo() +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.lib.java new file mode 100644 index 00000000000..df66b657e30 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.lib.java @@ -0,0 +1,16 @@ +public enum MyEnumClass /* one.MyEnumClass*/ { + Entry; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static one.MyEnumClass[] values();// values() + + private MyEnumClass();// .ctor() + + public final int foo();// foo() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.descriptors.java new file mode 100644 index 00000000000..245f55ce501 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.descriptors.java @@ -0,0 +1,16 @@ +public enum MyEnumClass /* one.MyEnumClass*/ { + Entry; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() one.MyEnumClass[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + private MyEnumClass();// .ctor() + + public final int doo();// doo() +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.lib.java new file mode 100644 index 00000000000..26cf0243eab --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.lib.java @@ -0,0 +1,16 @@ +public enum MyEnumClass /* one.MyEnumClass*/ { + Entry; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static one.MyEnumClass[] values();// values() + + private MyEnumClass();// .ctor() + + public final int doo();// doo() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.descriptors.java index 38cf5c2a6d6..1365d9ea142 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.descriptors.java @@ -1,14 +1,14 @@ public final class Nested /* foo.Nested*/ { @org.jetbrains.annotations.Nullable() - private java.util.List> property; + private @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List> property; @org.jetbrains.annotations.Nullable() - public final java.util.List> function(@org.jetbrains.annotations.NotNull() java.util.List>, @org.jetbrains.annotations.NotNull() java.util.List>);// function(java.util.List>, java.util.List>) + public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> function(@org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>, @org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>);// function(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>, @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>) @org.jetbrains.annotations.Nullable() - public final java.util.List> getProperty();// getProperty() + public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> getProperty();// getProperty() public Nested();// .ctor() - public final void setProperty(@org.jetbrains.annotations.Nullable() java.util.List>);// setProperty(java.util.List>) + public final void setProperty(@org.jetbrains.annotations.Nullable() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>);// setProperty(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>) } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.java index 8ac8b3966be..e095d9e77bb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedTypeAnnotations.java @@ -3,12 +3,12 @@ public final class Nested /* foo.Nested*/ { private java.util.List> property = null /* initializer type: null */; @org.jetbrains.annotations.Nullable() - public final java.util.List> function(@org.jetbrains.annotations.NotNull() java.util.List>, @org.jetbrains.annotations.NotNull() java.util.List>);// function(java.util.List>, java.util.List>) + public final @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") java.util.List<@foo.AnotherAnnotation(k = foo.Nested.class) java.lang.String>> function(@org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>, @org.jetbrains.annotations.NotNull() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>);// function(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>, @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>) @org.jetbrains.annotations.Nullable() public final java.util.List> getProperty();// getProperty() public Nested();// .ctor() - public final void setProperty(@org.jetbrains.annotations.Nullable() java.util.List>);// setProperty(java.util.List>) + public final void setProperty(@org.jetbrains.annotations.Nullable() @foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>);// setProperty(@foo.MyAnno(s = "outer") java.util.List<@foo.MyAnno(s = "middle") ? extends java.util.List>) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.descriptors.java new file mode 100644 index 00000000000..0f11905eb71 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.descriptors.java @@ -0,0 +1,7 @@ +public final class A /* A*/ { + public A();// .ctor() + + public final void foo(@org.jetbrains.annotations.NotNull() @kotlin.ExtensionFunctionType() kotlin.jvm.functions.Function4, ? extends java.lang.Object>);// foo(@kotlin.ExtensionFunctionType() 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/compilationErrors/EnumNameOverride.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.descriptors.java new file mode 100644 index 00000000000..4902cf1e715 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.descriptors.java @@ -0,0 +1,14 @@ +public enum EnumNameOverride /* EnumNameOverride*/ implements Bar { + ; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() EnumNameOverride[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() EnumNameOverride valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + private EnumNameOverride();// .ctor() +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java index 19370a466ec..fbeee003bea 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java @@ -4,13 +4,13 @@ public enum AnnotationsOnEnumEntry /* two.AnnotationsOnEnumEntry*/ { EntryWithConstructor2; @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() two.AnnotationsOnEnumEntry[] values();// values() @org.jetbrains.annotations.NotNull() - public static two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() @org.jetbrains.annotations.NotNull() - public static two.AnnotationsOnEnumEntry[] values();// values() + public static @org.jetbrains.annotations.NotNull() two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) private AnnotationsOnEnumEntry(int);// .ctor(int) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.lib.java new file mode 100644 index 00000000000..b69c53529ab --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.lib.java @@ -0,0 +1,42 @@ +public enum AnnotationsOnEnumEntry /* two.AnnotationsOnEnumEntry*/ { + @two.PropertyImplicitly() @two.FieldImplicitly() @two.FieldExplicitly() EntryWithoutConstructor, + @two.PropertyImplicitly() @two.FieldImplicitly() EntryWithConstructor, + EntryWithConstructor2; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static two.AnnotationsOnEnumEntry[] values();// values() + + private AnnotationsOnEnumEntry(int);// .ctor(int) + + public final void foo();// foo() +} + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD}) +@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD}) +public abstract @interface FieldExplicitly /* two.FieldExplicitly*/ { +} + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD}) +@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD}) +public abstract @interface FieldImplicitly /* two.FieldImplicitly*/ { +} + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@java.lang.annotation.Target(value = {}) +@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) +public abstract @interface PropertyExplicitly /* two.PropertyExplicitly*/ { +} + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@java.lang.annotation.Target(value = {}) +@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) +public abstract @interface PropertyImplicitly /* two.PropertyImplicitly*/ { +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java index 2a3146d403f..bbe29c64d8d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java @@ -3,13 +3,13 @@ public enum Em /* Em*/ { BAR; @org.jetbrains.annotations.NotNull() - public static Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Em[] values();// values() @org.jetbrains.annotations.NotNull() - public static Em[] values();// values() + public static @org.jetbrains.annotations.NotNull() Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private Em();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.lib.java index 2a3146d403f..fcdf8ca689c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.lib.java @@ -2,15 +2,15 @@ public enum Em /* Em*/ { FOO, BAR; + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static Em valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static Em[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private Em();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java index 4908a4dc30a..ef737971c7f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java @@ -26,13 +26,13 @@ public enum Event /* Event*/ { public static final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) @org.jetbrains.annotations.NotNull() - public static Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Event[] values();// values() @org.jetbrains.annotations.NotNull() - public static Event[] values();// values() + public static @org.jetbrains.annotations.NotNull() Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private Event();// .ctor() @@ -51,13 +51,13 @@ public enum State /* State*/ { public static final State.Companion Companion; @org.jetbrains.annotations.NotNull() - public static State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() State[] values();// values() @org.jetbrains.annotations.NotNull() - public static State[] values();// values() + public static @org.jetbrains.annotations.NotNull() State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private State();// .ctor() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java new file mode 100644 index 00000000000..6635e1bcaaf --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java @@ -0,0 +1,69 @@ +public enum Event /* Event*/ { + ON_CREATE, + ON_START, + ON_STOP, + ON_DESTROY; + + @org.jetbrains.annotations.NotNull() + public static final Event.Companion Companion; + + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.Nullable() + public static final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static Event[] values();// values() + + private Event();// .ctor() + + class Companion ... +} + +public static final class Companion /* Event.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.Nullable() + public final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) + + private Companion();// .ctor() +} + +public enum State /* State*/ { + ENQUEUED, + RUNNING, + SUCCEEDED, + FAILED, + BLOCKED, + CANCELLED; + + @org.jetbrains.annotations.NotNull() + public static final State.Companion Companion; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + + @org.jetbrains.annotations.NotNull() + public static State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static State[] values();// values() + + private State();// .ctor() + + public final boolean isAtLeast(@org.jetbrains.annotations.NotNull() State);// isAtLeast(State) + + public final boolean isFinished();// isFinished() + + class Companion ... +} + +public static final class Companion /* State.Companion*/ { + private Companion();// .ctor() + + public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java index 8d3159d4be2..88ba985346a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java @@ -16,13 +16,13 @@ public enum Color /* Color*/ { private final int rgb; @org.jetbrains.annotations.NotNull() - public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Color[] values();// values() @org.jetbrains.annotations.NotNull() - public static Color[] values();// values() + public static @org.jetbrains.annotations.NotNull() Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private Color(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) @@ -38,13 +38,13 @@ public enum Direction /* Direction*/ { EAST; @org.jetbrains.annotations.NotNull() - public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Direction[] values();// values() @org.jetbrains.annotations.NotNull() - public static Direction[] values();// values() + public static @org.jetbrains.annotations.NotNull() Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private Direction();// .ctor() } @@ -64,13 +64,13 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun }; @org.jetbrains.annotations.NotNull() - public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() IntArithmetics[] values();// values() @org.jetbrains.annotations.NotNull() - public static IntArithmetics[] values();// values() + public static @org.jetbrains.annotations.NotNull() IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private IntArithmetics();// .ctor() @@ -106,13 +106,13 @@ public abstract enum ProtocolState /* ProtocolState*/ { public abstract ProtocolState signal();// signal() @org.jetbrains.annotations.NotNull() - public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() ProtocolState[] values();// values() @org.jetbrains.annotations.NotNull() - public static ProtocolState[] values();// values() + public static @org.jetbrains.annotations.NotNull() ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private ProtocolState();// .ctor() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java index 0cd2b781aab..f36a8691e04 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java @@ -15,15 +15,15 @@ public enum Color /* Color*/ { private final int rgb; + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static Color[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private Color(int);// .ctor(int) private Color(java.lang.String);// .ctor(java.lang.String) @@ -37,15 +37,15 @@ public enum Direction /* Direction*/ { WEST, EAST; + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static Direction valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static Direction[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private Direction();// .ctor() } @@ -53,15 +53,15 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun PLUS, TIMES; + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static IntArithmetics[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private IntArithmetics();// .ctor() public int applyAsInt(int, int);// applyAsInt(int, int) @@ -78,15 +78,15 @@ public abstract enum ProtocolState /* ProtocolState*/ { @org.jetbrains.annotations.NotNull() public abstract ProtocolState signal();// signal() + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static ProtocolState valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static ProtocolState[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private ProtocolState();// .ctor() class TALKING ... diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.descriptors.java new file mode 100644 index 00000000000..79542bc6393 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.descriptors.java @@ -0,0 +1,56 @@ +public final class Final /* Final*/ { + public Final();// .ctor() +} + +public final class In /* In*/ { + public In();// .ctor() +} + +public final class Inv /* Inv*/ { + public Inv();// .ctor() +} + +public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { + @kotlin.jvm.JvmSuppressWildcards(suppress = false) + @org.jetbrains.annotations.NotNull() + public static final Out bar();// bar() + + @kotlin.jvm.JvmSuppressWildcards(suppress = false) + public static final int foo(boolean, @org.jetbrains.annotations.NotNull() Out);// foo(boolean, Out) + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + @org.jetbrains.annotations.NotNull() + public static final In foo3();// foo3() + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + @org.jetbrains.annotations.NotNull() + public static final Out foo2();// foo2() + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);// bar(boolean, In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long) + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) + + @org.jetbrains.annotations.NotNull() + public static final @kotlin.jvm.JvmSuppressWildcards() OutPair>> combination();// combination() + + @org.jetbrains.annotations.NotNull() + public static final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair, Out>> falseTrueFalse();// falseTrueFalse() + + public static final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) + + public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) +} + +public class Open /* Open*/ { + public Open();// .ctor() +} + +public final class Out /* Out*/ { + public Out();// .ctor() +} + +public final class OutPair /* OutPair*/ { + public OutPair();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java index 3817693da03..7dca41b4a9e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.java @@ -24,23 +24,23 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() - public static final Out foo2();// foo2() + public static final Out foo2();// foo2() @kotlin.jvm.JvmSuppressWildcards(suppress = true) - public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In, long);// bar(boolean, In, long) + public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);// bar(boolean, In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long) @kotlin.jvm.JvmSuppressWildcards(suppress = true) public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) @org.jetbrains.annotations.NotNull() - public static final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + public static final @kotlin.jvm.JvmSuppressWildcards() OutPair>> combination();// combination() @org.jetbrains.annotations.NotNull() - public static final OutPair>> combination();// combination() + public static final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair, Out<@kotlin.jvm.JvmSuppressWildcards(suppress = false) ? extends Final>>> falseTrueFalse();// falseTrueFalse() - public static final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) + public static final void simpleIn(@org.jetbrains.annotations.NotNull() In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>);// simpleIn(In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>) - public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) + public static final void simpleOut(@org.jetbrains.annotations.NotNull() Out<@kotlin.jvm.JvmWildcard() ? extends Final>);// simpleOut(Out<@kotlin.jvm.JvmWildcard() ? extends Final>) } public class Open /* Open*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.lib.java similarity index 96% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.lib.java index da21d7aa53a..3817693da03 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.lib.java @@ -24,7 +24,7 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { @kotlin.jvm.JvmSuppressWildcards(suppress = true) @org.jetbrains.annotations.NotNull() - public static final Out foo2();// foo2() + public static final Out foo2();// foo2() @kotlin.jvm.JvmSuppressWildcards(suppress = true) public static final int bar(boolean, @org.jetbrains.annotations.NotNull() In, long);// bar(boolean, In, long) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.descriptors.java new file mode 100644 index 00000000000..83e4364d2ec --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.descriptors.java @@ -0,0 +1,26 @@ +public enum Foo /* Foo*/ { + ; + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() Foo[] values();// values() + + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + public final int getX();// getX() +} + +public final class InlineInheritance /* InlineInheritance*/ { + public final int getV();// getV() + + public int getX();// getX() + + public int y();// y() +} + +public final class InlinedDelegate /* InlinedDelegate*/ { + public final T getNode();// getNode() +} + +public final class UInt /* UInt*/ { +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java deleted file mode 100644 index e641408efc5..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java +++ /dev/null @@ -1,29 +0,0 @@ -public enum Foo /* Foo*/ { - ; - - private final int x; - - public final int getX();// getX() -} - -public final class InlineInheritance /* InlineInheritance*/ implements I { - private final int v; - - @java.lang.Override() - public int getX();// getX() - - @java.lang.Override() - public int y();// y() - - public final int getV();// getV() -} - -public final class InlinedDelegate /* InlinedDelegate*/ { - private T node; - - public final T getNode();// getNode() -} - -public final class UInt /* UInt*/ { - private final int value; -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java index 7f2e4e7b14f..e641408efc5 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java @@ -1,26 +1,29 @@ public enum Foo /* Foo*/ { ; - @org.jetbrains.annotations.NotNull() - public static Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public static Foo[] values();// values() + private final int x; public final int getX();// getX() } -public final class InlineInheritance /* InlineInheritance*/ { - public final int getV();// getV() +public final class InlineInheritance /* InlineInheritance*/ implements I { + private final int v; + @java.lang.Override() public int getX();// getX() + @java.lang.Override() public int y();// y() + + public final int getV();// getV() } public final class InlinedDelegate /* InlinedDelegate*/ { + private T node; + public final T getNode();// getNode() } public final class UInt /* UInt*/ { + private final int value; } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.lib.java new file mode 100644 index 00000000000..7f2e4e7b14f --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.lib.java @@ -0,0 +1,26 @@ +public enum Foo /* Foo*/ { + ; + + @org.jetbrains.annotations.NotNull() + public static Foo valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static Foo[] values();// values() + + public final int getX();// getX() +} + +public final class InlineInheritance /* InlineInheritance*/ { + public final int getV();// getV() + + public int getX();// getX() + + public int y();// y() +} + +public final class InlinedDelegate /* InlinedDelegate*/ { + public final T getNode();// getNode() +} + +public final class UInt /* UInt*/ { +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.descriptors.java index 3fcd79a2482..30559ace540 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.descriptors.java @@ -19,25 +19,25 @@ public final class Container /* Container*/ { public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out);// foo(boolean, Out) @kotlin.jvm.JvmSuppressWildcards(suppress = true) - public final int bar(boolean, @org.jetbrains.annotations.NotNull() In, long);// bar(boolean, In, long) + public final int bar(boolean, @org.jetbrains.annotations.NotNull() In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);// bar(boolean, In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long) @kotlin.jvm.JvmSuppressWildcards(suppress = true) public final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) @kotlin.jvm.JvmSuppressWildcards(suppress = true) - public final void zoo(@org.jetbrains.annotations.NotNull() Out>>, @org.jetbrains.annotations.NotNull() Out);// zoo(Out>>, Out) + public final void zoo(@org.jetbrains.annotations.NotNull() Out>>, @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out);// zoo(Out>>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out) @org.jetbrains.annotations.NotNull() - public final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + public final @kotlin.jvm.JvmSuppressWildcards() OutPair>> combination();// combination() @org.jetbrains.annotations.NotNull() - public final OutPair>> combination();// combination() + public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair, Out>> falseTrueFalse();// falseTrueFalse() public Container();// .ctor() - public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) + public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) - public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) + public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) } public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ { @@ -45,22 +45,22 @@ public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAc private Out bar; @org.jetbrains.annotations.NotNull() - private final In simpleIn; + private final In simpleIn; @org.jetbrains.annotations.NotNull() - private final Out simpleOut; + private final Out simpleOut; @org.jetbrains.annotations.NotNull() private final Out>> deepOpen; @org.jetbrains.annotations.NotNull() - public final In getSimpleIn();// getSimpleIn() + public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out getZoo(@org.jetbrains.annotations.NotNull() Out>>);// getZoo(Out>>) @org.jetbrains.annotations.NotNull() - public final Out getSimpleOut();// getSimpleOut() + public final In getSimpleIn();// getSimpleIn() @org.jetbrains.annotations.NotNull() - public final Out getZoo(@org.jetbrains.annotations.NotNull() Out>>);// getZoo(Out>>) + public final Out getSimpleOut();// getSimpleOut() @org.jetbrains.annotations.NotNull() public final Out getBar();// getBar() @@ -83,7 +83,7 @@ public final class HasAnnotation /* HasAnnotation*/ { public final void doesNot(@org.jetbrains.annotations.NotNull() Out>);// doesNot(Out>) - public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out);// parameterDisagrees(Out) + public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out);// parameterDisagrees(@kotlin.jvm.JvmSuppressWildcards(suppress = false) Out) } public final class In /* In*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java index 7ad415f2930..19a2f1b1c2d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java @@ -19,25 +19,25 @@ public final class Container /* Container*/ { public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out);// foo(boolean, Out) @kotlin.jvm.JvmSuppressWildcards(suppress = true) - public final int bar(boolean, @org.jetbrains.annotations.NotNull() In, long);// bar(boolean, In, long) + public final int bar(boolean, @org.jetbrains.annotations.NotNull() In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long);// bar(boolean, In, @kotlin.jvm.JvmSuppressWildcards(suppress = false) long) @kotlin.jvm.JvmSuppressWildcards(suppress = true) public final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) @kotlin.jvm.JvmSuppressWildcards(suppress = true) - public final void zoo(@org.jetbrains.annotations.NotNull() Out>>, @org.jetbrains.annotations.NotNull() Out);// zoo(Out>>, Out) + public final void zoo(@org.jetbrains.annotations.NotNull() Out>>, @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out);// zoo(Out>>, @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out) @org.jetbrains.annotations.NotNull() - public final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + public final @kotlin.jvm.JvmSuppressWildcards() OutPair>> combination();// combination() @org.jetbrains.annotations.NotNull() - public final OutPair>> combination();// combination() + public final @kotlin.jvm.JvmSuppressWildcards(suppress = false) OutPair, Out<@kotlin.jvm.JvmSuppressWildcards(suppress = false) ? extends Final>>> falseTrueFalse();// falseTrueFalse() public Container();// .ctor() - public final void simpleIn(@org.jetbrains.annotations.NotNull() In);// simpleIn(In) + public final void simpleIn(@org.jetbrains.annotations.NotNull() In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>);// simpleIn(In<@kotlin.jvm.JvmWildcard() ? super java.lang.Object>) - public final void simpleOut(@org.jetbrains.annotations.NotNull() Out);// simpleOut(Out) + public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<@kotlin.jvm.JvmWildcard() ? extends Final>);// simpleOut(Out<@kotlin.jvm.JvmWildcard() ? extends Final>) } public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ { @@ -83,7 +83,7 @@ public final class HasAnnotation /* HasAnnotation*/ { public final void doesNot(@org.jetbrains.annotations.NotNull() Out>);// doesNot(Out>) - public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out);// parameterDisagrees(Out) + public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmSuppressWildcards(suppress = false) Out);// parameterDisagrees(@kotlin.jvm.JvmSuppressWildcards(suppress = false) Out) } public final class In /* In*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java new file mode 100644 index 00000000000..3f7bdc74317 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java @@ -0,0 +1,107 @@ +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() +} + +public final class Container /* Container*/ { + @kotlin.jvm.JvmSuppressWildcards(suppress = false) + @org.jetbrains.annotations.NotNull() + public final Out bar();// bar() + + @kotlin.jvm.JvmSuppressWildcards(suppress = false) + public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out);// foo(boolean, Out) + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + public final int bar(boolean, @org.jetbrains.annotations.NotNull() In, long);// bar(boolean, In, long) + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + public final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) + + @kotlin.jvm.JvmSuppressWildcards(suppress = true) + public final void zoo(@org.jetbrains.annotations.NotNull() Out>>, @org.jetbrains.annotations.NotNull() Out);// zoo(Out>>, Out) + + @org.jetbrains.annotations.NotNull() + public final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + + @org.jetbrains.annotations.NotNull() + public final OutPair>> combination();// combination() + + public Container();// .ctor() + + 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 ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ { + @org.jetbrains.annotations.NotNull() + private Out bar; + + @org.jetbrains.annotations.NotNull() + private final In simpleIn; + + @org.jetbrains.annotations.NotNull() + private final Out simpleOut; + + @org.jetbrains.annotations.NotNull() + private final Out>> deepOpen; + + @org.jetbrains.annotations.NotNull() + public final In getSimpleIn();// getSimpleIn() + + @org.jetbrains.annotations.NotNull() + public final Out getSimpleOut();// getSimpleOut() + + @org.jetbrains.annotations.NotNull() + public final Out getZoo(@org.jetbrains.annotations.NotNull() Out>>);// getZoo(Out>>) + + @org.jetbrains.annotations.NotNull() + public final Out getBar();// getBar() + + @org.jetbrains.annotations.NotNull() + public final Out>> getDeepOpen();// getDeepOpen() + + public ContainerForPropertyAndAccessors();// .ctor() + + public final void setBar(@org.jetbrains.annotations.NotNull() Out);// setBar(Out) +} + +public final class Final /* Final*/ { + public Final();// .ctor() +} + +@kotlin.jvm.JvmSuppressWildcards(suppress = true) +public final class HasAnnotation /* HasAnnotation*/ { + public HasAnnotation();// .ctor() + + public final void doesNot(@org.jetbrains.annotations.NotNull() Out>);// doesNot(Out>) + + public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out);// parameterDisagrees(Out) +} + +public final class In /* In*/ { + public In();// .ctor() +} + +public final class Inv /* Inv*/ { + public Inv();// .ctor() +} + +public class Open /* Open*/ { + public Open();// .ctor() +} + +public final class Out /* Out*/ { + public Out();// .ctor() +} + +public final class OutPair /* OutPair*/ { + public OutPair();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java index fefc5d9cb52..75818fafd49 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java @@ -35,13 +35,13 @@ public enum StrangeEnum /* StrangeEnum*/ { private final java.lang.String size; @org.jetbrains.annotations.NotNull() - public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) + public static @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull() StrangeEnum[] values();// values() @org.jetbrains.annotations.NotNull() - public static StrangeEnum[] values();// values() + public static @org.jetbrains.annotations.NotNull() StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() private StrangeEnum(java.lang.String);// .ctor(java.lang.String) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java index 92ca259b19a..59a9d24974e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java @@ -34,15 +34,15 @@ public enum StrangeEnum /* StrangeEnum*/ { @org.jetbrains.annotations.NotNull() public final java.lang.String getSize();// getSize() + @org.jetbrains.annotations.NotNull() + public static @org.jetbrains.annotations.NotNull() kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static StrangeEnum[] values();// values() - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - private StrangeEnum(java.lang.String);// .ctor(java.lang.String) } 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 d4ff86014e4..3abcb25ec9e 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt @@ -38,8 +38,6 @@ class PsiClassRenderer private constructor( } companion object { - var extendedTypeRenderer: ThreadLocal = ThreadLocal.withInitial { false } - fun renderClass( psiClass: PsiClass, renderInner: Boolean = false, @@ -84,8 +82,9 @@ class PsiClassRenderer private constructor( } private fun PsiType.renderType() = StringBuffer().also { renderType(it) }.toString() + private fun PsiType.renderType(sb: StringBuffer) { - if (extendedTypeRenderer.get() && annotations.isNotEmpty()) { + if (annotations.isNotEmpty()) { sb.append(annotations.joinToString(" ", postfix = " ") { it.renderAnnotation() }) } when (this) { @@ -108,8 +107,24 @@ class PsiClassRenderer private constructor( componentType.renderType(sb) sb.append("[]") } + is PsiWildcardType -> { + if (!isBounded) { + sb.append("?") + } else { + if (isSuper) { + sb.append(PsiWildcardType.SUPER_PREFIX) + } else { + sb.append(PsiWildcardType.EXTENDS_PREFIX) + } + + bound?.renderType(sb) + } + } + is PsiPrimitiveType -> { + sb.append(name) + } else -> { - sb.append(canonicalText) + sb.append(getCanonicalText(/* annotated = */ true)) } } }