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

KT-12150 Smart completion suggests to compare non-nullable with null

Browse Source 
#KT-12150 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-04-29 17:05:05 +03:00
parent 40900b0050
commit 941b415981
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt
+6 -2
View File
@@ -148,6 +148,8 @@ object IfConditionAdditionalData : ExpectedInfo.AdditionalData
object PropertyDelegateAdditionalData : ExpectedInfo.AdditionalData
class ComparisonOperandAdditionalData(val suppressNullLiteral: Boolean) : ExpectedInfo.AdditionalData
class ExpectedInfos(
private val bindingContext: BindingContext,
private val resolutionFacade: ResolutionFacade,
@@ -414,12 +416,14 @@ class ExpectedInfos(
return listOf(ExpectedInfo(NullableTypesFilter, expectedName, null))
}
// if we complete argument of == or !=, make types in expected info's nullable to allow nullable items too
var additionalData: ExpectedInfo.AdditionalData? = null
if (operationToken in COMPARISON_TOKENS) {
// if we complete argument of == or !=, make types in expected info's nullable to allow items of nullable type too
additionalData = ComparisonOperandAdditionalData(suppressNullLiteral = expectedType.nullability() == TypeNullability.NOT_NULL)
expectedType = expectedType.makeNullable()
}
return listOf(ExpectedInfo(expectedType, expectedName, null))
return listOf(ExpectedInfo(expectedType, expectedName, null, additionalData = additionalData))
}
}
}