From 9e7ee2fdeaac37bd247ba31cbcc652e5e300e810 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 3 Sep 2021 11:12:59 -0700 Subject: [PATCH] Unify and use default value parameter name in default setter --- .../kotlin/fir/lightTree/converter/DeclarationsConverter.kt | 3 ++- .../src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt | 3 ++- .../src/org/jetbrains/kotlin/fir/scopes/impl/FirLocalScope.kt | 4 ++-- .../fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt | 3 --- .../jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt | 4 ++-- .../kotlin/asJava/classes/ultraLightMembersCreator.kt | 3 ++- .../src/org/jetbrains/kotlin/builtins/StandardNames.kt | 4 ++++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index 29aac91d6ae..f62b178b3a2 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -9,6 +9,7 @@ import com.intellij.lang.LighterASTNode import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure import org.jetbrains.kotlin.KtNodeTypes.* +import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -1261,7 +1262,7 @@ class DeclarationsConverter( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(NAME_FOR_DEFAULT_VALUE_PARAMETER) + symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) } var block: LighterASTNode? = null var expression: LighterASTNode? = null diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index a9a1b0dc86f..a50ba96295f 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.builder import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -406,7 +407,7 @@ open class RawFirBuilder( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(NAME_FOR_DEFAULT_VALUE_PARAMETER) + symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER) } } symbol = FirPropertyAccessorSymbol() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLocalScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLocalScope.kt index 95a45f133cc..1ecdc8d3105 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLocalScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLocalScope.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.scopes.impl import kotlinx.collections.immutable.PersistentMap import kotlinx.collections.immutable.persistentMapOf -import org.jetbrains.kotlin.fir.NAME_FOR_BACKING_FIELD +import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction @@ -49,7 +49,7 @@ class FirLocalScope private constructor( fun storeBackingField(property: FirProperty): FirLocalScope { return FirLocalScope( - properties.put(NAME_FOR_BACKING_FIELD, property.backingFieldSymbol), functions, classes + properties.put(BACKING_FIELD, property.backingFieldSymbol), functions, classes ) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt index 12da01caebd..9e0ac248fa2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt @@ -7,9 +7,6 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.name.Name -val NAME_FOR_BACKING_FIELD = Name.identifier("field") -val NAME_FOR_DEFAULT_VALUE_PARAMETER = Name.identifier("value") - // Data class synthetic members val COPY_NAME = Name.identifier("copy") val HASHCODE_NAME = Name.identifier("hashCode") diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt index 78f738a14e3..89d5ce3d330 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.psi2ir.generators +import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -26,7 +27,6 @@ import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.startOffsetSkippingComments @@ -130,7 +130,7 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio CallableMemberDescriptor.Kind.SYNTHESIZED, null, propertyDescriptor.source ).apply { val setterValueParameter = ValueParameterDescriptorImpl( - this, null, 0, Annotations.EMPTY, Name.identifier("value"), propertyDescriptor.type, + this, null, 0, Annotations.EMPTY, DEFAULT_VALUE_PARAMETER, propertyDescriptor.type, declaresDefaultValue = false, isCrossinline = false, isNoinline = false, varargElementType = null, source = SourceElement.NO_SOURCE ) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt index d717ee24439..6786fb337d2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.asJava.builder.LightMemberOriginForDeclaration import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.convertToLightAnnotationMemberValue +import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotated @@ -505,7 +506,7 @@ internal class UltraLightMembersCreator( ) else KtUltraLightParameterForSetterParameter( - name = propertyName, + name = DEFAULT_VALUE_PARAMETER.identifier, property = declaration, support = support, method = setterWrapper, diff --git a/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt b/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt index 93f950498de..f16caddaeb8 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt @@ -16,6 +16,10 @@ import org.jetbrains.kotlin.utils.newHashSetWithExpectedSize @Suppress("Reformat") object StandardNames { + @JvmField val BACKING_FIELD = Name.identifier("field") + + @JvmField val DEFAULT_VALUE_PARAMETER = Name.identifier("value") + @JvmField val ENUM_VALUES = Name.identifier("values") @JvmField val ENUM_VALUE_OF = Name.identifier("valueOf")