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

Minor, move out check against no expected type

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-11 19:42:15 +03:00
parent e50eb50299
commit 4d5d24a503
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
+1 -1
View File
@@ -368,7 +368,7 @@ public class DelegatedPropertyResolver {
if (conventionMethodFound(getMethodResults)) { if (conventionMethodFound(getMethodResults)) {
FunctionDescriptor descriptor = getMethodResults.getResultingDescriptor(); FunctionDescriptor descriptor = getMethodResults.getResultingDescriptor();
KotlinType returnTypeOfGetMethod = descriptor.getReturnType(); KotlinType returnTypeOfGetMethod = descriptor.getReturnType();
if (returnTypeOfGetMethod != null) { if (returnTypeOfGetMethod != null && !TypeUtils.noExpectedType(expectedType)) {
constraintSystem.addSupertypeConstraint(expectedType, returnTypeOfGetMethod, FROM_COMPLETER.position()); constraintSystem.addSupertypeConstraint(expectedType, returnTypeOfGetMethod, FROM_COMPLETER.position());
} }
addConstraintForThisValue(constraintSystem, descriptor); addConstraintForThisValue(constraintSystem, descriptor);
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
+1 -1
View File
@@ -147,7 +147,7 @@ public class CallCompleter(
} }
val returnType = getCandidateDescriptor().getReturnType() val returnType = getCandidateDescriptor().getReturnType()
if (returnType != null) { if (returnType != null && !TypeUtils.noExpectedType(expectedType)) {
updateSystemIfNeeded { builder -> updateSystemIfNeeded { builder ->
builder.addSupertypeConstraint(expectedType, returnType, EXPECTED_TYPE_POSITION.position()) builder.addSupertypeConstraint(expectedType, returnType, EXPECTED_TYPE_POSITION.position())
builder.build() builder.build()
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemBuilderImpl.kt
-2
View File
@@ -102,8 +102,6 @@ class ConstraintSystemBuilderImpl : ConstraintSystem.Builder {
type.getNestedTypeParameters().filter { isMyTypeVariable(it) } type.getNestedTypeParameters().filter { isMyTypeVariable(it) }
override fun addSupertypeConstraint(constrainingType: KotlinType?, subjectType: KotlinType, constraintPosition: ConstraintPosition) { override fun addSupertypeConstraint(constrainingType: KotlinType?, subjectType: KotlinType, constraintPosition: ConstraintPosition) {
if (constrainingType != null && TypeUtils.noExpectedType(constrainingType)) return
val newSubjectType = descriptorToVariableSubstitutor.substitute(subjectType, Variance.INVARIANT) val newSubjectType = descriptorToVariableSubstitutor.substitute(subjectType, Variance.INVARIANT)
addConstraint(SUB_TYPE, newSubjectType, constrainingType, ConstraintContext(constraintPosition, initial = true)) addConstraint(SUB_TYPE, newSubjectType, constrainingType, ConstraintContext(constraintPosition, initial = true))
} }