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

returned right type if there was only one failed candidate property

Browse Source
This commit is contained in:
Svetlana Isakova
2012-03-29 20:48:09 +04:00
parent 5419b0a3dc
commit c961613cf8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+5 -1
View File
@@ -609,7 +609,11 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression); checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression);
return resultingDescriptor.getType(); return resultingDescriptor.getType();
} }
if (resolutionResult.isAmbiguity() || resolutionResult.isSingleResult()) { if (resolutionResult.singleResult()) {
temporaryTrace.commit();
return resolutionResult.getResultingDescriptor().getReturnType();
}
if (resolutionResult.isAmbiguity()) {
temporaryTrace.commit(); temporaryTrace.commit();
return null; return null;
} }