Import insertion algorithm

idea/testData/addImport/CannotImportClass1.kt

@@ -0,0 +1,6 @@
+// IMPORT: class: kotlin.String
+package p
+
+import java.lang.String
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/CannotImportClass1.kt.after

@@ -0,0 +1 @@
+Failed to add import

idea/testData/addImport/CannotImportClass2.kt

@@ -0,0 +1,4 @@
+// IMPORT: java.sql.Date
+import java.util.*
+
+val d: Date = Date()

idea/testData/addImport/CannotImportClass2.kt.after

@@ -0,0 +1 @@
+Failed to add import

idea/testData/addImport/CannotImportClass3.kt

@@ -0,0 +1,4 @@
+// IMPORT: java.sql.Date
+import java.util as Date
+
+val d: Date.Date = Date.Date()

idea/testData/addImport/CannotImportClass3.kt.after

@@ -0,0 +1 @@
+Failed to add import

idea/testData/addImport/ClassAlreadyImported1.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.*
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/ClassAlreadyImported1.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.*
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/ClassAlreadyImported2.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.ArrayList
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/ClassAlreadyImported2.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.ArrayList
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.util.*
+import java.sql.Date
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.util.*
+import java.sql.Date
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.dependency.kt

@@ -0,0 +1,5 @@
+package dependency
+
+class Date
+
+fun Date(s: String) = Date()

idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+
+val d = Date(1, 2)

idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+import java.util.*
+import dependency.Date
+
+val d = Date(1, 2)

idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.dependency.kt

@@ -0,0 +1,7 @@
+package dependency
+
+class Date {
+    class object {
+        val VALUE = 0
+    }
+}

idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+
+val d = Date.VALUE

idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+import java.util.*
+import dependency.Date
+
+val d = Date.VALUE

idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.dependency.kt

@@ -0,0 +1,5 @@
+package dependency
+
+class AClass {
+    class Date
+}

idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.AClass.*
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.AClass.*
+import java.util.*
+import dependency.AClass.Date
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+
+val d: java.sql.Date? = null

idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after

@@ -0,0 +1,7 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.util.*
+
+val d: java.sql.Date? = null

idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+
+class Date
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after

@@ -0,0 +1,9 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.util.*
+
+class Date
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameAppearsFalseUsage2.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class Date

idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt

@@ -0,0 +1,7 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+import java.sql.*
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import dependency.*
+import java.sql.*
+import java.util.*
+
+val d = Date()

idea/testData/addImport/ConflictingNameAppearsNoUsage.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+
+val d: Driver? = null

idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after

@@ -0,0 +1,7 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.util.*
+
+val d: Driver? = null

idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt

@@ -0,0 +1,7 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.sql.Date
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.sql.*
+import java.sql.Date
+import java.util.*
+
+val d: Date? = null

idea/testData/addImport/ConflictingNameNoAllUnderImport.kt

@@ -0,0 +1,4 @@
+// IMPORT: java.sql.Date
+package p
+
+import java.util.*

idea/testData/addImport/ConflictingNameNoAllUnderImport.kt.after

@@ -0,0 +1,5 @@
+// IMPORT: java.sql.Date
+package p
+
+import java.util.*
+import java.sql.Date

idea/testData/addImport/ConflictingNameNoAllUnderImport2.kt

@@ -0,0 +1,5 @@
+// IMPORT: java.sql.Date
+package p
+
+import java.util.*
+import java.sql.*

idea/testData/addImport/ConflictingNameNoAllUnderImport2.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.sql.Date
+package p
+
+import java.util.*
+import java.sql.*
+import java.sql.Date

idea/testData/addImport/ConflictingNameNoAllUnderImport3.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class Date

idea/testData/addImport/ConflictingNameNoAllUnderImport3.kt

@@ -0,0 +1,5 @@
+// IMPORT: dependency.Date
+package p
+
+import java.util.*
+import java.sql.*

idea/testData/addImport/ConflictingNameNoAllUnderImport3.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: dependency.Date
+package p
+
+import java.util.*
+import java.sql.*
+import dependency.Date

idea/testData/addImport/DropExplicitImports.kt

