FIR checker: pluralize top-level/member function/property checkers
This commit is contained in:
committed by
Dmitriy Novozhilov
parent
d348e58183
commit
774ba58062
+1
-1
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.*
|
|||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
|
|
||||||
// See old FE's [DeclarationsChecker]
|
// See old FE's [DeclarationsChecker]
|
||||||
object FirMemberFunctionChecker : FirRegularClassChecker() {
|
object FirMemberFunctionsChecker : FirRegularClassChecker() {
|
||||||
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
for (member in declaration.declarations) {
|
for (member in declaration.declarations) {
|
||||||
if (member is FirSimpleFunction) {
|
if (member is FirSimpleFunction) {
|
||||||
+1
-1
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
|
|||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
|
|
||||||
// See old FE's [DeclarationsChecker]
|
// See old FE's [DeclarationsChecker]
|
||||||
object FirMemberPropertyChecker : FirRegularClassChecker() {
|
object FirMemberPropertiesChecker : FirRegularClassChecker() {
|
||||||
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
val memberPropertySymbols = declaration.declarations.filterIsInstance<FirProperty>().map { it.symbol }.toSet()
|
val memberPropertySymbols = declaration.declarations.filterIsInstance<FirProperty>().map { it.symbol }.toSet()
|
||||||
val initializedInConstructor =
|
val initializedInConstructor =
|
||||||
+1
-1
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.*
|
|||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
|
|
||||||
// See old FE's [DeclarationsChecker]
|
// See old FE's [DeclarationsChecker]
|
||||||
object FirTopLevelFunctionChecker : FirFileChecker() {
|
object FirTopLevelFunctionsChecker : FirFileChecker() {
|
||||||
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
for (topLevelDeclaration in declaration.declarations) {
|
for (topLevelDeclaration in declaration.declarations) {
|
||||||
if (topLevelDeclaration is FirSimpleFunction) {
|
if (topLevelDeclaration is FirSimpleFunction) {
|
||||||
+1
-1
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirFile
|
|||||||
import org.jetbrains.kotlin.fir.declarations.FirProperty
|
import org.jetbrains.kotlin.fir.declarations.FirProperty
|
||||||
|
|
||||||
// See old FE's [DeclarationsChecker]
|
// See old FE's [DeclarationsChecker]
|
||||||
object FirTopLevelPropertyChecker : FirFileChecker() {
|
object FirTopLevelPropertiesChecker : FirFileChecker() {
|
||||||
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirFile, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
for (topLevelDeclaration in declaration.declarations) {
|
for (topLevelDeclaration in declaration.declarations) {
|
||||||
if (topLevelDeclaration is FirProperty) {
|
if (topLevelDeclaration is FirProperty) {
|
||||||
+4
-4
@@ -59,8 +59,8 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
|
|||||||
FirSupertypeInitializedInInterfaceChecker,
|
FirSupertypeInitializedInInterfaceChecker,
|
||||||
FirSupertypeInitializedWithoutPrimaryConstructor,
|
FirSupertypeInitializedWithoutPrimaryConstructor,
|
||||||
FirTypeParametersInObjectChecker,
|
FirTypeParametersInObjectChecker,
|
||||||
FirMemberFunctionChecker,
|
FirMemberFunctionsChecker,
|
||||||
FirMemberPropertyChecker,
|
FirMemberPropertiesChecker,
|
||||||
FirNestedClassChecker,
|
FirNestedClassChecker,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -69,8 +69,8 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
override val fileCheckers: Set<FirFileChecker> = setOf(
|
override val fileCheckers: Set<FirFileChecker> = setOf(
|
||||||
FirTopLevelFunctionChecker,
|
FirTopLevelFunctionsChecker,
|
||||||
FirTopLevelPropertyChecker,
|
FirTopLevelPropertiesChecker,
|
||||||
)
|
)
|
||||||
|
|
||||||
override val controlFlowAnalyserCheckers: Set<FirControlFlowChecker> = setOf(
|
override val controlFlowAnalyserCheckers: Set<FirControlFlowChecker> = setOf(
|
||||||
|
|||||||
Reference in New Issue
Block a user