From d3b9419837a8d5352864e59b80a6830a2c333352 Mon Sep 17 00:00:00 2001 From: Tianyu Geng Date: Fri, 24 Sep 2021 09:08:03 -0700 Subject: [PATCH] FIR checker: FirReturnAllowedChecker -> FirReturnSyntaxAndLabelChecker --- .../kotlin/fir/analysis/checkers/CommonExpressionCheckers.kt | 2 +- ...eturnAllowedChecker.kt => FirReturnSyntaxAndLabelChecker.kt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/{FirReturnAllowedChecker.kt => FirReturnSyntaxAndLabelChecker.kt} (98%) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonExpressionCheckers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonExpressionCheckers.kt index b75a8d6df5b..753b8a67a94 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonExpressionCheckers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonExpressionCheckers.kt @@ -96,7 +96,7 @@ object CommonExpressionCheckers : ExpressionCheckers() { override val returnExpressionCheckers: Set get() = setOf( - FirReturnAllowedChecker, + FirReturnSyntaxAndLabelChecker, FirFunctionReturnTypeMismatchChecker ) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnAllowedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt similarity index 98% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnAllowedChecker.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt index 1b05504c12f..6ad1a00103f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnAllowedChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol -object FirReturnAllowedChecker : FirReturnExpressionChecker() { +object FirReturnSyntaxAndLabelChecker : FirReturnExpressionChecker() { override fun check(expression: FirReturnExpression, context: CheckerContext, reporter: DiagnosticReporter) { val source = expression.source if (source?.kind == FirFakeSourceElementKind.ImplicitReturn) return