Merge branch 'master' of git+ssh://github.com/JetBrains/kotlin

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java

@@ -611,7 +611,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
                 checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression);
                 return resultingDescriptor.getOutType();
             }
-            if (resolutionResult.isAmbiguity()) {
+            if (resolutionResult.isAmbiguity() || resolutionResult.singleResult()) {
                 temporaryTrace.commit();
                 return null;
             }

compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1270.jet

@@ -0,0 +1,13 @@
+//KT-1270 Poor highlighting when trying to dereference a nullable reference
+//+JDK
+
+package kt1270
+
+fun foo() {
+    val sc = java.util.HashMap<String, SomeClass>()[""]
+    val <!UNUSED_VARIABLE!>value<!> = sc<!UNSAFE_CALL!>.<!>value
+}
+
+private class SomeClass() {
+    val value : Int = 5
+}