FIR: set bound symbol for explicit this references

compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt

@@ -15,10 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.expressions.impl.FirLoopJump
 import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
 import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
-import org.jetbrains.kotlin.fir.symbols.ConeCallableSymbol
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeSymbol
-import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.symbols.*
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.types.*
@@ -755,16 +752,19 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         print("*")
     }
 
+    private fun ConeSymbol.render(): String {
+        if (this is ConeCallableSymbol)
+            return callableId.toString()
+        else if (this is ConeClassLikeSymbol)
+            return classId.toString()
+        return "?"
+    }
+
     override fun visitNamedReference(namedReference: FirNamedReference) {
         val symbol = namedReference.candidateSymbol
         when {
             symbol != null -> {
-                print("R?C|")
-                if (symbol is ConeCallableSymbol)
-                    print(symbol.callableId)
-                else if (symbol is ConeClassLikeSymbol)
-                    print(symbol.classId)
-                print("|")
+                print("R?C|${symbol.render()}|")
             }
             namedReference is FirErrorNamedReference -> print("<${namedReference.errorReason}>#")
             else -> print("${namedReference.name}#")
@@ -791,10 +791,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
             print("FakeOverride<")
         }
         val symbol = resolvedCallableReference.coneSymbol
-        if (symbol is ConeCallableSymbol)
-            print(symbol.callableId)
-        else if (symbol is ConeClassLikeSymbol)
-            print(symbol.classId)
+        print(symbol.render())
         if (isFakeOverride) {
             when (symbol) {
                 is FirNamedFunctionSymbol -> {
@@ -814,10 +811,11 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
     override fun visitThisReference(thisReference: FirThisReference) {
         print("this")
         val labelName = thisReference.labelName
-        if (labelName != null) {
-            print("@$labelName")
-        } else {
-            print("#")
+        val symbol = thisReference.candidateOwner
+        when {
+            symbol != null -> print("@R|${symbol.render()}|")
+            labelName != null -> print("@$labelName#")
+            else -> print("#")
         }
     }
 

compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt

@@ -5,11 +5,14 @@
 
 package org.jetbrains.kotlin.fir
 
+import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
 
 interface FirThisReference : FirReference {
     val labelName: String?
 
+    val candidateOwner: AbstractFirBasedSymbol<*>? get() = null
+
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
         visitor.visitThisReference(this, data)
 }

compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt

@@ -8,5 +8,8 @@ package org.jetbrains.kotlin.fir.references
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.FirAbstractElement
 import org.jetbrains.kotlin.fir.FirThisReference
+import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 
-class FirExplicitThisReference(psi: PsiElement?, override val labelName: String?) : FirAbstractElement(psi), FirThisReference
+class FirExplicitThisReference(psi: PsiElement?, override val labelName: String?) : FirAbstractElement(psi), FirThisReference {
+    override var candidateOwner: AbstractFirBasedSymbol<*>? = null
+}