Skip to content

Check subject's module before reporting REDUNDANT_ELSE_IN_WHEN #5468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check subject's module before reporting REDUNDANT_ELSE_IN_WHEN #5468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion ...ers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExhaustiveWhenChecker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.WhenMissingCase
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.fullyExpandedClassId
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.declarations.utils.isEnumClass
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
Expand All @@ -22,8 +24,12 @@ import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus
import org.jetbrains.kotlin.fir.expressions.FirWhenExpression
import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition
import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock
import org.jetbrains.kotlin.fir.moduleData
import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.isBooleanOrNullableBoolean

object FirExhaustiveWhenChecker : FirWhenExpressionChecker(MppCheckerKind.Common) {
Expand Down Expand Up @@ -125,11 +131,24 @@ object FirExhaustiveWhenChecker : FirWhenExpressionChecker(MppCheckerKind.Common
if (whenExpression.exhaustivenessStatus == ExhaustivenessStatus.RedundantlyExhaustive) {
for (branch in whenExpression.branches) {
if (branch.source == null || branch.condition !is FirElseIfTrueCondition) continue
reporter.reportOn(branch.source, FirErrors.REDUNDANT_ELSE_IN_WHEN)

val subjectConeType = whenExpression.subjectVariable?.returnTypeRef?.coneType
if (subjectConeType == null ||
subjectConeType.isBooleanOrNullableBoolean || // Values are known
subjectConeType.getModuleDataOrNull() == context.session.moduleData // Subject is from the same module
) {
reporter.reportOn(branch.source, FirErrors.REDUNDANT_ELSE_IN_WHEN)
}
}
}
}

context(context: CheckerContext)
private fun ConeKotlinType.getModuleDataOrNull(): FirModuleData? {
val classId = fullyExpandedClassId(context.session) ?: return null
return context.session.symbolProvider.getClassLikeSymbolByClassId(classId)?.moduleData
}

private val KtSourceElement.isIfExpression: Boolean
get() = elementType == KtNodeTypes.IF

Expand Down
49 changes: 0 additions & 49 deletions compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.fir.kt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// RUN_PIPELINE_TILL: BACKEND
// MODULE: m1
// FILE: a.kt
Expand Down