Make constructor of JetTypeImpl private, introduce factory methods
This commit is contained in:
+3
-4
@@ -168,10 +168,9 @@ class LazyJavaClassDescriptor(
|
||||
parameter -> TypeProjectionImpl(Variance.INVARIANT, parameter.getDefaultType())
|
||||
}
|
||||
|
||||
return JetTypeImpl(
|
||||
Annotations.EMPTY, classDescriptor.getTypeConstructor(),
|
||||
/* nullable =*/ false, parametersAsTypeProjections,
|
||||
classDescriptor.getMemberScope(parametersAsTypeProjections)
|
||||
return JetTypeImpl.create(
|
||||
Annotations.EMPTY, classDescriptor,
|
||||
/* nullable =*/ false, parametersAsTypeProjections
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -289,14 +289,14 @@ class LazyJavaTypeResolver(
|
||||
val arguments = listOf(
|
||||
TypeProjectionImpl(componentTypeProjection.projectionKind, eraseType(componentTypeProjection.type))
|
||||
)
|
||||
return JetTypeImpl(
|
||||
return JetTypeImpl.create(
|
||||
type.annotations, type.constructor, type.isMarkedNullable, arguments,
|
||||
(type.constructor.declarationDescriptor as ClassDescriptor).getMemberScope(arguments)
|
||||
)
|
||||
}
|
||||
|
||||
val constructor = type.constructor
|
||||
return JetTypeImpl(
|
||||
return JetTypeImpl.create(
|
||||
type.annotations, constructor, type.isMarkedNullable,
|
||||
type.constructor.parameters.map {
|
||||
parameter -> computeProjection(parameter, attr)
|
||||
|
||||
+1
-1
@@ -102,7 +102,7 @@ private fun JetType.enhanceInflexible(qualifiers: (Int) -> JavaTypeQualifiers, i
|
||||
typeConstructor.parameters, enhancedArguments
|
||||
)
|
||||
|
||||
val enhancedType = JetTypeImpl(
|
||||
val enhancedType = JetTypeImpl.create(
|
||||
newAnnotations,
|
||||
typeConstructor,
|
||||
enhancedNullability,
|
||||
|
||||
Reference in New Issue
Block a user