@@ -0,0 +1,14 @@
+// IMPORT: java.util.HashMap
+package p
+
+import java.sql.*
+import java.util.ArrayList // maybe dropped on adding import with *
+import java.util.Date // should not be dropped because of conflicting java.sql.Date class
+import java.util.HashSet as JavaHashSet // alias import should not be dropped
+import java.util.concurrent // import of package should not be dropped because packages are not imported by *
+
+fun foo() {
+    val v1 = JavaHashSet()
+    val v2 = Date()
+    val v3 = ArrayList()
+}

idea/testData/addImport/DropExplicitImports.kt.after

@@ -0,0 +1,14 @@
+// IMPORT: java.util.HashMap
+package p
+
+import java.sql.*
+import java.util.HashSet as JavaHashSet // alias import should not be dropped
+import java.util.concurrent // import of package should not be dropped because packages are not imported by *
+import java.util.*
+import java.util.Date
+
+fun foo() {
+    val v1 = JavaHashSet()
+    val v2 = Date()
+    val v3 = ArrayList()
+}

idea/testData/addImport/DropExplicitImports2.dependency.kt

@@ -0,0 +1,6 @@
+package dependency
+
+fun function(){}
+val property: Int = 0
+class Class1
+class Class2

idea/testData/addImport/DropExplicitImports2.kt

@@ -0,0 +1,6 @@
+// IMPORT: dependency.Class2
+package p
+
+import dependency.Class1
+import dependency.function
+import dependency.property

idea/testData/addImport/DropExplicitImports2.kt.after

@@ -0,0 +1,4 @@
+// IMPORT: dependency.Class2
+package p
+
+import dependency.*

idea/testData/addImport/FunctionAlreadyImported1.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+fun foo(){}

idea/testData/addImport/FunctionAlreadyImported1.kt

@@ -0,0 +1,8 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.foo
+
+fun f() {
+    foo()
+}

idea/testData/addImport/FunctionAlreadyImported1.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.foo
+
+fun f() {
+    foo()
+}

idea/testData/addImport/FunctionAlreadyImported2.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+fun foo(){}

idea/testData/addImport/FunctionAlreadyImported2.kt

@@ -0,0 +1,8 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.*
+
+fun f() {
+    foo()
+}

idea/testData/addImport/FunctionAlreadyImported2.kt.after

@@ -0,0 +1,8 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.*
+
+fun f() {
+    foo()
+}

idea/testData/addImport/ImportClassSimple.kt

@@ -0,0 +1,4 @@
+// IMPORT: java.util.ArrayList
+package p
+
+fun foo() {}

idea/testData/addImport/ImportClassSimple.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.*
+
+fun foo() {}

idea/testData/addImport/ImportPackage.kt

@@ -0,0 +1,4 @@
+// IMPORT: java.util
+package p
+
+fun foo(): util.ArrayList<String> {}

idea/testData/addImport/ImportPackage.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.util
+package p
+
+import java.util
+
+fun foo(): util.ArrayList<String> {}

idea/testData/addImport/NoNeedToImportStandardClass.kt

@@ -0,0 +1,6 @@
+// IMPORT: class: kotlin.String
+package p
+
+import java.util.*
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/NoNeedToImportStandardClass.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: class: kotlin.String
+package p
+
+import java.util.*
+
+fun foo(): ArrayList<String> {}

idea/testData/addImport/PackageAlreadyImported.kt

@@ -0,0 +1,6 @@
+// IMPORT: java.util
+package p
+
+import java.util
+
+fun foo(): util.ArrayList<String> {}

idea/testData/addImport/PackageAlreadyImported.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: java.util
+package p
+
+import java.util
+
+fun foo(): util.ArrayList<String> {}

idea/testData/addImport/PropertyAlreadyImported1.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+val foo: Int = 1

idea/testData/addImport/PropertyAlreadyImported1.kt

@@ -0,0 +1,6 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.foo
+
+fun f() = foo

idea/testData/addImport/PropertyAlreadyImported1.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.foo
+
+fun f() = foo

idea/testData/addImport/PropertyAlreadyImported2.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+val foo: Int = 1

idea/testData/addImport/PropertyAlreadyImported2.kt

@@ -0,0 +1,6 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.*
+
+fun f() = foo

idea/testData/addImport/PropertyAlreadyImported2.kt.after

@@ -0,0 +1,6 @@
+// IMPORT: dependency.foo
+package p
+
+import dependency.*
+
+fun f() = foo