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

FIR: Fix compilation after rebase

Browse Source
This commit is contained in:
Denis.Zharkov
2021-06-30 11:20:36 +03:00
committed by TeamCityServer
parent 44113f8501
commit 3671b14e5b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+6 -4
View File
@@ -9,6 +9,8 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.modality
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.defaultType import org.jetbrains.kotlin.fir.resolve.defaultType
import org.jetbrains.kotlin.fir.resolve.scope import org.jetbrains.kotlin.fir.resolve.scope
@@ -28,7 +30,7 @@ import org.jetbrains.kotlin.name.StandardClassIds
class FirDelegatedMemberScope( class FirDelegatedMemberScope(
private val session: FirSession, private val session: FirSession,
private val scopeSession: ScopeSession, private val scopeSession: ScopeSession,
private val containingClass: FirClass<*>, private val containingClass: FirClass,
private val declaredMemberScope: FirScope, private val declaredMemberScope: FirScope,
private val delegateFields: List<FirField>, private val delegateFields: List<FirField>,
) : FirScope() { ) : FirScope() {
@@ -173,15 +175,15 @@ class FirDelegatedMemberScope(
private object MultipleDelegatesWithTheSameSignatureKey : FirDeclarationDataKey() private object MultipleDelegatesWithTheSameSignatureKey : FirDeclarationDataKey()
var FirCallableDeclaration<*>.multipleDelegatesWithTheSameSignature: Boolean? by FirDeclarationDataRegistry.data(MultipleDelegatesWithTheSameSignatureKey) var FirCallableDeclaration.multipleDelegatesWithTheSameSignature: Boolean? by FirDeclarationDataRegistry.data(MultipleDelegatesWithTheSameSignatureKey)
private object DelegatedWrapperDataKey : FirDeclarationDataKey() private object DelegatedWrapperDataKey : FirDeclarationDataKey()
class DelegatedWrapperData<D : FirCallableDeclaration<*>>( class DelegatedWrapperData<D : FirCallableDeclaration>(
val wrapped: D, val wrapped: D,
val containingClass: ConeClassLikeLookupTag, val containingClass: ConeClassLikeLookupTag,
val delegateField: FirField, val delegateField: FirField,
) )
var <D : FirCallableDeclaration<*>> var <D : FirCallableDeclaration>
D.delegatedWrapperData: DelegatedWrapperData<D>? by FirDeclarationDataRegistry.data(DelegatedWrapperDataKey) D.delegatedWrapperData: DelegatedWrapperData<D>? by FirDeclarationDataRegistry.data(DelegatedWrapperDataKey)