azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: resolve Java enum entries from the beginning (related to KT-59464)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-07-06 19:37:34 +02:00
committed by Space Team
parent e6d43c1f48
commit f8ca440e96
20 changed files with 104 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
public final enum class AnnotatedEnumEntry : R|kotlin/Enum<test/AnnotatedEnumEntry!>| {
@R|test/AnnotatedEnumEntry.Anno|(value = String(a)) public final static enum entry E1: R|@EnhancedNullability test/AnnotatedEnumEntry|
@R|test/AnnotatedEnumEntry.Anno|(value = String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|@EnhancedNullability test/AnnotatedEnumEntry|
public final static enum entry E3: R|@EnhancedNullability test/AnnotatedEnumEntry|
@R|test/AnnotatedEnumEntry.Anno|(value = String(a)) public final static enum entry E1: R|test/AnnotatedEnumEntry|
@R|test/AnnotatedEnumEntry.Anno|(value = String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|test/AnnotatedEnumEntry|
public final static enum entry E3: R|test/AnnotatedEnumEntry|
public final static fun values(): R|kotlin/Array<test/AnnotatedEnumEntry>| {
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public abstract interface CustomAnnotation : R|kotlin/Any| {
}
public final enum class MyEnum : R|kotlin/Enum<test/CustomAnnotation.MyEnum!>| {
public final static enum entry ONE: R|@EnhancedNullability test/CustomAnnotation.MyEnum|
public final static enum entry ONE: R|test/CustomAnnotation.MyEnum|
public final static fun values(): R|kotlin/Array<test/CustomAnnotation.MyEnum>| {
}
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
public constructor(): R|test/EnumArgumentWithCustomToString|
public final enum class E : R|kotlin/Enum<test/EnumArgumentWithCustomToString.E!>| {
public final static enum entry CAKE: R|@EnhancedNullability test/EnumArgumentWithCustomToString.E|
public final static enum entry CAKE: R|test/EnumArgumentWithCustomToString.E|
public final static fun values(): R|kotlin/Array<test/EnumArgumentWithCustomToString.E>| {
}
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter!>| {
public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter|
public final static enum entry INSTANCE: R|test/EnumConstructorParameter|
private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|kotlin/String!|): R|test/EnumConstructorParameter|
private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public open class NestedEnumArgument : R|kotlin/Any| {
}
public final enum class E : R|kotlin/Enum<test/NestedEnumArgument.E!>| {
public final static enum entry FIRST: R|@EnhancedNullability test/NestedEnumArgument.E|
public final static enum entry FIRST: R|test/NestedEnumArgument.E|
public final static fun values(): R|kotlin/Array<test/NestedEnumArgument.E>| {
}
compiler/testData/loadJava/compiledJava/annotations/NestedEnumInAnnotation.fir.txt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ public final annotation class Api : R|kotlin/Annotation| {
public constructor(status: R|test/Api.Status|): R|test/Api|
public final enum class Status : R|kotlin/Enum<test/Api.Status!>| {
public final static enum entry Ok: R|@EnhancedNullability test/Api.Status|
public final static enum entry Error: R|@EnhancedNullability test/Api.Status|
public final static enum entry Ok: R|test/Api.Status|
public final static enum entry Error: R|test/Api.Status|
public final static fun values(): R|kotlin/Array<test/Api.Status>| {
}