Use more consistent names for inheritors of BooleanIsMissing

This commit is contained in:
Tianyu Geng
2021-11-04 11:11:40 -07:00
committed by Ilya Kirillov
parent 2c2851af6e
commit f217bb94de
8 changed files with 14 additions and 15 deletions
@@ -1,2 +1,2 @@
True - true
False - false
TrueIsMissing - true
FalseIsMissing - false
@@ -1,2 +1,2 @@
True - true
False - false
TrueIsMissing - true
FalseIsMissing - false
@@ -1 +1 @@
False - false
FalseIsMissing - false
@@ -1,3 +1,3 @@
True - true
False - false
TrueIsMissing - true
FalseIsMissing - false
NullIsMissing - null
@@ -1 +1 @@
unknown - else
Unknown - else
@@ -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)
}
}
@@ -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()
}
@@ -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)
}