Renamed JetType.isNullable() to isMarkedNullable()

This commit is contained in:
Valentin Kipyatkov
2014-12-03 21:36:10 +03:00
parent c76e69af62
commit b8d1f115bf
53 changed files with 91 additions and 96 deletions
@@ -41,7 +41,7 @@ fun CallableDescriptor.fuzzyExtensionReceiverType(): FuzzyType? {
fun FuzzyType.makeNotNullable() = FuzzyType(type.makeNotNullable(), freeParameters)
fun FuzzyType.makeNullable() = FuzzyType(type.makeNullable(), freeParameters)
fun FuzzyType.isNullable() = type.isNullable()
fun FuzzyType.isNullable() = type.isMarkedNullable()
class FuzzyType(
val type: JetType,
@@ -59,7 +59,7 @@ public fun approximateFlexibleTypes(jetType: JetType, outermost: Boolean = true)
return JetTypeImpl(
jetType.getAnnotations(),
jetType.getConstructor(),
jetType.isNullable(),
jetType.isMarkedNullable(),
jetType.getArguments().map { TypeProjectionImpl(it.getProjectionKind(), approximateFlexibleTypes(it.getType(), false)) },
ErrorUtils.createErrorScope("This type is not supposed to be used in member resolution", true)
)