From 774ba5806294cd2a61dec4e1541b7d259134e4f2 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Wed, 3 Mar 2021 14:39:33 -0800 Subject: [PATCH] FIR checker: pluralize top-level/member function/property checkers --- ...berFunctionChecker.kt => FirMemberFunctionsChecker.kt} | 2 +- ...erPropertyChecker.kt => FirMemberPropertiesChecker.kt} | 2 +- ...lFunctionChecker.kt => FirTopLevelFunctionsChecker.kt} | 2 +- ...PropertyChecker.kt => FirTopLevelPropertiesChecker.kt} | 2 +- .../kotlin/fir/checkers/CommonDeclarationCheckers.kt | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/{FirMemberFunctionChecker.kt => FirMemberFunctionsChecker.kt} (98%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/{FirMemberPropertyChecker.kt => FirMemberPropertiesChecker.kt} (99%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/{FirTopLevelFunctionChecker.kt => FirTopLevelFunctionsChecker.kt} (97%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/{FirTopLevelPropertyChecker.kt => FirTopLevelPropertiesChecker.kt} (96%) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt similarity index 98% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionChecker.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt index 901f4f9ce3c..5a138420ccd 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt @@ -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) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertyChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt similarity index 99% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertyChecker.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt index 0ec01e17696..0e1e66207e6 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertyChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt @@ -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().map { it.symbol }.toSet() val initializedInConstructor = diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt similarity index 97% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionChecker.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt index f2645db7b6a..074bb42695a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt @@ -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) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertyChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt similarity index 96% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertyChecker.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt index e14077461f0..d25091f5dc0 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertyChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt @@ -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) { diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/checkers/CommonDeclarationCheckers.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/checkers/CommonDeclarationCheckers.kt index 2a0b08da41c..9ff80df6f41 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/checkers/CommonDeclarationCheckers.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/checkers/CommonDeclarationCheckers.kt @@ -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 = setOf( - FirTopLevelFunctionChecker, - FirTopLevelPropertyChecker, + FirTopLevelFunctionsChecker, + FirTopLevelPropertiesChecker, ) override val controlFlowAnalyserCheckers: Set = setOf(