From 0c17ce2f4428f4bdc38465e40dfebb9372fe185c Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 7 Apr 2021 16:28:01 +0300
Subject: [PATCH] Suppress DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER in
 code

---
 .../kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt         | 2 ++
 .../kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt  | 1 +
 .../fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt     | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
index 79872d2eac4..5094cd2a143 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
@@ -162,6 +162,8 @@ 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)
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
index 4e29e149e3c..9d3f77dc986 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
@@ -63,5 +63,6 @@ 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)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
index 38003d5e306..1322b844198 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
@@ -79,10 +79,14 @@ inline fun <reified D : FirCallableDeclaration<*>> D.unwrapFakeOverrides(): D {
 inline fun <reified S : FirCallableSymbol<*>> S.unwrapFakeOverrides(): S = fir.unwrapFakeOverrides().symbol as S
 
 private object SubstitutedOverrideOriginalKey : FirDeclarationDataKey()
+
+@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.originalForSubstitutionOverrideAttr: D? by FirDeclarationDataRegistry.data(SubstitutedOverrideOriginalKey)
 
 private object IntersectionOverrideOriginalKey : FirDeclarationDataKey()
+
+@Suppress("DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER")
 var <D : FirCallableDeclaration<*>>
         D.originalForIntersectionOverrideAttr: D? by FirDeclarationDataRegistry.data(IntersectionOverrideOriginalKey)