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

Minor: reformat NewCapturedType.kt according to code style

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-02-06 10:55:28 +03:00
parent 9129210cfe
commit 3f4df6160c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/checker/NewCapturedType.kt
+15 -15
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.utils.DO_NOTHING_2
// null means that type should be leaved as is // null means that type should be leaved as is
fun prepareArgumentTypeRegardingCaptureTypes(argumentType: UnwrappedType): UnwrappedType? { fun prepareArgumentTypeRegardingCaptureTypes(argumentType: UnwrappedType): UnwrappedType? {
val simpleType = NewKotlinTypeChecker.transformToNewType(argumentType.lowerIfFlexible()) val simpleType = NewKotlinTypeChecker.transformToNewType(argumentType.lowerIfFlexible())
if (simpleType.constructor is IntersectionTypeConstructor){ if (simpleType.constructor is IntersectionTypeConstructor) {
var changed = false var changed = false
val preparedSuperTypes = simpleType.constructor.supertypes.map { val preparedSuperTypes = simpleType.constructor.supertypes.map {
prepareArgumentTypeRegardingCaptureTypes(it.unwrap())?.apply { changed = true } ?: it.unwrap() prepareArgumentTypeRegardingCaptureTypes(it.unwrap())?.apply { changed = true } ?: it.unwrap()
@@ -69,17 +69,16 @@ fun captureFromExpression(type: SimpleType): UnwrappedType? {
// this function suppose that input type is simple classifier type // this function suppose that input type is simple classifier type
fun captureFromArguments( fun captureFromArguments(
type: SimpleType, type: SimpleType,
status: CaptureStatus, status: CaptureStatus,
acceptNewCapturedType: ((argumentIndex: Int, NewCapturedType) -> Unit) = DO_NOTHING_2 acceptNewCapturedType: ((argumentIndex: Int, NewCapturedType) -> Unit) = DO_NOTHING_2
): SimpleType? { ): SimpleType? {
if (type.arguments.size != type.constructor.parameters.size) return null if (type.arguments.size != type.constructor.parameters.size) return null
val arguments = type.arguments val arguments = type.arguments
if (arguments.all { it.projectionKind == Variance.INVARIANT }) return null if (arguments.all { it.projectionKind == Variance.INVARIANT }) return null
val newArguments = arguments.map { val newArguments = arguments.map { projection ->
projection ->
if (projection.projectionKind == Variance.INVARIANT) return@map projection if (projection.projectionKind == Variance.INVARIANT) return@map projection
val lowerType = if (!projection.isStarProjection && projection.projectionKind == Variance.IN_VARIANCE) { val lowerType = if (!projection.isStarProjection && projection.projectionKind == Variance.IN_VARIANCE) {
@@ -125,12 +124,12 @@ enum class CaptureStatus {
* *
*/ */
class NewCapturedType( class NewCapturedType(
val captureStatus: CaptureStatus, val captureStatus: CaptureStatus,
override val constructor: NewCapturedTypeConstructor, override val constructor: NewCapturedTypeConstructor,
val lowerType: UnwrappedType?, // todo check lower type for nullable captured types val lowerType: UnwrappedType?, // todo check lower type for nullable captured types
override val annotations: Annotations = Annotations.EMPTY, override val annotations: Annotations = Annotations.EMPTY,
override val isMarkedNullable: Boolean = false override val isMarkedNullable: Boolean = false
): SimpleType() { ) : SimpleType() {
internal constructor(captureStatus: CaptureStatus, lowerType: UnwrappedType?, projection: TypeProjection) : internal constructor(captureStatus: CaptureStatus, lowerType: UnwrappedType?, projection: TypeProjection) :
this(captureStatus, NewCapturedTypeConstructor(projection), lowerType) this(captureStatus, NewCapturedTypeConstructor(projection), lowerType)
@@ -140,13 +139,14 @@ class NewCapturedType(
get() = ErrorUtils.createErrorScope("No member resolution should be done on captured type!", true) get() = ErrorUtils.createErrorScope("No member resolution should be done on captured type!", true)
override fun replaceAnnotations(newAnnotations: Annotations) = override fun replaceAnnotations(newAnnotations: Annotations) =
NewCapturedType(captureStatus, constructor, lowerType, newAnnotations, isMarkedNullable) NewCapturedType(captureStatus, constructor, lowerType, newAnnotations, isMarkedNullable)
override fun makeNullableAsSpecified(newNullability: Boolean) = override fun makeNullableAsSpecified(newNullability: Boolean) =
NewCapturedType(captureStatus, constructor, lowerType, annotations, newNullability) NewCapturedType(captureStatus, constructor, lowerType, annotations, newNullability)
} }
class NewCapturedTypeConstructor(override val projection: TypeProjection, private var supertypes: List<UnwrappedType>? = null) : CapturedTypeConstructor { class NewCapturedTypeConstructor(override val projection: TypeProjection, private var supertypes: List<UnwrappedType>? = null) :
CapturedTypeConstructor {
fun initializeSupertypes(supertypes: List<UnwrappedType>) { fun initializeSupertypes(supertypes: List<UnwrappedType>) {
assert(this.supertypes == null) { assert(this.supertypes == null) {
"Already initialized! oldValue = ${this.supertypes}, newValue = $supertypes" "Already initialized! oldValue = ${this.supertypes}, newValue = $supertypes"