From cd5ffa58953b66c25147fb56535fffc57611031c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 23 Jun 2016 17:02:34 +0300
Subject: [PATCH] "class" and "class.java" should be available after expression
 too

---
 .../org/jetbrains/kotlin/idea/completion/KeywordValues.kt    | 5 +----
 .../basic/common/callableReference/ExpressionQualifier.kt    | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
index be8c7697b61..2e0da7295e9 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.KotlinTypeFactory
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.kotlin.types.TypeSubstitutor
-import org.jetbrains.kotlin.types.expressions.DoubleColonLHS
 import org.jetbrains.kotlin.types.typeUtil.isBooleanOrNullableBoolean
 
 object KeywordValues {
@@ -95,9 +94,7 @@ object KeywordValues {
         }
 
         if (callTypeAndReceiver is CallTypeAndReceiver.CALLABLE_REFERENCE && callTypeAndReceiver.receiver != null) {
-            val receiverExpression = callTypeAndReceiver.receiver!!
-            val qualifierType = (bindingContext.get(BindingContext.DOUBLE_COLON_LHS, receiverExpression) as? DoubleColonLHS.Type)?.type
-
+            val qualifierType = bindingContext.get(BindingContext.DOUBLE_COLON_LHS, callTypeAndReceiver.receiver!!)?.type
             if (qualifierType != null) {
                 val kClassDescriptor = resolutionFacade.getFrontendService(ReflectionTypes::class.java).kClass
                 val classLiteralType = KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, kClassDescriptor, listOf(TypeProjectionImpl(qualifierType)))
diff --git a/idea/idea-completion/testData/basic/common/callableReference/ExpressionQualifier.kt b/idea/idea-completion/testData/basic/common/callableReference/ExpressionQualifier.kt
index 4dc20aec532..1bd1f6b6832 100644
--- a/idea/idea-completion/testData/basic/common/callableReference/ExpressionQualifier.kt
+++ b/idea/idea-completion/testData/basic/common/callableReference/ExpressionQualifier.kt
@@ -49,8 +49,8 @@ class C {
     }
 }
 
-// ABSENT: class
-// ABSENT: class.java
+// EXIST: class
+// EXIST_JAVA_ONLY: class.java
 // EXIST: { itemText: "memberFunInA", attributes: "" }
 // EXIST: { itemText: "memberValInA", attributes: "" }