FIR checker: pluralize top-level/member function/property checkers

This commit is contained in:
Jinseong Jeon
2021-03-03 14:39:33 -08:00
committed by Dmitriy Novozhilov
parent d348e58183
commit 774ba58062
5 changed files with 8 additions and 8 deletions
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.lexer.KtTokens
// See old FE's [DeclarationsChecker]
object FirMemberFunctionChecker : FirRegularClassChecker() {
object FirMemberFunctionsChecker : FirRegularClassChecker() {
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
for (member in declaration.declarations) {
if (member is FirSimpleFunction) {
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.lexer.KtTokens
// See old FE's [DeclarationsChecker]
object FirMemberPropertyChecker : FirRegularClassChecker() {
object FirMemberPropertiesChecker : FirRegularClassChecker() {
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
val memberPropertySymbols = declaration.declarations.filterIsInstance<FirProperty>().map { it.symbol }.toSet()
val initializedInConstructor =
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.lexer.KtTokens
// See old FE's [DeclarationsChecker]
object FirTopLevelFunctionChecker : FirFileChecker() {
object FirTopLevelFunctionsChecker : FirFileChecker() {
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
for (topLevelDeclaration in declaration.declarations) {
if (topLevelDeclaration is FirSimpleFunction) {
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirProperty
// See old FE's [DeclarationsChecker]
object FirTopLevelPropertyChecker : FirFileChecker() {
object FirTopLevelPropertiesChecker : FirFileChecker() {
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
for (topLevelDeclaration in declaration.declarations) {
if (topLevelDeclaration is FirProperty) {
@@ -59,8 +59,8 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
FirSupertypeInitializedInInterfaceChecker,
FirSupertypeInitializedWithoutPrimaryConstructor,
FirTypeParametersInObjectChecker,
FirMemberFunctionChecker,
FirMemberPropertyChecker,
FirMemberFunctionsChecker,
FirMemberPropertiesChecker,
FirNestedClassChecker,
)
@@ -69,8 +69,8 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
)
override val fileCheckers: Set<FirFileChecker> = setOf(
FirTopLevelFunctionChecker,
FirTopLevelPropertyChecker,
FirTopLevelFunctionsChecker,
FirTopLevelPropertiesChecker,
)
override val controlFlowAnalyserCheckers: Set<FirControlFlowChecker> = setOf(