FIR: introduce block checkers
This commit is contained in:
+1
@@ -23,6 +23,7 @@ fun main(args: Array<String>) {
|
|||||||
alias<FirTryExpression>("TryExpressionChecker")
|
alias<FirTryExpression>("TryExpressionChecker")
|
||||||
alias<FirWhenExpression>("WhenExpressionChecker")
|
alias<FirWhenExpression>("WhenExpressionChecker")
|
||||||
alias<FirReturnExpression>("ReturnExpressionChecker")
|
alias<FirReturnExpression>("ReturnExpressionChecker")
|
||||||
|
alias<FirBlock>("BlockChecker")
|
||||||
}
|
}
|
||||||
|
|
||||||
val declarationPackage = "org.jetbrains.kotlin.fir.analysis.checkers.declaration"
|
val declarationPackage = "org.jetbrains.kotlin.fir.analysis.checkers.declaration"
|
||||||
|
|||||||
+4
@@ -27,6 +27,8 @@ internal class ComposedExpressionCheckers : ExpressionCheckers() {
|
|||||||
get() = _whenExpressionCheckers
|
get() = _whenExpressionCheckers
|
||||||
override val returnExpressionCheckers: Set<FirReturnExpressionChecker>
|
override val returnExpressionCheckers: Set<FirReturnExpressionChecker>
|
||||||
get() = _returnExpressionCheckers
|
get() = _returnExpressionCheckers
|
||||||
|
override val blockCheckers: Set<FirBlockChecker>
|
||||||
|
get() = _blockCheckers
|
||||||
|
|
||||||
private val _basicExpressionCheckers: MutableSet<FirBasicExpressionChecker> = mutableSetOf()
|
private val _basicExpressionCheckers: MutableSet<FirBasicExpressionChecker> = mutableSetOf()
|
||||||
private val _qualifiedAccessCheckers: MutableSet<FirQualifiedAccessChecker> = mutableSetOf()
|
private val _qualifiedAccessCheckers: MutableSet<FirQualifiedAccessChecker> = mutableSetOf()
|
||||||
@@ -35,6 +37,7 @@ internal class ComposedExpressionCheckers : ExpressionCheckers() {
|
|||||||
private val _tryExpressionCheckers: MutableSet<FirTryExpressionChecker> = mutableSetOf()
|
private val _tryExpressionCheckers: MutableSet<FirTryExpressionChecker> = mutableSetOf()
|
||||||
private val _whenExpressionCheckers: MutableSet<FirWhenExpressionChecker> = mutableSetOf()
|
private val _whenExpressionCheckers: MutableSet<FirWhenExpressionChecker> = mutableSetOf()
|
||||||
private val _returnExpressionCheckers: MutableSet<FirReturnExpressionChecker> = mutableSetOf()
|
private val _returnExpressionCheckers: MutableSet<FirReturnExpressionChecker> = mutableSetOf()
|
||||||
|
private val _blockCheckers: MutableSet<FirBlockChecker> = mutableSetOf()
|
||||||
|
|
||||||
@CheckersComponentInternal
|
@CheckersComponentInternal
|
||||||
internal fun register(checkers: ExpressionCheckers) {
|
internal fun register(checkers: ExpressionCheckers) {
|
||||||
@@ -45,5 +48,6 @@ internal class ComposedExpressionCheckers : ExpressionCheckers() {
|
|||||||
_tryExpressionCheckers += checkers.tryExpressionCheckers
|
_tryExpressionCheckers += checkers.tryExpressionCheckers
|
||||||
_whenExpressionCheckers += checkers.whenExpressionCheckers
|
_whenExpressionCheckers += checkers.whenExpressionCheckers
|
||||||
_returnExpressionCheckers += checkers.returnExpressionCheckers
|
_returnExpressionCheckers += checkers.returnExpressionCheckers
|
||||||
|
_blockCheckers += checkers.blockCheckers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -24,6 +24,7 @@ abstract class ExpressionCheckers {
|
|||||||
open val tryExpressionCheckers: Set<FirTryExpressionChecker> = emptySet()
|
open val tryExpressionCheckers: Set<FirTryExpressionChecker> = emptySet()
|
||||||
open val whenExpressionCheckers: Set<FirWhenExpressionChecker> = emptySet()
|
open val whenExpressionCheckers: Set<FirWhenExpressionChecker> = emptySet()
|
||||||
open val returnExpressionCheckers: Set<FirReturnExpressionChecker> = emptySet()
|
open val returnExpressionCheckers: Set<FirReturnExpressionChecker> = emptySet()
|
||||||
|
open val blockCheckers: Set<FirBlockChecker> = emptySet()
|
||||||
|
|
||||||
@CheckersComponentInternal internal val allBasicExpressionCheckers: Set<FirBasicExpressionChecker> get() = basicExpressionCheckers
|
@CheckersComponentInternal internal val allBasicExpressionCheckers: Set<FirBasicExpressionChecker> get() = basicExpressionCheckers
|
||||||
@CheckersComponentInternal internal val allQualifiedAccessCheckers: Set<FirQualifiedAccessChecker> get() = qualifiedAccessCheckers + basicExpressionCheckers
|
@CheckersComponentInternal internal val allQualifiedAccessCheckers: Set<FirQualifiedAccessChecker> get() = qualifiedAccessCheckers + basicExpressionCheckers
|
||||||
@@ -32,4 +33,5 @@ abstract class ExpressionCheckers {
|
|||||||
@CheckersComponentInternal internal val allTryExpressionCheckers: Set<FirTryExpressionChecker> get() = tryExpressionCheckers + basicExpressionCheckers
|
@CheckersComponentInternal internal val allTryExpressionCheckers: Set<FirTryExpressionChecker> get() = tryExpressionCheckers + basicExpressionCheckers
|
||||||
@CheckersComponentInternal internal val allWhenExpressionCheckers: Set<FirWhenExpressionChecker> get() = whenExpressionCheckers + basicExpressionCheckers
|
@CheckersComponentInternal internal val allWhenExpressionCheckers: Set<FirWhenExpressionChecker> get() = whenExpressionCheckers + basicExpressionCheckers
|
||||||
@CheckersComponentInternal internal val allReturnExpressionCheckers: Set<FirReturnExpressionChecker> get() = returnExpressionCheckers + basicExpressionCheckers
|
@CheckersComponentInternal internal val allReturnExpressionCheckers: Set<FirReturnExpressionChecker> get() = returnExpressionCheckers + basicExpressionCheckers
|
||||||
|
@CheckersComponentInternal internal val allBlockCheckers: Set<FirBlockChecker> get() = blockCheckers + basicExpressionCheckers
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -10,6 +10,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression
|
|||||||
* DO NOT MODIFY IT MANUALLY
|
* DO NOT MODIFY IT MANUALLY
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.fir.expressions.FirBlock
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
|
import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
|
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirReturnExpression
|
import org.jetbrains.kotlin.fir.expressions.FirReturnExpression
|
||||||
@@ -25,3 +26,4 @@ typealias FirVariableAssignmentChecker = FirExpressionChecker<FirVariableAssignm
|
|||||||
typealias FirTryExpressionChecker = FirExpressionChecker<FirTryExpression>
|
typealias FirTryExpressionChecker = FirExpressionChecker<FirTryExpression>
|
||||||
typealias FirWhenExpressionChecker = FirExpressionChecker<FirWhenExpression>
|
typealias FirWhenExpressionChecker = FirExpressionChecker<FirWhenExpression>
|
||||||
typealias FirReturnExpressionChecker = FirExpressionChecker<FirReturnExpression>
|
typealias FirReturnExpressionChecker = FirExpressionChecker<FirReturnExpression>
|
||||||
|
typealias FirBlockChecker = FirExpressionChecker<FirBlock>
|
||||||
|
|||||||
+4
@@ -105,6 +105,10 @@ class ExpressionCheckersDiagnosticComponent(
|
|||||||
checkers.allReturnExpressionCheckers.check(returnExpression, data, reporter)
|
checkers.allReturnExpressionCheckers.check(returnExpression, data, reporter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun visitBlock(block: FirBlock, data: CheckerContext) {
|
||||||
|
checkers.allBlockCheckers.check(block, data, reporter)
|
||||||
|
}
|
||||||
|
|
||||||
private fun <E : FirStatement> Collection<FirExpressionChecker<E>>.check(
|
private fun <E : FirStatement> Collection<FirExpressionChecker<E>>.check(
|
||||||
expression: E,
|
expression: E,
|
||||||
context: CheckerContext,
|
context: CheckerContext,
|
||||||
|
|||||||
Reference in New Issue
Block a user