diff --git a/analysis/analysis-api/testData/components/whenMissingCases/boolean_else.txt b/analysis/analysis-api/testData/components/whenMissingCases/boolean_else.txt index 8876194c620..9a8335629e0 100644 --- a/analysis/analysis-api/testData/components/whenMissingCases/boolean_else.txt +++ b/analysis/analysis-api/testData/components/whenMissingCases/boolean_else.txt @@ -1,2 +1,2 @@ -True - true -False - false +TrueIsMissing - true +FalseIsMissing - false diff --git a/analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.txt b/analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.txt index 8876194c620..9a8335629e0 100644 --- a/analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.txt +++ b/analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.txt @@ -1,2 +1,2 @@ -True - true -False - false +TrueIsMissing - true +FalseIsMissing - false diff --git a/analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.txt b/analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.txt index 57a52cb1aeb..a74097e4ffb 100644 --- a/analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.txt +++ b/analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.txt @@ -1 +1 @@ -False - false +FalseIsMissing - false diff --git a/analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.txt b/analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.txt index 1a624075a03..2cb92d86998 100644 --- a/analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.txt +++ b/analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.txt @@ -1,3 +1,3 @@ -True - true -False - false +TrueIsMissing - true +FalseIsMissing - false NullIsMissing - null diff --git a/analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.descriptors.txt b/analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.descriptors.txt index 164f1987ac7..adb2a5ab3be 100644 --- a/analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.descriptors.txt +++ b/analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.descriptors.txt @@ -1 +1 @@ -unknown - else +Unknown - else diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt index 1fa7cbba13c..4d6df5d020e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt @@ -246,10 +246,10 @@ private object WhenOnBooleanExhaustivenessChecker : WhenExhaustivenessChecker() val flags = Flags() whenExpression.accept(ConditionChecker, flags) if (!flags.containsTrue) { - destination.add(WhenMissingCase.BooleanIsMissing.True) + destination.add(WhenMissingCase.BooleanIsMissing.TrueIsMissing) } if (!flags.containsFalse) { - destination.add(WhenMissingCase.BooleanIsMissing.False) + destination.add(WhenMissingCase.BooleanIsMissing.FalseIsMissing) } } diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/WhenMissingCase.kt b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/WhenMissingCase.kt index 6eed35eda23..0f2b2f6e31c 100644 --- a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/WhenMissingCase.kt +++ b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/WhenMissingCase.kt @@ -32,8 +32,8 @@ sealed class WhenMissingCase { } sealed class BooleanIsMissing(val value: Boolean) : WhenMissingCase() { - object True : BooleanIsMissing(true) - object False : BooleanIsMissing(false) + object TrueIsMissing : BooleanIsMissing(true) + object FalseIsMissing : BooleanIsMissing(false) override val branchConditionText: String = value.toString() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt index 580b664db92..3c487e84f00 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.cfg import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.cfg.WhenOnEnumExhaustivenessChecker.enumEntries import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -117,8 +116,8 @@ private object WhenOnBooleanExhaustivenessChecker : WhenExhaustivenessChecker { } } } - return (if (!containsTrue) listOf(WhenMissingCase.BooleanIsMissing.True) else listOf()) + - (if (!containsFalse) listOf(WhenMissingCase.BooleanIsMissing.False) else listOf()) + + return (if (!containsTrue) listOf(WhenMissingCase.BooleanIsMissing.TrueIsMissing) else listOf()) + + (if (!containsFalse) listOf(WhenMissingCase.BooleanIsMissing.FalseIsMissing) else listOf()) + WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable) }