Minor, replace some usages of hasDefaultValue -> declaresDefaultValue

This commit is contained in:
Alexander Udalov
2015-08-06 02:58:28 +03:00
parent c13396d92f
commit 8dddce5ac5
2 changed files with 2 additions and 5 deletions
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils.*
import org.jetbrains.kotlin.resolve.DescriptorResolver.*
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.WritableScope
import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl
import org.jetbrains.kotlin.resolve.source.toSourceElement
@@ -192,7 +191,7 @@ class FunctionDescriptorResolver(
// it parameter for lambda
val valueParameterDescriptor = expectedValueParameters.first()
val it = ValueParameterDescriptorImpl(functionDescriptor, null, 0, Annotations.EMPTY, Name.identifier("it"),
valueParameterDescriptor.getType(), valueParameterDescriptor.hasDefaultValue(),
valueParameterDescriptor.getType(), valueParameterDescriptor.declaresDefaultValue(),
valueParameterDescriptor.getVarargElementType(), SourceElement.NO_SOURCE)
trace.record(BindingContext.AUTO_CREATED_IT, it)
return listOf(it)
@@ -60,9 +60,7 @@ public class ValueParameterResolver(
jetParameter: JetParameter,
context: ExpressionTypingContext
) {
if (!valueParameterDescriptor.hasDefaultValue()) {
return
}
if (!valueParameterDescriptor.declaresDefaultValue()) return
val defaultValue = jetParameter.getDefaultValue() ?: return
expressionTypingServices.getTypeInfo(defaultValue, context.replaceExpectedType(valueParameterDescriptor.getType()))
if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(context.scope))) {