Revert "K2/Java: add private enum constructor for MPP matching"
Review: https://jetbrains.team/p/kt/reviews/13368/timeline This reverts commit2cea2b9098. Motivation: KT-62961 was fixed independently by two different commits: -ac3d8ad3ac-2cea2b9098If possible, it's better not to introduce implicit declarations. That's why it was agreed to keepac3d8ad3acand revert2cea2b9098
This commit is contained in:
@@ -361,22 +361,11 @@ abstract class FirJavaFacade(
|
||||
)
|
||||
generateValueOfFunction(moduleData, classId.packageFqName, classId.relativeClassName)
|
||||
generateEntriesGetter(moduleData, classId.packageFqName, classId.relativeClassName)
|
||||
if (javaClassDeclaredConstructors.isEmpty()) {
|
||||
declarations += buildSyntheticConstructorForJavaClass(
|
||||
javaClass,
|
||||
classKind,
|
||||
constructorId = constructorId,
|
||||
ownerClassBuilder = this,
|
||||
valueParametersForAnnotationConstructor = null,
|
||||
moduleData = moduleData,
|
||||
)
|
||||
}
|
||||
}
|
||||
if (classIsAnnotation) {
|
||||
declarations +=
|
||||
buildSyntheticConstructorForJavaClass(
|
||||
buildConstructorForAnnotationClass(
|
||||
javaClass,
|
||||
classKind,
|
||||
constructorId = constructorId,
|
||||
ownerClassBuilder = this,
|
||||
valueParametersForAnnotationConstructor = valueParametersForAnnotationConstructor,
|
||||
@@ -687,12 +676,11 @@ abstract class FirJavaFacade(
|
||||
}
|
||||
}
|
||||
|
||||
private fun buildSyntheticConstructorForJavaClass(
|
||||
private fun buildConstructorForAnnotationClass(
|
||||
javaClass: JavaClass,
|
||||
classKind: ClassKind,
|
||||
constructorId: CallableId,
|
||||
ownerClassBuilder: FirJavaClassBuilder,
|
||||
valueParametersForAnnotationConstructor: ValueParametersForAnnotationConstructor?,
|
||||
valueParametersForAnnotationConstructor: ValueParametersForAnnotationConstructor,
|
||||
moduleData: FirModuleData,
|
||||
): FirJavaConstructor {
|
||||
return buildJavaConstructor {
|
||||
@@ -700,12 +688,11 @@ abstract class FirJavaFacade(
|
||||
this.moduleData = moduleData
|
||||
isFromSource = javaClass.isFromSource
|
||||
symbol = FirConstructorSymbol(constructorId)
|
||||
val visibility = if (classKind == ClassKind.ENUM_CLASS) Visibilities.Private else Visibilities.Public
|
||||
status = FirResolvedDeclarationStatusImpl(visibility, Modality.FINAL, EffectiveVisibility.Public)
|
||||
status = FirResolvedDeclarationStatusImpl(Visibilities.Public, Modality.FINAL, EffectiveVisibility.Public)
|
||||
returnTypeRef = buildResolvedTypeRef {
|
||||
type = ownerClassBuilder.buildSelfTypeRef()
|
||||
}
|
||||
valueParametersForAnnotationConstructor?.forEach { _, firValueParameter -> valueParameters += firValueParameter }
|
||||
valueParametersForAnnotationConstructor.forEach { _, firValueParameter -> valueParameters += firValueParameter }
|
||||
isInner = false
|
||||
isPrimary = true
|
||||
annotationBuilder = { emptyList() }
|
||||
|
||||
Reference in New Issue
Block a user