From c9d23f795ae05222d4ed16f0bc331e33477f4729 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Mon, 26 Feb 2024 09:35:57 +0100 Subject: [PATCH] [FIR] Use named arguments in ConeBuiltinTypeUtils --- .../kotlin/fir/types/ConeBuiltinTypeUtils.kt | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeBuiltinTypeUtils.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeBuiltinTypeUtils.kt index ad1b380e995..dbca5a7369f 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeBuiltinTypeUtils.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeBuiltinTypeUtils.kt @@ -8,46 +8,46 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.StandardClassIds -val ConeKotlinType.isByte: Boolean get() = isBuiltinType(StandardClassIds.Byte, false) -val ConeKotlinType.isShort: Boolean get() = isBuiltinType(StandardClassIds.Short, false) -val ConeKotlinType.isInt: Boolean get() = isBuiltinType(StandardClassIds.Int, false) -val ConeKotlinType.isLong: Boolean get() = isBuiltinType(StandardClassIds.Long, false) -val ConeKotlinType.isFloat: Boolean get() = isBuiltinType(StandardClassIds.Float, false) -val ConeKotlinType.isDouble: Boolean get() = isBuiltinType(StandardClassIds.Double, false) +val ConeKotlinType.isByte: Boolean get() = isBuiltinType(StandardClassIds.Byte, isNullable = false) +val ConeKotlinType.isShort: Boolean get() = isBuiltinType(StandardClassIds.Short, isNullable = false) +val ConeKotlinType.isInt: Boolean get() = isBuiltinType(StandardClassIds.Int, isNullable = false) +val ConeKotlinType.isLong: Boolean get() = isBuiltinType(StandardClassIds.Long, isNullable = false) +val ConeKotlinType.isFloat: Boolean get() = isBuiltinType(StandardClassIds.Float, isNullable = false) +val ConeKotlinType.isDouble: Boolean get() = isBuiltinType(StandardClassIds.Double, isNullable = false) -val ConeKotlinType.isAny: Boolean get() = isBuiltinType(StandardClassIds.Any, false) -val ConeKotlinType.isNullableAny: Boolean get() = isBuiltinType(StandardClassIds.Any, true) -val ConeKotlinType.isAnyOrNullableAny: Boolean get() = isBuiltinType(StandardClassIds.Any, null) -val ConeKotlinType.isNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, false) -val ConeKotlinType.isNullableNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, true) -val ConeKotlinType.isNothingOrNullableNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, null) +val ConeKotlinType.isAny: Boolean get() = isBuiltinType(StandardClassIds.Any, isNullable = false) +val ConeKotlinType.isNullableAny: Boolean get() = isBuiltinType(StandardClassIds.Any, isNullable = true) +val ConeKotlinType.isAnyOrNullableAny: Boolean get() = isBuiltinType(StandardClassIds.Any, isNullable = null) +val ConeKotlinType.isNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, isNullable = false) +val ConeKotlinType.isNullableNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, isNullable = true) +val ConeKotlinType.isNothingOrNullableNothing: Boolean get() = isBuiltinType(StandardClassIds.Nothing, isNullable = null) -val ConeKotlinType.isUnit: Boolean get() = isBuiltinType(StandardClassIds.Unit, false) -val ConeKotlinType.isUnitOrNullableUnit: Boolean get() = isBuiltinType(StandardClassIds.Unit, null) -val ConeKotlinType.isBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, false) -val ConeKotlinType.isNullableBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, true) -val ConeKotlinType.isBooleanOrNullableBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, null) +val ConeKotlinType.isUnit: Boolean get() = isBuiltinType(StandardClassIds.Unit, isNullable = false) +val ConeKotlinType.isUnitOrNullableUnit: Boolean get() = isBuiltinType(StandardClassIds.Unit, isNullable = null) +val ConeKotlinType.isBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, isNullable = false) +val ConeKotlinType.isNullableBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, isNullable = true) +val ConeKotlinType.isBooleanOrNullableBoolean: Boolean get() = isBuiltinType(StandardClassIds.Boolean, isNullable = null) val ConeKotlinType.isThrowableOrNullableThrowable: Boolean get() = isAnyOfBuiltinType(setOf(StandardClassIds.Throwable)) -val ConeKotlinType.isChar: Boolean get() = isBuiltinType(StandardClassIds.Char, false) +val ConeKotlinType.isChar: Boolean get() = isBuiltinType(StandardClassIds.Char, isNullable = false) val ConeKotlinType.isCharOrNullableChar: Boolean get() = isAnyOfBuiltinType(setOf(StandardClassIds.Char)) -val ConeKotlinType.isString: Boolean get() = isBuiltinType(StandardClassIds.String, false) -val ConeKotlinType.isNullableString: Boolean get() = isBuiltinType(StandardClassIds.String, true) +val ConeKotlinType.isString: Boolean get() = isBuiltinType(StandardClassIds.String, isNullable = false) +val ConeKotlinType.isNullableString: Boolean get() = isBuiltinType(StandardClassIds.String, isNullable = true) -val ConeKotlinType.isEnum: Boolean get() = isBuiltinType(StandardClassIds.Enum, false) +val ConeKotlinType.isEnum: Boolean get() = isBuiltinType(StandardClassIds.Enum, isNullable = false) -val ConeKotlinType.isList: Boolean get() = isBuiltinType(StandardClassIds.List, false) -val ConeKotlinType.isMutableList: Boolean get() = isBuiltinType(StandardClassIds.MutableList, false) -val ConeKotlinType.isSet: Boolean get() = isBuiltinType(StandardClassIds.Set, false) -val ConeKotlinType.isMutableSet: Boolean get() = isBuiltinType(StandardClassIds.MutableSet, false) -val ConeKotlinType.isMap: Boolean get() = isBuiltinType(StandardClassIds.Map, false) -val ConeKotlinType.isMutableMap: Boolean get() = isBuiltinType(StandardClassIds.MutableMap, false) +val ConeKotlinType.isList: Boolean get() = isBuiltinType(StandardClassIds.List, isNullable = false) +val ConeKotlinType.isMutableList: Boolean get() = isBuiltinType(StandardClassIds.MutableList, isNullable = false) +val ConeKotlinType.isSet: Boolean get() = isBuiltinType(StandardClassIds.Set, isNullable = false) +val ConeKotlinType.isMutableSet: Boolean get() = isBuiltinType(StandardClassIds.MutableSet, isNullable = false) +val ConeKotlinType.isMap: Boolean get() = isBuiltinType(StandardClassIds.Map, isNullable = false) +val ConeKotlinType.isMutableMap: Boolean get() = isBuiltinType(StandardClassIds.MutableMap, isNullable = false) -val ConeKotlinType.isUByte: Boolean get() = isBuiltinType(StandardClassIds.UByte, false) -val ConeKotlinType.isUShort: Boolean get() = isBuiltinType(StandardClassIds.UShort, false) -val ConeKotlinType.isUInt: Boolean get() = isBuiltinType(StandardClassIds.UInt, false) -val ConeKotlinType.isULong: Boolean get() = isBuiltinType(StandardClassIds.ULong, false) +val ConeKotlinType.isUByte: Boolean get() = isBuiltinType(StandardClassIds.UByte, isNullable = false) +val ConeKotlinType.isUShort: Boolean get() = isBuiltinType(StandardClassIds.UShort, isNullable = false) +val ConeKotlinType.isUInt: Boolean get() = isBuiltinType(StandardClassIds.UInt, isNullable = false) +val ConeKotlinType.isULong: Boolean get() = isBuiltinType(StandardClassIds.ULong, isNullable = false) val ConeKotlinType.isPrimitiveOrNullablePrimitive: Boolean get() = isAnyOfBuiltinType(StandardClassIds.primitiveTypes) val ConeKotlinType.isPrimitive: Boolean get() = isPrimitiveOrNullablePrimitive && nullability == ConeNullability.NOT_NULL val ConeKotlinType.isPrimitiveNumberOrNullableType: Boolean