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

Minor refactoring: WhenChecker

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-04-19 15:04:49 +03:00
parent 420c7a0285
commit 5ec7b5bef0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt
+5 -5
View File
@@ -73,7 +73,7 @@ private object NullMissingCase : WhenMissingCase {
// It's not a regular exhaustiveness checker, invoke it only inside other checkers // It's not a regular exhaustiveness checker, invoke it only inside other checkers
private object WhenOnNullableExhaustivenessChecker /* : WhenExhaustivenessChecker*/ { private object WhenOnNullableExhaustivenessChecker /* : WhenExhaustivenessChecker*/ {
fun getMissingCases(expression: KtWhenExpression, context: BindingContext, subjectDescriptor: ClassDescriptor?, nullable: Boolean) = fun getMissingCases(expression: KtWhenExpression, context: BindingContext, nullable: Boolean) =
if (nullable) getNullCaseIfMissing(expression, context) else listOf() if (nullable) getNullCaseIfMissing(expression, context) else listOf()
private fun getNullCaseIfMissing(expression: KtWhenExpression, context: BindingContext): List<WhenMissingCase> { private fun getNullCaseIfMissing(expression: KtWhenExpression, context: BindingContext): List<WhenMissingCase> {
@@ -120,7 +120,7 @@ private object WhenOnBooleanExhaustivenessChecker : WhenExhaustivenessChecker {
} }
return (if (!containsTrue) listOf(BooleanMissingCase(true)) else listOf()) + return (if (!containsTrue) listOf(BooleanMissingCase(true)) else listOf()) +
(if (!containsFalse) listOf(BooleanMissingCase(false)) else listOf()) + (if (!containsFalse) listOf(BooleanMissingCase(false)) else listOf()) +
WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, subjectDescriptor, nullable) WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable)
} }
override fun isApplicable(subjectType: KotlinType): Boolean { override fun isApplicable(subjectType: KotlinType): Boolean {
@@ -212,7 +212,7 @@ private object WhenOnEnumExhaustivenessChecker : WhenOnClassExhaustivenessChecke
.filterIsInstance<ClassDescriptor>() .filterIsInstance<ClassDescriptor>()
.toSet() .toSet()
return getMissingClassCases(expression, entryDescriptors, context) + return getMissingClassCases(expression, entryDescriptors, context) +
WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, subjectDescriptor, nullable) WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable)
} }
override fun isApplicable(subjectType: KotlinType): Boolean { override fun isApplicable(subjectType: KotlinType): Boolean {
@@ -235,7 +235,7 @@ private object WhenOnSealedExhaustivenessChecker : WhenOnClassExhaustivenessChec
collectNestedSubclasses(subjectDescriptor!!, subjectDescriptor, memberClassDescriptors) collectNestedSubclasses(subjectDescriptor!!, subjectDescriptor, memberClassDescriptors)
// When on a sealed class without derived members is considered non-exhaustive (see test WhenOnEmptySealed) // When on a sealed class without derived members is considered non-exhaustive (see test WhenOnEmptySealed)
return getMissingClassCases(expression, memberClassDescriptors, context) + return getMissingClassCases(expression, memberClassDescriptors, context) +
WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, subjectDescriptor, nullable) WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, nullable)
} }
override fun isApplicable(subjectType: KotlinType): Boolean { override fun isApplicable(subjectType: KotlinType): Boolean {
@@ -331,7 +331,7 @@ object WhenChecker {
} }
fun containsNullCase(expression: KtWhenExpression, context: BindingContext) = fun containsNullCase(expression: KtWhenExpression, context: BindingContext) =
WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, null, true).isEmpty() WhenOnNullableExhaustivenessChecker.getMissingCases(expression, context, true).isEmpty()
fun checkDeprecatedWhenSyntax(trace: BindingTrace, expression: KtWhenExpression) { fun checkDeprecatedWhenSyntax(trace: BindingTrace, expression: KtWhenExpression) {
if (expression.subjectExpression != null) return if (expression.subjectExpression != null) return