From 0e634847387c76772164e4ab97268b0b99a15a14 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 7 Jun 2021 18:09:18 +0300
Subject: [PATCH] Fix OptIn marker usages in code according to new limitation

---
 .../cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt | 4 +---
 .../kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt | 2 +-
 .../jetbrains/kotlin/idea/fir/api/fixes/KtQuickFixesList.kt   | 4 ++--
 .../org/jetbrains/kotlin/idea/api/applicator/HLApplicator.kt  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
index 01f64db8bff..724004b3361 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir.utils
 
-import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.properties.ReadOnlyProperty
@@ -17,8 +16,7 @@ annotation class Protected
 
 @OptIn(Protected::class)
 abstract class AbstractArrayMapOwner<K : Any, V : Any> {
-    // TODO: make [arrayMap] protected and remove annotation after KT-19306 fix
-    @get:Protected
+    @Protected
     abstract val arrayMap: ArrayMap<V>
     protected abstract val typeRegistry: TypeRegistry<K, V>
 
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
index 0393651d226..5ddf883e675 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
@@ -433,7 +433,7 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
     )
 
     private class IrSyntheticJavaProperty(
-        @ObsoleteDescriptorBasedAPI
+        @property:ObsoleteDescriptorBasedAPI
         override val descriptor: SyntheticJavaPropertyDescriptor,
         override val symbol: IrPropertySymbol,
         private val getterSymbol: IrSimpleFunctionSymbol,
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/api/fixes/KtQuickFixesList.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/api/fixes/KtQuickFixesList.kt
index a3a3edfb3f3..9521317fdd2 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/api/fixes/KtQuickFixesList.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/api/fixes/KtQuickFixesList.kt
@@ -38,7 +38,7 @@ class KtQuickFixesList @ForKtQuickFixesListBuilder @OptIn(PrivateForInline::clas
 
 
     companion object {
-        @OptIn(ForKtQuickFixesListBuilder::class)
+        @OptIn(ForKtQuickFixesListBuilder::class, PrivateForInline::class)
         fun createCombined(registrars: List<KtQuickFixesList>): KtQuickFixesList {
             val allQuickFixes = registrars.map { it.quickFixes }.merge()
             return KtQuickFixesList(allQuickFixes)
@@ -90,7 +90,7 @@ class KtQuickFixesListBuilder private constructor() {
             .add(HLQuickFixFactory.HLApplicatorBasedFactory(quickFixFactory))
     }
 
-    @OptIn(ForKtQuickFixesListBuilder::class)
+    @OptIn(ForKtQuickFixesListBuilder::class, PrivateForInline::class)
     private fun build() = KtQuickFixesList(quickFixes)
 
     companion object {
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/api/applicator/HLApplicator.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/api/applicator/HLApplicator.kt
index 5549bf9a854..c15bebebebf 100644
--- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/api/applicator/HLApplicator.kt
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/api/applicator/HLApplicator.kt
@@ -114,7 +114,7 @@ internal class HLApplicatorImpl<PSI : PsiElement, INPUT : HLApplicatorInput>(
 
 
 class HLApplicatorBuilder<PSI : PsiElement, INPUT : HLApplicatorInput> internal constructor(
-    @PrivateForInline
+    @property:PrivateForInline
     var applyTo: ((PSI, INPUT, Project, Editor?) -> Unit)? = null,
     private var isApplicableByPsi: ((PSI) -> Boolean)? = null,
     private var getActionName: ((PSI, INPUT) -> String)? = null,