Smart completion: inheritors instantiation suggested + fixed a bug with incorrect presentation of generic java class instantiation

idea/testData/completion/handlers/smart/AnonymousObjectInsertsImport.kt

@@ -1,3 +1,3 @@
 val c: java.io.Closeable = <caret>
 
-//ELEMENT: object
+//ELEMENT_TEXT: "object: Closeable{...}"

idea/testData/completion/handlers/smart/AnonymousObjectInsertsImport.kt.after

@@ -6,4 +6,4 @@ val c: java.io.Closeable = object: Closeable {
     }
 }
 
-//ELEMENT: object
+//ELEMENT_TEXT: "object: Closeable{...}"

idea/testData/completion/handlers/smart/ConstructorForJavaClass.kt

@@ -1,3 +1,6 @@
 import java.util.Date
 
 var a : Date = <caret>
+
+// ELEMENT: Date
+// TAIL_TEXT: "(...) (java.util)"

idea/testData/completion/handlers/smart/ConstructorForJavaClass.kt.after

@@ -1,3 +1,6 @@
 import java.util.Date
 
 var a : Date = Date(<caret>)
+
+// ELEMENT: Date
+// TAIL_TEXT: "(...) (java.util)"

idea/testData/completion/handlers/smart/SAMExpected1.kt

@@ -1,3 +1,4 @@
 var a : Runnable = <caret>
 
-// ELEMENT: Runnable
+// ELEMENT_TEXT: Runnable
+// TAIL_TEXT: "()"

idea/testData/completion/handlers/smart/SAMExpected1.kt.after

@@ -1,3 +1,4 @@
 var a : Runnable = Runnable { <caret> }
 
-// ELEMENT: Runnable
+// ELEMENT_TEXT: Runnable
+// TAIL_TEXT: "()"

idea/testData/completion/smart/ConstructorForGenericJavaClass.kt

@@ -0,0 +1,5 @@
+import java.util.ArrayList
+
+var a : ArrayList<String> = <caret>
+
+// EXIST: { lookupString: "ArrayList", itemText: "ArrayList<String>", tailText: "(...) (java.util)" }

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

@@ -1,5 +0,0 @@
-import java.util.ArrayList
-
-var a : ArrayList<String> = <caret>
-
-// EXIST: ArrayList@ArrayList<String>()

idea/testData/completion/smart/Inheritors1.kt

@@ -0,0 +1,8 @@
+import java.io.InputStream
+
+fun foo(): InputStream {
+    return <caret>
+}
+
+// EXIST: ByteArrayInputStream
+// EXIST: FileInputStream

idea/testData/completion/smart/Inheritors2.kt

@@ -0,0 +1,5 @@
+fun foo(): List<String> {
+    return <caret>
+}
+
+// EXIST: { lookupString: "ArrayList", itemText: "ArrayList<String>", tailText: "(...) (java.util)" }

idea/testData/completion/smartMultiFile/GenericInheritors1/GenericInheritors1.kt

@@ -0,0 +1,15 @@
+import p.*
+
+fun foo(): KotlinTrait<I1, I2> {
+    return <caret>
+}
+
+// EXIST: { lookupString: "object", itemText: "object: KotlinTrait<I1, I2>{...}" }
+// EXIST: { lookupString: "KotlinInheritor1", itemText: "KotlinInheritor1<I1>", tailText: "() (p)" }
+// EXIST: { lookupString: "KotlinInheritor2", itemText: "KotlinInheritor2", tailText: "() (p)" }
+// ABSENT: KotlinInheritor3
+// EXIST: { lookupString: "object", itemText: "object: KotlinInheritor4<I1, I2>(){...}" }
+// ABSENT: KotlinInheritor5
+// EXIST: { lookupString: "KotlinInheritor6", itemText: "KotlinInheritor6<I1, out Any?, out I3>", tailText: "() (p)" }
+// EXIST: { lookupString: "JavaInheritor1", itemText: "JavaInheritor1", tailText: "() (<root>)" }
+// ABSENT: JavaInheritor2

idea/testData/completion/smartMultiFile/GenericInheritors1/JavaInheritors.java

@@ -0,0 +1,6 @@
+import p.*
+
+class JavaInheritor1 implements KotlinTrait<I1, I2>{}
+
+// is not suitable because type arguments do not match
+class JavaInheritor2 implements KotlinTrait<I1, I3>{}

idea/testData/completion/smartMultiFile/GenericInheritors1/KotlinInheritors.kt

@@ -0,0 +1,23 @@
+package p
+
+trait I1
+trait I2
+trait I3
+
+trait KotlinTrait<T1, T2>
+
+open class KotlinInheritor1<T> : KotlinTrait<T, I2>
+
+class KotlinInheritor2 : KotlinInheritor1<I1>()
+
+// is not suitable because type arguments do not match
+class KotlinInheritor3 : KotlinInheritor1<Any>()
+
+abstract class KotlinInheritor4<T, V> : KotlinTrait<T, V>
+
+// is not suitable because type arguments do not match
+class KotlinInheritor5 : KotlinTrait<Char, I2>
+
+class KotlinInheritor6<T1, T2, T3 : I3> : KotlinTrait<T1, I2>
+
+// ALLOW_AST_ACCESS

