From 000ba33f59c3b85c2285d213343c69e34dbfb0cd Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 15 Sep 2016 11:37:23 +0300 Subject: [PATCH] Minor. Prettify value parameters' resolution parts --- .../kotlin/resolve/DescriptorResolver.java | 4 +++- .../kotlin/resolve/FunctionDescriptorResolver.kt | 14 +++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 3ddaa1cd357..ddf219bf800 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -257,7 +257,9 @@ public class DescriptorResolver { @NotNull public ValueParameterDescriptorImpl resolveValueParameterDescriptor( - LexicalScope scope, FunctionDescriptor owner, KtParameter valueParameter, int index, KotlinType type, BindingTrace trace + @NotNull LexicalScope scope, @NotNull FunctionDescriptor owner, + @NotNull KtParameter valueParameter, int index, + @NotNull KotlinType type, @NotNull BindingTrace trace ) { KotlinType varargElementType = null; KotlinType variableType = type; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index ba86a677fa2..b1eeaff668b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -315,8 +315,8 @@ class FunctionDescriptorResolver( val result = ArrayList() for (i in valueParameters.indices) { - val valueParameter = valueParameters.get(i) - val typeReference = valueParameter.getTypeReference() + val valueParameter = valueParameters[i] + val typeReference = valueParameter.typeReference val expectedType = expectedValueParameters?.let { if (i < it.size) it[i].type else null } val type: KotlinType @@ -336,16 +336,12 @@ class FunctionDescriptorResolver( if (expectedType == null || containsUninferredParameter) { trace.report(CANNOT_INFER_PARAMETER_TYPE.on(valueParameter)) } - if (expectedType != null) { - type = expectedType - } - else { - type = TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE - } + + type = expectedType ?: TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE } else { trace.report(VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION.on(valueParameter)) - type = ErrorUtils.createErrorType("Type annotation was missing for parameter ${valueParameter.getNameAsSafeName()}") + type = ErrorUtils.createErrorType("Type annotation was missing for parameter ${valueParameter.nameAsSafeName}") } }