From 469b3b9d02702420041a2c3b44b0632fce72aa5c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 4 Aug 2021 14:48:18 +0300 Subject: [PATCH] Raw FIR: re-use OperatorNameConventions for delegate-related names --- .../org/jetbrains/kotlin/fir/builder/ConversionUtils.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index e2605aed46b..ce7ac86bbab 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -400,7 +400,7 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( explicitReceiver = receiver calleeReference = buildSimpleNamedReference { source = fakeSource - name = PROVIDE_DELEGATE + name = OperatorNameConventions.PROVIDE_DELEGATE } argumentList = buildBinaryArgumentList(thisRef(forDispatchReceiver = true), propertyRef()) origin = FirFunctionCallOrigin.Operator @@ -428,7 +428,7 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( explicitReceiver = delegateAccess() calleeReference = buildSimpleNamedReference { source = fakeSource - name = GET_VALUE + name = OperatorNameConventions.GET_VALUE } argumentList = buildBinaryArgumentList(thisRef(), propertyRef()) origin = FirFunctionCallOrigin.Operator @@ -473,7 +473,7 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( explicitReceiver = delegateAccess() calleeReference = buildSimpleNamedReference { source = fakeSource - name = SET_VALUE + name = OperatorNameConventions.SET_VALUE } argumentList = buildArgumentList { arguments += thisRef() @@ -496,9 +496,6 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( } } -private val GET_VALUE = Name.identifier("getValue") -private val SET_VALUE = Name.identifier("setValue") -private val PROVIDE_DELEGATE = Name.identifier("provideDelegate") private val DELEGATED_SETTER_PARAM = Name.special("") fun FirBlock?.extractContractDescriptionIfPossible(): Pair {