Abstract TypeApproximator from NewCapturedType

core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt

@@ -481,6 +481,11 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext {
         require(constructor is TypeConstructor, constructor::errorMessage)
         return ErrorUtils.createErrorTypeWithCustomConstructor(debugName, constructor)
     }
+
+    override fun TypeConstructorMarker.isCapturedTypeConstructor(): Boolean {
+        return this is NewCapturedTypeConstructor
+    }
+
 }
 
 private fun captureFromExpressionInternal(type: UnwrappedType) = captureFromExpression(type)

core/type-system/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt

@@ -22,4 +22,9 @@ fun KotlinTypeMarker.dependsOnTypeParameters(c: TypeSystemInferenceExtensionCont
     with(c) {
         val typeConstructors = typeParameters.mapTo(mutableSetOf()) { it.getTypeConstructor() }
         dependsOnTypeConstructor(c, typeConstructors)
+    }
+
+fun CapturedTypeMarker.captureStatus(c: TypeSystemInferenceExtensionContext) =
+    with(c) {
+        captureStatus()
     }

core/type-system/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt

@@ -24,6 +24,7 @@ interface StubTypeMarker : SimpleTypeMarker
 interface TypeArgumentListMarker
 
 interface TypeVariableMarker
+interface TypeVariableTypeConstructorMarker : TypeConstructorMarker
 
 interface TypeSubstitutorMarker
 
@@ -88,6 +89,8 @@ interface TypeSystemInferenceExtensionContext : TypeSystemContext, TypeSystemBui
 
     fun TypeConstructorMarker.getApproximatedIntegerLiteralType(): KotlinTypeMarker
 
+    fun TypeConstructorMarker.isCapturedTypeConstructor(): Boolean
+
     fun Collection<KotlinTypeMarker>.singleBestRepresentative(): KotlinTypeMarker?
 
     fun KotlinTypeMarker.isUnit(): Boolean