[Lombok] Make visibility of fields of @Value classes private by default (K2)

^KT-51092 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-02-07 16:08:38 +02:00
committed by Space Team
parent ff4c5c1d03
commit ea73cde5fb
4 changed files with 100 additions and 1 deletions
@@ -18,5 +18,6 @@ class FirLombokRegistrar(private val lombokConfigFile: File?) : FirExtensionRegi
+::WithGenerator
+::LombokConstructorsGenerator
+::BuilderGenerator
+::ValueFieldVisibilityTransformer
}
}
@@ -0,0 +1,36 @@
/*
* Copyright 2010-2023 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.
*/
package org.jetbrains.kotlin.lombok.k2.generators
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.copy
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
import org.jetbrains.kotlin.fir.declarations.FirField
import org.jetbrains.kotlin.fir.extensions.FirStatusTransformerExtension
import org.jetbrains.kotlin.fir.java.declarations.FirJavaField
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
import org.jetbrains.kotlin.lombok.k2.config.lombokService
class ValueFieldVisibilityTransformer(session: FirSession) : FirStatusTransformerExtension(session) {
override fun needTransformStatus(declaration: FirDeclaration): Boolean {
return declaration is FirJavaField
}
override fun transformStatus(
status: FirDeclarationStatus,
field: FirField,
containingClass: FirClassLikeSymbol<*>?,
isLocal: Boolean
): FirDeclarationStatus {
if (containingClass == null) return status
if (status.visibility != JavaVisibilities.PackageVisibility) return status
if (session.lombokService.getValue(containingClass) == null) return status
return status.copy(visibility = Visibilities.Private)
}
}
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_K2: JVM_IR
// ISSUE: KT-51092
// FILE: MyValue.java
import lombok.Value;