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

Revert "K2/Java: add private enum constructor for MPP matching"

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/13368/timeline

This reverts commit 2cea2b9098.

Motivation:
KT-62961 was fixed independently by two different commits:
- ac3d8ad3ac
- 2cea2b9098

If possible, it's better not to introduce implicit declarations.
That's why it was agreed to keep
ac3d8ad3ac and revert
2cea2b9098
This commit is contained in:
Nikita Bobko
2023-12-04 17:37:15 +01:00
committed by Space Team
parent 8496722603
commit da8a8cc492
12 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
Vendored
-2
View File
@@ -11,8 +11,6 @@ public final enum class AnnotatedEnumEntry : R|kotlin/Enum<test/AnnotatedEnumEnt
public final static val entries: R|kotlin/enums/EnumEntries<test/AnnotatedEnumEntry>|
public get(): R|kotlin/enums/EnumEntries<test/AnnotatedEnumEntry>|
private constructor(): R|test/AnnotatedEnumEntry|
public final annotation class Anno : R|kotlin/Annotation| {
public constructor(value: R|kotlin/String|): R|test/AnnotatedEnumEntry.Anno|
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
Vendored
-2
View File
@@ -14,8 +14,6 @@ public abstract interface CustomAnnotation : R|kotlin/Any| {
public final static val entries: R|kotlin/enums/EnumEntries<test/CustomAnnotation.MyEnum>|
public get(): R|kotlin/enums/EnumEntries<test/CustomAnnotation.MyEnum>|
private constructor(): R|test/CustomAnnotation.MyEnum|
}
@R|test/CustomAnnotation.MyAnnotation|(value = R|test/CustomAnnotation.MyEnum.ONE|) public open class MyTest : R|kotlin/Any| {
public constructor(): R|test/CustomAnnotation.MyTest|
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
Vendored
-2
View File
@@ -14,8 +14,6 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
public final static val entries: R|kotlin/enums/EnumEntries<test/EnumArgumentWithCustomToString.E>|
public get(): R|kotlin/enums/EnumEntries<test/EnumArgumentWithCustomToString.E>|
private constructor(): R|test/EnumArgumentWithCustomToString.E|
}
public final annotation class EnumAnno : R|kotlin/Annotation| {
public constructor(value: R|test/EnumArgumentWithCustomToString.E|): R|test/EnumArgumentWithCustomToString.EnumAnno|
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
Vendored
-2
View File
@@ -18,7 +18,5 @@ public open class NestedEnumArgument : R|kotlin/Any| {
public final static val entries: R|kotlin/enums/EnumEntries<test/NestedEnumArgument.E>|
public get(): R|kotlin/enums/EnumEntries<test/NestedEnumArgument.E>|
private constructor(): R|test/NestedEnumArgument.E|
}
}
compiler/testData/loadJava/compiledJava/annotations/NestedEnumInAnnotation.fir.txt
Vendored
-2
View File
@@ -13,8 +13,6 @@ public final annotation class Api : R|kotlin/Annotation| {
public final static val entries: R|kotlin/enums/EnumEntries<test/Api.Status>|
public get(): R|kotlin/enums/EnumEntries<test/Api.Status>|
private constructor(): R|test/Api.Status|
}
}
@R|test/Api|(status = R|test/Api.Status.Ok|) public open class NestedEnumInAnnotation : R|kotlin/Any| {