diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index 308617d8603..2372940ebf2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt @@ -358,7 +358,7 @@ public object Renderers { typeBounds.add(constraintSystem.getTypeBounds(variable)) } return "type parameter bounds:\n" + - StringUtil.join(typeBounds, { renderTypeBounds.render(it) }, "\n") + "\n" + "status:\n" + + StringUtil.join(typeBounds, { renderTypeBounds.render(it) }, "\n") + "\n\n" + "status:\n" + ConstraintsUtil.getDebugMessageForStatus(constraintSystem.getStatus()) } diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds index 59640269ecb..67adbc29304 100644 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds +++ b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds @@ -5,6 +5,7 @@ SUPERTYPE T String type parameter bounds: T <: kotlin.Int, >: kotlin.String + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: true diff --git a/compiler/testData/constraintSystem/checkStatus/successful.bounds b/compiler/testData/constraintSystem/checkStatus/successful.bounds index cf4f1a3cefc..ee2bdcc9cfa 100644 --- a/compiler/testData/constraintSystem/checkStatus/successful.bounds +++ b/compiler/testData/constraintSystem/checkStatus/successful.bounds @@ -5,6 +5,7 @@ SUPERTYPE T Int type parameter bounds: T <: kotlin.Int, >: kotlin.Int + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds index b53d50cc22b..6748b94881d 100644 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds +++ b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds @@ -4,6 +4,7 @@ SUBTYPE List Int type parameter bounds: T + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds index f6e6b7f85d6..315a2e41147 100644 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds +++ b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds @@ -4,6 +4,7 @@ SUBTYPE Any Any type parameter bounds: T + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds index be6e0376645..7df267a863a 100644 --- a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds +++ b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds @@ -5,6 +5,7 @@ SUBTYPE T String weak type parameter bounds: T <: kotlin.Int, <: kotlin.String + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: true diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.bounds b/compiler/testData/constraintSystem/computeValues/contradiction.bounds index f01624d7886..ef0403037a0 100644 --- a/compiler/testData/constraintSystem/computeValues/contradiction.bounds +++ b/compiler/testData/constraintSystem/computeValues/contradiction.bounds @@ -5,6 +5,7 @@ SUPERTYPE T A type parameter bounds: T <: B, >: A + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: true diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds index 61262df4092..59267c02780 100644 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds +++ b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds @@ -5,6 +5,7 @@ SUBTYPE T B type parameter bounds: T <: A, <: B + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds index 742eefb1444..67470527396 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds @@ -5,6 +5,7 @@ SUPERTYPE T C type parameter bounds: T <: A, >: C + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds index b126ccd2ba4..611d210a64a 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds @@ -6,6 +6,7 @@ SUPERTYPE T C type parameter bounds: T <: A, >: B, >: C + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds index 4e743ac9e1f..2b12eb4e771 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds @@ -5,6 +5,7 @@ SUBTYPE T Byte type parameter bounds: T >: IntegerValueType(1000), <: kotlin.Byte + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: true diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds index 5e3c96580b7..366890eab70 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds @@ -5,6 +5,7 @@ SUPERTYPE T IntegerValueType(10000000000) type parameter bounds: T >: IntegerValueType(1), >: IntegerValueType(10000000000) + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds index 0b72b4a8149..476a7a7812c 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds @@ -5,6 +5,7 @@ SUBTYPE T Any type parameter bounds: T >: IntegerValueType(1), <: kotlin.Any + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds index 89d85abd655..e490165dabd 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds @@ -5,6 +5,7 @@ SUPERTYPE T String type parameter bounds: T >: IntegerValueType(1), >: kotlin.String + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds index 01f148acb8d..baa972d9ddb 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds @@ -5,6 +5,7 @@ SUPERTYPE T IntegerValueType(1000) type parameter bounds: T >: IntegerValueType(1), >: IntegerValueType(1000) + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds index e52555bc4c1..56018383515 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds @@ -5,6 +5,7 @@ SUBTYPE T Byte type parameter bounds: T >: IntegerValueType(1), <: kotlin.Byte + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds index 0f81067b861..fc8290b88cd 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds @@ -4,6 +4,7 @@ SUPERTYPE T IntegerValueType(1) type parameter bounds: T >: IntegerValueType(1) + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds index 650c63014e9..846da5f8405 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds @@ -5,6 +5,7 @@ SUBTYPE T Short type parameter bounds: T >: IntegerValueType(1), <: kotlin.Short + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds index 61c8b0259b7..7d89b1b9557 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds @@ -5,6 +5,7 @@ SUBTYPE T Int type parameter bounds: T <: kotlin.Int P <: kotlin.Int + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/variance/consumer.bounds b/compiler/testData/constraintSystem/variance/consumer.bounds index e411a250559..da63814af1c 100644 --- a/compiler/testData/constraintSystem/variance/consumer.bounds +++ b/compiler/testData/constraintSystem/variance/consumer.bounds @@ -4,6 +4,7 @@ SUBTYPE Consumer Consumer type parameter bounds: T <: A + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/variance/invariant.bounds b/compiler/testData/constraintSystem/variance/invariant.bounds index 68cd39ae8c9..5fd96d59eed 100644 --- a/compiler/testData/constraintSystem/variance/invariant.bounds +++ b/compiler/testData/constraintSystem/variance/invariant.bounds @@ -4,6 +4,7 @@ SUBTYPE My My type parameter bounds: T := A + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false diff --git a/compiler/testData/constraintSystem/variance/producer.bounds b/compiler/testData/constraintSystem/variance/producer.bounds index 77404015b57..0aaa43053f2 100644 --- a/compiler/testData/constraintSystem/variance/producer.bounds +++ b/compiler/testData/constraintSystem/variance/producer.bounds @@ -4,6 +4,7 @@ SUBTYPE Producer Producer type parameter bounds: T >: A + status: -hasCannotCaptureTypesError: false -hasConflictingConstraints: false