diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DefaultDeclarationCheckers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DefaultDeclarationCheckers.kt index d8facde60ee..97da78334dc 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DefaultDeclarationCheckers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/DefaultDeclarationCheckers.kt @@ -5,11 +5,6 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantExplicitTypeChecker -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantModalityModifierChecker -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantReturnUnitType -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantVisibilityModifierChecker - object CommonDeclarationCheckers : DeclarationCheckers() { override val declarationCheckers: List = listOf( FirAnnotationClassDeclarationChecker, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationChecker.kt deleted file mode 100644 index e7eca0ae461..00000000000 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationChecker.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir.analysis.checkers.declaration - -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantExplicitTypeChecker -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantModalityModifierChecker -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantReturnUnitType -import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantVisibilityModifierChecker - -object ExtendedDeclarationCheckers : DeclarationCheckers() { - override val declarationCheckers = listOf( - RedundantVisibilityModifierChecker, - RedundantReturnUnitType - ) - - override val memberDeclarationCheckers = listOf( - RedundantExplicitTypeChecker, - RedundantModalityModifierChecker - ) -} \ No newline at end of file diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationCheckers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationCheckers.kt index ca8929c3949..1b22c8cad1c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationCheckers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/ExtendedDeclarationCheckers.kt @@ -5,12 +5,20 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantExplicitTypeChecker import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantModalityModifierChecker +import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantReturnUnitType import org.jetbrains.kotlin.fir.analysis.checkers.extended.RedundantVisibilityModifierChecker object ExtendedDeclarationCheckers : DeclarationCheckers() { - override val declarationCheckers = listOf(RedundantVisibilityModifierChecker, RedundantVisibilityModifierChecker) + override val declarationCheckers = listOf( + RedundantVisibilityModifierChecker, + RedundantReturnUnitType + ) - override val memberDeclarationCheckers = listOf(RedundantModalityModifierChecker) + override val memberDeclarationCheckers = listOf( + RedundantModalityModifierChecker, + RedundantExplicitTypeChecker + ) }