idea/testData/completion/smartMultiFile/GenericInheritors2/GenericInheritors2.kt

@@ -0,0 +1,8 @@
+import p.*
+
+fun foo(): KotlinTrait<I1, I1> {
+    return <caret>
+}
+
+// EXIST: { lookupString: "object", itemText: "object: KotlinTrait<I1, I1>{...}" }
+// EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor<I1>", tailText: "() (p)" }

idea/testData/completion/smartMultiFile/GenericInheritors2/KotlinInheritors.kt

@@ -0,0 +1,11 @@
+package p
+
+trait I1
+trait I2
+trait I3
+
+trait KotlinTrait<T1, T2>
+
+class KotlinInheritor<T> : KotlinTrait<T, T>
+
+// ALLOW_AST_ACCESS

idea/testData/completion/smartMultiFile/GenericInheritors3/GenericInheritors3.kt

@@ -0,0 +1,8 @@
+import p.*
+
+fun foo(): KotlinTrait<I1, I2> {
+    return <caret>
+}
+
+// EXIST: { lookupString: "object", itemText: "object: KotlinTrait<I1, I2>{...}" }
+// ABSENT: KotlinInheritor

idea/testData/completion/smartMultiFile/GenericInheritors3/KotlinInheritors.kt

@@ -0,0 +1,11 @@
+package p
+
+trait I1
+trait I2
+trait I3
+
+trait KotlinTrait<T1, T2>
+
+class KotlinInheritor<T> : KotlinTrait<T, T>
+
+// ALLOW_AST_ACCESS

idea/testData/completion/smartMultiFile/GenericInheritors4/GenericInheritors4.kt

@@ -0,0 +1,8 @@
+import p.*
+
+fun foo(): KotlinTrait<I1<I2>> {
+    return <caret>
+}
+
+// EXIST: { lookupString: "object", itemText: "object: KotlinTrait<I1<I2>>{...}" }
+// EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor<I2>", tailText: "() (p)" }

idea/testData/completion/smartMultiFile/GenericInheritors4/KotlinInheritors.kt

@@ -0,0 +1,10 @@
+package p
+
+trait I1<T>
+trait I2
+
+trait KotlinTrait<T>
+
+class KotlinInheritor<T> : KotlinTrait<I1<T>>
+
+// ALLOW_AST_ACCESS

idea/testData/completion/smartMultiFile/Inheritors/Inheritors.kt

@@ -0,0 +1,15 @@
+package p1
+
+fun foo(): p2.KotlinTrait {
+    return <caret>
+}
+
+// EXIST: { lookupString: "object", itemText: "object: KotlinTrait{...}" }
+// EXIST: { lookupString: "KotlinInheritor1", itemText: "KotlinInheritor1", tailText: "() (p2)" }
+// EXIST: { lookupString: "KotlinInheritor2", itemText: "KotlinInheritor2", tailText: "(s: String) (p2)" }
+// EXIST: { lookupString: "object", itemText: "object: KotlinInheritor3(){...}" }
+// ABSENT: PrivateInheritor
+// EXIST: { lookupString: "object", itemText: "object: JavaInheritor1(){...}" }
+// EXIST: { lookupString: "JavaInheritor2", itemText: "JavaInheritor2", tailText: "(...) (<root>)" }
+// ABSENT: JavaInheritor3
+// EXIST: { lookupString: "ObjectInheritor", itemText: "ObjectInheritor", tailText: " (p2)" }

idea/testData/completion/smartMultiFile/Inheritors/JavaInheritors.java

@@ -0,0 +1,16 @@
+import p2.KotlinTrait
+
+public abstract class JavaInheritor1 implements KotlinTrait {
+}
+
+public class JavaInheritor2 extends JavaInheritor1 {
+    public JavaInheritor2() {
+    }
+
+    public JavaInheritor2(int p) {
+    }
+}
+
+// not visible - it's package local
+class JavaInheritor3 extends KotlinTrait {}
+

idea/testData/completion/smartMultiFile/Inheritors/KotlinInheritors.kt

@@ -0,0 +1,17 @@
+package p2
+
+trait KotlinTrait
+
+open class KotlinInheritor1 : KotlinTrait
+
+class KotlinInheritor2(s: String) : KotlinInheritor1()
+
+abstract class KotlinInheritor3 : KotlinTrait
+
+class C {
+    private class PrivateInheritor : KotlinTrait
+}
+
+object ObjectInheritor : KotlinTrait
+
+// ALLOW_AST_ACCESS