Import is placed in some specific order on adding

This commit is contained in:
Valentin Kipyatkov
2015-02-13 01:07:40 +03:00
parent 371e0baed1
commit 0a363fc371
51 changed files with 126 additions and 74 deletions
@@ -2,7 +2,7 @@
package p
import java.sql.*
import java.util.*
import java.sql.Date
import java.util.*
val d = Date()
@@ -2,7 +2,7 @@
package p
import java.sql.*
import java.util.*
import java.sql.Date
import java.util.*
val d: Date? = null
@@ -2,7 +2,7 @@
package p
import dependency.*
import java.util.*
import dependency.Date
import java.util.*
val d = Date(1, 2)
@@ -2,7 +2,7 @@
package p
import dependency.*
import java.util.*
import dependency.Date
import java.util.*
val d = Date.VALUE
@@ -2,7 +2,7 @@
package p
import dependency.AClass.*
import java.util.*
import dependency.AClass.Date
import java.util.*
val d = Date()
@@ -3,7 +3,7 @@ package p
import java.sql.*
import dependency.Date // import of function does not affect class name conflict
import java.util.*
import java.sql.Date
import java.util.*
val d = Date(1)
@@ -1,5 +1,5 @@
// IMPORT: java.sql.Date
package p
import java.util.*
import java.sql.Date
import java.util.*
@@ -1,6 +1,6 @@
// IMPORT: dependency.Date
package p
import dependency.Date
import java.util.*
import java.sql.*
import dependency.Date
@@ -2,10 +2,10 @@
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
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()
@@ -1,7 +1,7 @@
// IMPORT: dependency.X
package p
import java.util.*
import dependency.*
import java.util.*
val d = Date(1, 2)
@@ -0,0 +1,3 @@
package xxx
trait Dependency
@@ -0,0 +1,6 @@
// IMPORT: xxx.Dependency
import a.*
import kotlin.math.*
import java.util.*
import javax.*
@@ -0,0 +1,7 @@
// IMPORT: xxx.Dependency
import a.*
import xxx.*
import kotlin.math.*
import java.util.*
import javax.*