azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Prettify value parameters' resolution parts

Browse Source
This commit is contained in:
Denis Zharkov
2016-09-15 11:37:23 +03:00
parent 435cafed99
commit 000ba33f59
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+3 -1
View File
@@ -257,7 +257,9 @@ public class DescriptorResolver {
@NotNull @NotNull
public ValueParameterDescriptorImpl resolveValueParameterDescriptor( 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 varargElementType = null;
KotlinType variableType = type; KotlinType variableType = type;
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+5 -9
View File
@@ -315,8 +315,8 @@ class FunctionDescriptorResolver(
val result = ArrayList<ValueParameterDescriptor>() val result = ArrayList<ValueParameterDescriptor>()
for (i in valueParameters.indices) { for (i in valueParameters.indices) {
val valueParameter = valueParameters.get(i) val valueParameter = valueParameters[i]
val typeReference = valueParameter.getTypeReference() val typeReference = valueParameter.typeReference
val expectedType = expectedValueParameters?.let { if (i < it.size) it[i].type else null } val expectedType = expectedValueParameters?.let { if (i < it.size) it[i].type else null }
val type: KotlinType val type: KotlinType
@@ -336,16 +336,12 @@ class FunctionDescriptorResolver(
if (expectedType == null || containsUninferredParameter) { if (expectedType == null || containsUninferredParameter) {
trace.report(CANNOT_INFER_PARAMETER_TYPE.on(valueParameter)) trace.report(CANNOT_INFER_PARAMETER_TYPE.on(valueParameter))
} }
if (expectedType != null) {
type = expectedType type = expectedType ?: TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE
}
else {
type = TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE
}
} }
else { else {
trace.report(VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION.on(valueParameter)) 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}")
} }
} }