From 665bd5153adcc8f20e1491d26803fff821be9063 Mon Sep 17 00:00:00 2001 From: Wojciech Litewka Date: Wed, 14 Feb 2024 11:16:26 +0100 Subject: [PATCH] [tree generator] Make defaultEmptyList#withGetter false by default to align it with other default* methods. This will be helpful for configuring IR implementation, where there are many such empty lists. --- .../fir/tree/generator/ImplementationConfigurator.kt | 8 ++++---- .../tree/config/AbstractImplementationConfigurator.kt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index f0ebb4e784d..fa6c7b8cc86 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -73,7 +73,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() } fun ImplementationContext.commonAnnotationConfig() { - defaultEmptyList("annotations") + defaultEmptyList("annotations", withGetter = true) default("coneTypeOrNull") { value = "annotationTypeRef.coneTypeOrNull" withGetter = true @@ -203,8 +203,8 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() val emptyExpressionBlock = impl(block, "FirEmptyExpressionBlock") { noSource() - defaultEmptyList("statements") - defaultEmptyList("annotations") + defaultEmptyList("statements", withGetter = true) + defaultEmptyList("annotations", withGetter = true) publicImplementation() defaultNull("coneTypeOrNull") } @@ -635,7 +635,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() "typeParameters", implementationPredicate = { it.typeName in implementationsWithoutStatusAndTypeParameters } ) { - defaultEmptyList(it) + defaultEmptyList(it, withGetter = true) additionalImports(resolvedDeclarationStatusImplType) } } diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/config/AbstractImplementationConfigurator.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/config/AbstractImplementationConfigurator.kt index 1494e2e1075..616f2af1ce4 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/config/AbstractImplementationConfigurator.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/config/AbstractImplementationConfigurator.kt @@ -244,16 +244,16 @@ abstract class AbstractImplementationConfigurator