From 67a72433611fea7a648a68e4d9a448951d7af3f8 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 27 Aug 2019 16:17:41 +0300
Subject: [PATCH] FIR (rename): candidateOwner -> boundSymbol

---
 .../src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt | 6 +++---
 .../fir/resolve/transformers/FirBodyResolveTransformer.kt   | 2 +-
 .../fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt    | 2 +-
 .../tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt   | 2 +-
 .../kotlin/fir/references/FirExplicitThisReference.kt       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index 9b239791d92..500c7f6a5df 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -105,9 +105,9 @@ fun FirReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbo
     return when (this) {
         is FirResolvedCallableReference -> coneSymbol.toSymbol(declarationStorage)
         is FirThisReference -> {
-            when (val ownerSymbol = candidateOwner?.toSymbol(declarationStorage)) {
-                is IrClassSymbol -> ownerSymbol.owner.thisReceiver?.symbol
-                is IrFunctionSymbol -> ownerSymbol.owner.extensionReceiverParameter?.symbol
+            when (val boundSymbol = boundSymbol?.toSymbol(declarationStorage)) {
+                is IrClassSymbol -> boundSymbol.owner.thisReceiver?.symbol
+                is IrFunctionSymbol -> boundSymbol.owner.extensionReceiverParameter?.symbol
                 else -> null
             }
         }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
index e0752682818..8a4d6961b58 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
@@ -203,7 +203,7 @@ open class FirBodyResolveTransformer(
                 val implicitReceivers =
                     if (labelName == null) implicitReceiverPerLabel.values() else implicitReceiverPerLabel[Name.identifier(labelName)]
                 val implicitReceiver = implicitReceivers.lastOrNull()
-                callee.candidateOwner = implicitReceiver?.boundSymbol
+                callee.boundSymbol = implicitReceiver?.boundSymbol
                 qualifiedAccessExpression.resultType = FirResolvedTypeRefImpl(
                     null, implicitReceiver?.type ?: ConeKotlinErrorType("Unresolved this@$labelName"),
                     emptyList()
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index 11c8d38a2f8..bf0e277a20c 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -808,7 +808,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
     override fun visitThisReference(thisReference: FirThisReference) {
         print("this")
         val labelName = thisReference.labelName
-        val symbol = thisReference.candidateOwner
+        val symbol = thisReference.boundSymbol
         when {
             symbol != null -> print("@R|${symbol.render()}|")
             labelName != null -> print("@$labelName#")
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt
index 774f0881515..cc57c2e8bcb 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor
 interface FirThisReference : FirReference {
     val labelName: String?
 
-    val candidateOwner: AbstractFirBasedSymbol<*>? get() = null
+    val boundSymbol: AbstractFirBasedSymbol<*>? get() = null
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
         visitor.visitThisReference(this, data)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt
index 597f5be3891..b9a07080928 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt
@@ -11,5 +11,5 @@ import org.jetbrains.kotlin.fir.FirThisReference
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 
 class FirExplicitThisReference(psi: PsiElement?, override val labelName: String?) : FirAbstractElement(psi), FirThisReference {
-    override var candidateOwner: AbstractFirBasedSymbol<*>? = null
+    override var boundSymbol: AbstractFirBasedSymbol<*>? = null
 }
\ No newline at end of file