diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt index 1c2a62ee04d..32f50a8ee34 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt @@ -64,6 +64,7 @@ fun main(args: Array) { alias("FunctionChecker") alias("SimpleFunctionChecker") alias("PropertyChecker") + alias("ClassLikeChecker") alias("ClassChecker") alias("RegularClassChecker") alias("ConstructorChecker") diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ComposedDeclarationCheckers.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ComposedDeclarationCheckers.kt index 1834bb83d94..f2ed266023d 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ComposedDeclarationCheckers.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ComposedDeclarationCheckers.kt @@ -23,6 +23,8 @@ class ComposedDeclarationCheckers : DeclarationCheckers() { get() = _simpleFunctionCheckers override val propertyCheckers: Set get() = _propertyCheckers + override val classLikeCheckers: Set + get() = _classLikeCheckers override val classCheckers: Set get() = _classCheckers override val regularClassCheckers: Set @@ -58,6 +60,7 @@ class ComposedDeclarationCheckers : DeclarationCheckers() { private val _functionCheckers: MutableSet = mutableSetOf() private val _simpleFunctionCheckers: MutableSet = mutableSetOf() private val _propertyCheckers: MutableSet = mutableSetOf() + private val _classLikeCheckers: MutableSet = mutableSetOf() private val _classCheckers: MutableSet = mutableSetOf() private val _regularClassCheckers: MutableSet = mutableSetOf() private val _constructorCheckers: MutableSet = mutableSetOf() @@ -80,6 +83,7 @@ class ComposedDeclarationCheckers : DeclarationCheckers() { _functionCheckers += checkers.functionCheckers _simpleFunctionCheckers += checkers.simpleFunctionCheckers _propertyCheckers += checkers.propertyCheckers + _classLikeCheckers += checkers.classLikeCheckers _classCheckers += checkers.classCheckers _regularClassCheckers += checkers.regularClassCheckers _constructorCheckers += checkers.constructorCheckers diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DeclarationCheckers.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DeclarationCheckers.kt index 56619845020..a6dfe30fb11 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DeclarationCheckers.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DeclarationCheckers.kt @@ -23,6 +23,7 @@ abstract class DeclarationCheckers { open val functionCheckers: Set = emptySet() open val simpleFunctionCheckers: Set = emptySet() open val propertyCheckers: Set = emptySet() + open val classLikeCheckers: Set = emptySet() open val classCheckers: Set = emptySet() open val regularClassCheckers: Set = emptySet() open val constructorCheckers: Set = emptySet() @@ -44,17 +45,18 @@ abstract class DeclarationCheckers { @CheckersComponentInternal internal val allFunctionCheckers: Set by lazy { functionCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allSimpleFunctionCheckers: Set by lazy { simpleFunctionCheckers + functionCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allPropertyCheckers: Set by lazy { propertyCheckers + basicDeclarationCheckers } - @CheckersComponentInternal internal val allClassCheckers: Set by lazy { classCheckers + basicDeclarationCheckers } - @CheckersComponentInternal internal val allRegularClassCheckers: Set by lazy { regularClassCheckers + classCheckers + basicDeclarationCheckers } + @CheckersComponentInternal internal val allClassLikeCheckers: Set by lazy { classLikeCheckers + basicDeclarationCheckers } + @CheckersComponentInternal internal val allClassCheckers: Set by lazy { classCheckers + classLikeCheckers + basicDeclarationCheckers } + @CheckersComponentInternal internal val allRegularClassCheckers: Set by lazy { regularClassCheckers + classCheckers + classLikeCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allConstructorCheckers: Set by lazy { constructorCheckers + functionCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allFileCheckers: Set by lazy { fileCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allTypeParameterCheckers: Set by lazy { typeParameterCheckers + basicDeclarationCheckers } - @CheckersComponentInternal internal val allTypeAliasCheckers: Set by lazy { typeAliasCheckers + basicDeclarationCheckers } + @CheckersComponentInternal internal val allTypeAliasCheckers: Set by lazy { typeAliasCheckers + classLikeCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allAnonymousFunctionCheckers: Set by lazy { anonymousFunctionCheckers + functionCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allPropertyAccessorCheckers: Set by lazy { propertyAccessorCheckers + functionCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allBackingFieldCheckers: Set by lazy { backingFieldCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allValueParameterCheckers: Set by lazy { valueParameterCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allEnumEntryCheckers: Set by lazy { enumEntryCheckers + basicDeclarationCheckers } - @CheckersComponentInternal internal val allAnonymousObjectCheckers: Set by lazy { anonymousObjectCheckers + classCheckers + basicDeclarationCheckers } + @CheckersComponentInternal internal val allAnonymousObjectCheckers: Set by lazy { anonymousObjectCheckers + classCheckers + classLikeCheckers + basicDeclarationCheckers } @CheckersComponentInternal internal val allAnonymousInitializerCheckers: Set by lazy { anonymousInitializerCheckers + basicDeclarationCheckers } } diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerAliases.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerAliases.kt index 1f1eb3a1516..652da5cece3 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerAliases.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerAliases.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirClass +import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirEnumEntry @@ -32,6 +33,7 @@ typealias FirBasicDeclarationChecker = FirDeclarationChecker typealias FirFunctionChecker = FirDeclarationChecker typealias FirSimpleFunctionChecker = FirDeclarationChecker typealias FirPropertyChecker = FirDeclarationChecker +typealias FirClassLikeChecker = FirDeclarationChecker typealias FirClassChecker = FirDeclarationChecker typealias FirRegularClassChecker = FirDeclarationChecker typealias FirConstructorChecker = FirDeclarationChecker