Obtain type parameters of constructor from containing class
Effectively this commit is just inlining of 'typeParameters' parameter
This commit is contained in:
+1
-1
@@ -227,7 +227,7 @@ public class SingleAbstractMethodUtils {
|
||||
@NotNull List<ValueParameterDescriptor> valueParameters,
|
||||
@NotNull KotlinType returnType
|
||||
) {
|
||||
result.initialize(typeParameters, valueParameters, original.getVisibility());
|
||||
result.initialize(valueParameters, original.getVisibility());
|
||||
result.setReturnType(returnType);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -241,7 +241,6 @@ class FunctionDescriptorResolver(
|
||||
true,
|
||||
classElement.getPrimaryConstructorModifierList(),
|
||||
classElement.getPrimaryConstructor() ?: classElement,
|
||||
classDescriptor.getTypeConstructor().getParameters(),
|
||||
classElement.getPrimaryConstructorParameters(),
|
||||
trace
|
||||
)
|
||||
@@ -259,7 +258,6 @@ class FunctionDescriptorResolver(
|
||||
false,
|
||||
constructor.getModifierList(),
|
||||
constructor,
|
||||
classDescriptor.getTypeConstructor().getParameters(),
|
||||
constructor.getValueParameters(),
|
||||
trace
|
||||
)
|
||||
@@ -271,7 +269,6 @@ class FunctionDescriptorResolver(
|
||||
isPrimary: Boolean,
|
||||
modifierList: KtModifierList?,
|
||||
declarationToTrace: KtDeclaration,
|
||||
typeParameters: List<TypeParameterDescriptor>,
|
||||
valueParameters: List<KtParameter>,
|
||||
trace: BindingTrace
|
||||
): ConstructorDescriptorImpl {
|
||||
@@ -291,7 +288,6 @@ class FunctionDescriptorResolver(
|
||||
)
|
||||
parameterScope.changeLockLevel(LexicalWritableScope.LockLevel.BOTH)
|
||||
val constructor = constructorDescriptor.initialize(
|
||||
typeParameters,
|
||||
resolveValueParameters(constructorDescriptor, parameterScope, valueParameters, trace, null),
|
||||
resolveVisibilityFromModifiers(
|
||||
modifierList,
|
||||
|
||||
-1
@@ -118,7 +118,6 @@ public class LazyScriptClassMemberScope protected constructor(
|
||||
true,
|
||||
SourceElement.NO_SOURCE
|
||||
).initialize(
|
||||
listOf(),
|
||||
valueParameters,
|
||||
Visibilities.PUBLIC
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user