azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Set proper callable id for delegated members

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-02-28 13:11:56 +02:00
committed by Space Team
parent 2fb79bf0b1
commit f44fcc811b
7 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+4 -6
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.DelegatedWrapperData
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.classId
import org.jetbrains.kotlin.fir.declarations.utils.modality
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.delegatedWrapperData
@@ -23,6 +24,7 @@ import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import org.jetbrains.kotlin.fir.types.ConeFlexibleType
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.isMarkedNullable
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.StandardClassIds
@@ -88,9 +90,7 @@ class FirDelegatedMemberScope(
val delegatedSymbol =
FirFakeOverrideGenerator.createCopyForFirFunction(
FirNamedFunctionSymbol(
functionSymbol.callableId,
),
FirNamedFunctionSymbol(CallableId(containingClass.classId, functionSymbol.name)),
original,
derivedClassLookupTag = dispatchReceiverType.lookupTag,
session,
@@ -158,9 +158,7 @@ class FirDelegatedMemberScope(
val delegatedSymbol =
FirFakeOverrideGenerator.createCopyForFirProperty(
FirPropertySymbol(
propertySymbol.callableId
),
FirPropertySymbol(CallableId(containingClass.classId, propertySymbol.name)),
original,
derivedClassLookupTag = dispatchReceiverType.lookupTag,
session,