azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more consistent names for inheritors of BooleanIsMissing

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/whenMissingCases/boolean_else.txt
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
True - true TrueIsMissing - true
False - false FalseIsMissing - false
analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.txt
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
True - true TrueIsMissing - true
False - false FalseIsMissing - false
analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
False - false FalseIsMissing - false
analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
True - true TrueIsMissing - true
False - false FalseIsMissing - false
NullIsMissing - null NullIsMissing - null
analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.descriptors.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
unknown - else Unknown - else
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt
+2 -2
View File
@@ -246,10 +246,10 @@ private object WhenOnBooleanExhaustivenessChecker : WhenExhaustivenessChecker()
val flags = Flags() val flags = Flags()
whenExpression.accept(ConditionChecker, flags) whenExpression.accept(ConditionChecker, flags)
if (!flags.containsTrue) { if (!flags.containsTrue) {
destination.add(WhenMissingCase.BooleanIsMissing.True) destination.add(WhenMissingCase.BooleanIsMissing.TrueIsMissing)
} }
if (!flags.containsFalse) { if (!flags.containsFalse) {
destination.add(WhenMissingCase.BooleanIsMissing.False) destination.add(WhenMissingCase.BooleanIsMissing.FalseIsMissing)
} }
} }
compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/WhenMissingCase.kt
+2 -2
View File
@@ -32,8 +32,8 @@ sealed class WhenMissingCase {
} }
sealed class BooleanIsMissing(val value: Boolean) : WhenMissingCase() { sealed class BooleanIsMissing(val value: Boolean) : WhenMissingCase() {
object True : BooleanIsMissing(true) object TrueIsMissing : BooleanIsMissing(true)
object False : BooleanIsMissing(false) object FalseIsMissing : BooleanIsMissing(false)
override val branchConditionText: String = value.toString() override val branchConditionText: String = value.toString()
} }
compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt
+2 -3
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.cfg
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.cfg.WhenOnEnumExhaustivenessChecker.enumEntries
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
@@ -117,8 +116,8 @@ private object WhenOnBooleanExhaustivenessChecker : WhenExhaustivenessChecker {
} }
} }
} }
return (if (!containsTrue) listOf(WhenMissingCase.BooleanIsMissing.True) else listOf()) + return (if (!containsTrue) listOf(WhenMissingCase.BooleanIsMissing.TrueIsMissing) else listOf()) +
(if (!containsFalse) listOf(WhenMissingCase.BooleanIsMissing.False) else listOf()) + (if (!containsFalse) listOf(WhenMissingCase.BooleanIsMissing.FalseIsMissing) else listOf()) +
WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable) WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable)
} }