Smart completion: auto-casted types supported

annotations/com/google/common/collect/annotations.xml

@@ -2,4 +2,7 @@
   <item name='com.google.common.collect.Multimap java.util.Set&lt;K&gt; keySet()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
+  <item name='com.google.common.collect.SetMultimap java.util.Map&lt;K,java.util.Collection&lt;V&gt;&gt; asMap()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
 </root>

idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt

@@ -8,12 +8,12 @@ import org.jetbrains.jet.plugin.project.CancelableResolveSession
 import org.jetbrains.jet.lang.types.*
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker
 import com.intellij.codeInsight.lookup.*
-import java.util.ArrayList
 import org.jetbrains.jet.renderer.DescriptorRenderer
-import com.intellij.codeInsight.completion.InsertionContext
+import com.intellij.codeInsight.completion.*
-import com.intellij.codeInsight.completion.InsertHandler
 import org.jetbrains.jet.plugin.completion.handlers.*
-import com.intellij.codeInsight.completion.JavaPsiClassReferenceElement
+import com.google.common.collect.SetMultimap
+import java.util.*
+import org.jetbrains.jet.lang.resolve.calls.autocasts.*
 
 trait SmartCompletionData{
     fun accepts(descriptor: DeclarationDescriptor): Boolean
@@ -22,7 +22,17 @@ trait SmartCompletionData{
 
 fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession: CancelableResolveSession): SmartCompletionData? {
     val parent = expression.getParent()
-    val expressionWithType = if (parent is JetQualifiedExpression) parent else expression
+    val expressionWithType: JetExpression;
+    val receiver: JetExpression?
+    if (parent is JetQualifiedExpression) {
+        expressionWithType = parent
+        receiver = parent.getReceiverExpression()
+    }
+    else {
+        expressionWithType = expression
+        receiver = null
+    }
+
     val bindingContext = resolveSession.resolveToElement(expressionWithType)
     val expectedType: JetType? = bindingContext.get(BindingContext.EXPECTED_EXPRESSION_TYPE, expressionWithType)
     if (expectedType == null) return null
@@ -31,62 +41,41 @@ fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession
 
     val additionalElements = ArrayList<LookupElement>()
 
-    if (expression == expressionWithType) { // no qualifier
+    if (receiver == null) {
-        val typeConstructor: TypeConstructor = expectedType.getConstructor()
+        typeInstantiationItems(expectedType, resolveSession, bindingContext).toCollection(additionalElements)
-        val classifier: ClassifierDescriptor? = typeConstructor.getDeclarationDescriptor()
+    }
-        if (classifier is ClassDescriptor) {
-            if (classifier.getModality() != Modality.ABSTRACT){
-                val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, bindingContext, classifier)
 
-                val typeArgs = expectedType.getArguments()
+    val dataFlowInfo = bindingContext.get(BindingContext.EXPRESSION_DATA_FLOW_INFO, expressionWithType)
-                //TODO: shouldn't be method in DescriptorRenderer to render type arguments?
+    val (variableToTypes: Map<VariableDescriptor, Collection<JetType>>, notNullVariables: Set<VariableDescriptor>) = processDataFlowInfo(dataFlowInfo, receiver, bindingContext)
-                val typeArgsText =
-                        if (typeArgs.isEmpty())
-                            ""
-                        else
-                            typeArgs.map { DescriptorRenderer.TEXT.renderType(it.getType()) }.makeString(", ", "<", ">")
-                val presentableText = lookupElement.getLookupString() + typeArgsText + "()"
 
-                val constructors: Collection<ConstructorDescriptor> = classifier.getConstructors()
+    fun typesOf(descriptor: DeclarationDescriptor): Iterable<JetType> {
-                val caretPosition =
+        if (descriptor is CallableDescriptor) {
-                        if (constructors.size == 0)
+            var returnType = descriptor.getReturnType()
-                            CaretPosition.AFTER_BRACKETS
+            if (descriptor is VariableDescriptor) {
-                        else if (constructors.size == 1)
+                if (notNullVariables.contains(descriptor) && returnType != null) {
-                            if (constructors.first().getValueParameters().isEmpty()) CaretPosition.AFTER_BRACKETS else CaretPosition.IN_BRACKETS
+                    returnType = TypeUtils.makeNotNullable(returnType!!)
-                        else
-                            CaretPosition.IN_BRACKETS
-                val insertHandler = JetFunctionInsertHandler(caretPosition, BracketType.PARENTHESIS)
-
-                //TODO: very bad code
-                if (lookupElement is LookupElementBuilder) {
-                    additionalElements.add(lookupElement.withPresentableText(presentableText).withInsertHandler(insertHandler))
                 }
-                else if (lookupElement is JavaPsiClassReferenceElement) {
+
-                    additionalElements.add(lookupElement.setPresentableText(presentableText).setInsertHandler(insertHandler))
+                val autoCastTypes = variableToTypes[descriptor]
+                if (autoCastTypes != null && !autoCastTypes.isEmpty()) {
+                    return autoCastTypes + returnType.toList()
                 }
             }
+            return returnType.toList()
+        }
+        else {
+            return listOf()
         }
     }
 
-    return object: SmartCompletionData{
+    return object: SmartCompletionData {
-        override fun accepts(descriptor: DeclarationDescriptor): Boolean {
+        override fun accepts(descriptor: DeclarationDescriptor)
-            if (itemsToSkip.contains(descriptor)) return false
+                = !itemsToSkip.contains(descriptor) && typesOf(descriptor).any { JetTypeChecker.INSTANCE.isSubtypeOf(it, expectedType) }
 
-            if (descriptor is CallableDescriptor) {
+        override val additionalElements = additionalElements
-                val returnType = descriptor.getReturnType()
-                return returnType != null && JetTypeChecker.INSTANCE.isSubtypeOf(returnType, expectedType)
-            }
-            else {
-                return false
-            }
-        }
-
-        override val additionalElements: Iterable<LookupElement> = additionalElements
     }
 }
 
-private fun <T : Any> T?.toList(): List<T> = if (this != null) listOf(this) else listOf()
-
 private fun calcItemsToSkip(expression: JetExpression, resolveSession: CancelableResolveSession): Collection<DeclarationDescriptor> {
     val parent = expression.getParent()
     when(parent) {
@@ -107,4 +96,98 @@ private fun calcItemsToSkip(expression: JetExpression, resolveSession: Cancelabl
         }
     }
     return listOf()
-}
+}
+
+private fun typeInstantiationItems(expectedType: JetType, resolveSession: CancelableResolveSession, bindingContext: BindingContext): Iterable<LookupElement> {
+    val typeConstructor: TypeConstructor = expectedType.getConstructor()
+    val classifier: ClassifierDescriptor? = typeConstructor.getDeclarationDescriptor()
+    if (!(classifier is ClassDescriptor)) return listOf()
+    if (classifier.getModality() == Modality.ABSTRACT) return listOf()
+
+    //TODO: check for constructor's visibility
+
+    val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, bindingContext, classifier)
+
+    val typeArgs = expectedType.getArguments()
+    //TODO: shouldn't be method in DescriptorRenderer to render type arguments?
+    val typeArgsText =
+            if (typeArgs.isEmpty())
+                ""
+            else
+                typeArgs.map { DescriptorRenderer.TEXT.renderType(it.getType()) }.makeString(", ", "<", ">")
+    val presentableText = lookupElement.getLookupString() + typeArgsText + "()"
+
+    val constructors: Collection<ConstructorDescriptor> = classifier.getConstructors()
+    val caretPosition =
+            if (constructors.size == 0)
+                CaretPosition.AFTER_BRACKETS
+            else if (constructors.size == 1)
+                if (constructors.first().getValueParameters().isEmpty()) CaretPosition.AFTER_BRACKETS else CaretPosition.IN_BRACKETS
+            else
+                CaretPosition.IN_BRACKETS
+    val insertHandler = JetFunctionInsertHandler(caretPosition, BracketType.PARENTHESIS)
+
+    //TODO: very bad code
+    if (lookupElement is LookupElementBuilder) {
+        return listOf(lookupElement.withPresentableText(presentableText).withInsertHandler(insertHandler))
+    }
+    else if (lookupElement is JavaPsiClassReferenceElement) {
+        return listOf(lookupElement.setPresentableText(presentableText).setInsertHandler(insertHandler))
+    }
+
+    return listOf()
+}
+
+private data class ProcessDataFlowInfoResult(
+        val variableToTypes: Map<VariableDescriptor, Collection<JetType>> = Collections.emptyMap(),
+        val notNullVariables: Set<VariableDescriptor> = Collections.emptySet()
+)
+
+private fun processDataFlowInfo(dataFlowInfo: DataFlowInfo?, receiver: JetExpression?, bindingContext: BindingContext): ProcessDataFlowInfoResult {
+    if (dataFlowInfo != null) {
+        val dataFlowValueToVariable: (DataFlowValue) -> VariableDescriptor?
+        if (receiver != null) {
+            val receiverType = bindingContext.get(BindingContext.EXPRESSION_TYPE, receiver)
+            if (receiverType != null) {
+                val receiverId = DataFlowValueFactory.createDataFlowValue(receiver, receiverType, bindingContext).getId()
+                dataFlowValueToVariable = {(value) ->
+                    val id = value.getId()
+                    if (id is com.intellij.openapi.util.Pair<*, *> && id.first == receiverId) id.second as? VariableDescriptor else null
+                }
+            }
+            else {
+                return ProcessDataFlowInfoResult()
+            }
+        }
+        else {
+            dataFlowValueToVariable = {(value) -> value.getId() as? VariableDescriptor }
+        }
+
+        val variableToType = HashMap<VariableDescriptor, Collection<JetType>>()
+        val typeInfo: SetMultimap<DataFlowValue, JetType> = dataFlowInfo.getCompleteTypeInfo()
+        for ((dataFlowValue, types) in typeInfo.asMap().entrySet()) {
+            val variable = dataFlowValueToVariable.invoke(dataFlowValue)
+            if (variable != null) {
+                variableToType[variable] = types
+            }
+        }
+
+        val nullabilityInfo: Map<DataFlowValue, Nullability> = dataFlowInfo.getCompleteNullabilityInfo()
+        val notNullVariables = nullabilityInfo.iterator()
+                .filter { it.getValue() == Nullability.NOT_NULL }
+                .map { dataFlowValueToVariable(it.getKey()) }
+                .filterNotNullTo(HashSet<VariableDescriptor>())
+
+        return ProcessDataFlowInfoResult(variableToType, notNullVariables)
+    }
+
+    return ProcessDataFlowInfoResult()
+}
+
+private fun <T : Any> T?.toList(): List<T> = if (this != null) listOf(this) else listOf()
+
+private fun <T> MutableCollection<T>.addAll(iterator: Iterator<T>) {
+    for (item in iterator) {
+        add(item)
+    }
+}

idea/testData/completion/smart/AutoCastedThisType.kt.todo

@@ -0,0 +1,12 @@
+open class Foo{
+    fun f() {
+        if (this is Bar){
+            var a : Bar = <caret>
+        }
+    }
+}
+
+class Bar : Foo
+
+
+// EXIST: this

idea/testData/completion/smart/AutoCastedType.kt

@@ -1,4 +1,4 @@
-fun f(p: Object) {
+fun f(p: Any) {
     if (p is String){
         var a : String = <caret>
     }

idea/testData/completion/smart/AutoCastedTypeWithQualifier.kt

@@ -0,0 +1,10 @@
+class Foo(val prop1 : Any, val prop2 : Any){
+    fun f(p1: Foo, p2: Foo) {
+        if (p1.prop1 is String && p2.prop2 is String && prop2 is String){
+            var a : String = p1.<caret>
+        }
+    }
+}
+
+// EXIST: prop1
+// ABSENT: prop2

idea/testData/completion/smart/AutoNotNullThisType.kt.todo

@@ -0,0 +1,8 @@
+fun String?.foo(){
+    if (this != null){
+        val s : String = <caret>
+    }
+}
+
+
+// EXIST: this

idea/testData/completion/smart/AutoNotNullType.kt

@@ -0,0 +1,7 @@
+fun f(p: String?) {
+    if (p != null){
+        var a : String = <caret>
+    }
+}
+
+// EXIST: p

idea/testData/completion/smart/AutoNotNullTypeWithQualifier.kt

@@ -0,0 +1,10 @@
+class Foo(val prop1 : String?, val prop2 : String?){
+    fun f(p1: Foo, p2: Foo) {
+        if (p1.prop1 != null && p2.prop2 != null && prop2 != null){
+            var a : String = p1.<caret>
+        }
+    }
+}
+
+// EXIST: prop1
+// ABSENT: prop2

idea/testData/completion/smart/NoNothing.kt.todo

@@ -0,0 +1,11 @@
+fun fail() : Nothing{
+    throw RuntimeException()
+}
+
+fun f(p : String) {
+    var a : String = <caret>
+}
+
+// EXIST: p
+// ABSENT: fail
+// ABSENT: error

idea/testData/completion/smart/This.kt.todo

@@ -0,0 +1,5 @@
+fun String.foo(){
+    val s : String = <caret>
+}
+
+// EXIST: this

idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java

@@ -36,6 +36,26 @@ public class JetSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/smart"), Pattern.compile("^(.+)\\.kt$"), true);
     }
     
+    @TestMetadata("AutoCastedType.kt")
+    public void testAutoCastedType() throws Exception {
+        doTest("idea/testData/completion/smart/AutoCastedType.kt");
+    }
+    
+    @TestMetadata("AutoCastedTypeWithQualifier.kt")
+    public void testAutoCastedTypeWithQualifier() throws Exception {
+        doTest("idea/testData/completion/smart/AutoCastedTypeWithQualifier.kt");
+    }
+    
+    @TestMetadata("AutoNotNullType.kt")
+    public void testAutoNotNullType() throws Exception {
+        doTest("idea/testData/completion/smart/AutoNotNullType.kt");
+    }
+    
+    @TestMetadata("AutoNotNullTypeWithQualifier.kt")
+    public void testAutoNotNullTypeWithQualifier() throws Exception {
+        doTest("idea/testData/completion/smart/AutoNotNullTypeWithQualifier.kt");
+    }
+    
     @TestMetadata("ChainedCall.kt")
     public void testChainedCall() throws Exception {
         doTest("idea/testData/completion/smart/ChainedCall.kt");