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

Rewrite FirDeclarationDataRegistry.data to avoid type parameter problems

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-04-08 13:38:14 +03:00
parent 0c17ce2f44
commit e2cc0510de
5 changed files with 13 additions and 13 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
-2
View File
@@ -162,8 +162,6 @@ class DelegatedWrapperData<D : FirCallableDeclaration<*>>(
val containingClass: ConeClassLikeLookupTag,
val delegateField: FirField,
)
@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
var <D : FirCallableDeclaration<*>>
D.delegatedWrapperData: DelegatedWrapperData<D>? by FirDeclarationDataRegistry.data(DelegatedWrapperDataKey)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
-1
View File
@@ -63,6 +63,5 @@ class ImportedFromObjectData<D : FirCallableDeclaration<*>>(
val original: D,
)
@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
var <D : FirCallableDeclaration<*>>
D.importedFromObjectData: ImportedFromObjectData<D>? by FirDeclarationDataRegistry.data(ImportedFromObjectClassIdKey)