Fix OptIn marker usages in code according to new limitation

This commit is contained in:
Mikhail Glukhikh
2021-06-07 18:09:18 +03:00
committed by teamcityserver
parent 63bc3f9708
commit 0e63484738
4 changed files with 5 additions and 7 deletions
@@ -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>
@@ -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,
@@ -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 {
@@ -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,