From c961613cf8d6d75485241d3862f5b3a22453358c Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 29 Mar 2012 20:48:09 +0400
Subject: [PATCH] returned right type if there was only one failed candidate
 property

---
 .../types/expressions/BasicExpressionTypingVisitor.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
index ba5495af49b..473cecc8c6a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
@@ -609,7 +609,11 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
                 checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression);
                 return resultingDescriptor.getType();
             }
-            if (resolutionResult.isAmbiguity() || resolutionResult.isSingleResult()) {
+            if (resolutionResult.singleResult()) {
+                temporaryTrace.commit();
+                return resolutionResult.getResultingDescriptor().getReturnType();
+            }
+            if (resolutionResult.isAmbiguity()) {
                 temporaryTrace.commit();
                 return null;
             }