Minor. Methods reordered
This commit is contained in:
@@ -68,18 +68,6 @@ public class OverridingUtil {
|
|||||||
return isOverridableByImpl(superDescriptor, subDescriptor, true);
|
return isOverridableByImpl(superDescriptor, subDescriptor, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<JetType> compiledValueParameters(CallableDescriptor callableDescriptor) {
|
|
||||||
ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter();
|
|
||||||
ArrayList<JetType> parameters = new ArrayList<JetType>();
|
|
||||||
if (receiverParameter != null) {
|
|
||||||
parameters.add(receiverParameter.getType());
|
|
||||||
}
|
|
||||||
for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) {
|
|
||||||
parameters.add(valueParameterDescriptor.getType());
|
|
||||||
}
|
|
||||||
return parameters;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param forOverride true for override, false for overload
|
* @param forOverride true for override, false for overload
|
||||||
*/
|
*/
|
||||||
@@ -179,6 +167,18 @@ public class OverridingUtil {
|
|||||||
return OverrideCompatibilityInfo.success();
|
return OverrideCompatibilityInfo.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static List<JetType> compiledValueParameters(CallableDescriptor callableDescriptor) {
|
||||||
|
ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter();
|
||||||
|
ArrayList<JetType> parameters = new ArrayList<JetType>();
|
||||||
|
if (receiverParameter != null) {
|
||||||
|
parameters.add(receiverParameter.getType());
|
||||||
|
}
|
||||||
|
for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) {
|
||||||
|
parameters.add(valueParameterDescriptor.getType());
|
||||||
|
}
|
||||||
|
return parameters;
|
||||||
|
}
|
||||||
|
|
||||||
private static JetType getUpperBound(JetType type) {
|
private static JetType getUpperBound(JetType type) {
|
||||||
if (type.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) {
|
if (type.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) {
|
||||||
return type;
|
return type;
|
||||||
|
|||||||
Reference in New Issue
Block a user