azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace types that are imported by default via typealiases such as java.util.ArrayList with something else as it conflicts now with kotlin.collections.ArrayList and has to imported explicitly.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-09-02 17:15:04 +03:00
parent b7e2649b91
commit a62cda8365
47 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt
Vendored
+2 -2
View File
@@ -2,5 +2,5 @@ fun main(args: Array<String>) {
<caret>val a = 1 <caret>val a = 1
} }
// ELEMENT: ArrayList // ELEMENT: TreeMap
// TAIL_TEXT: <E> (java.util) // TAIL_TEXT: "<K, V> (java.util)"
idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after
Vendored
+1 -1
View File
@@ -1 +1 @@
ArrayList TreeMap
idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after.imports
Vendored
+1 -1
View File
@@ -1 +1 @@
import java.util.ArrayList import java.util.TreeMap
idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.fragment
Vendored
+1 -1
View File
@@ -1 +1 @@
ArrayLis<caret> TreeM<caret>
idea/testData/addImport/Comments.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
// comment // comment
idea/testData/addImport/Comments.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.util.* import java.util.*
idea/testData/addImport/CommentsNoPackageDirective.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
// comment // comment
fun foo() {} fun foo() {}
idea/testData/addImport/CommentsNoPackageDirective.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
import java.util.* import java.util.*
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
// comment // comment
fun foo() {} fun foo() {}
idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.AClass.* import dependency.AClass.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.AClass.* import dependency.AClass.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/ConflictingNameAppearsNoUsage.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
idea/testData/addImport/DropExplicitImports.kt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
// IMPORT: java.util.HashMap // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
import java.util.ArrayList // maybe dropped on adding import with * import java.util.Properties // maybe dropped on adding import with *
import java.util.Date // should not be dropped because of conflicting java.sql.Date class 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.HashSet as JavaHashSet // alias import should not be dropped
fun foo() { fun foo() {
val v1 = JavaHashSet() val v1 = JavaHashSet()
val v2 = Date() val v2 = Date()
val v3 = ArrayList() val v3 = Properties()
} }
idea/testData/addImport/DropExplicitImports.kt.after
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.HashMap // IMPORT: java.util.Calendar
package p package p
import java.sql.* import java.sql.*
@@ -9,5 +9,5 @@ import java.util.HashSet as JavaHashSet // alias import should not be dropped
fun foo() { fun foo() {
val v1 = JavaHashSet() val v1 = JavaHashSet()
val v2 = Date() val v2 = Date()
val v3 = ArrayList() val v3 = Properties()
} }
idea/testData/addImport/ImportClassSimple.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
fun foo() {} fun foo() {}
idea/testData/addImport/ImportClassSimple.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import java.util.* import java.util.*
idea/testData/addImport/ImportClassWhenFunctionImported.dependency.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package pack1 package pack1
fun ArrayList(){} fun ConcurrentHashMap(){}
idea/testData/addImport/ImportClassWhenFunctionImported.kt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.concurrent.ConcurrentHashMap
import pack1.ArrayList import pack1.ConcurrentHashMap
fun foo() { fun foo() {
ArrayList() ConcurrentHashMap()
ArrayList<String>() ConcurrentHashMap<String, String>()
} }
idea/testData/addImport/ImportClassWhenFunctionImported.kt.after
Vendored
+5 -5
View File
@@ -1,8 +1,8 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.concurrent.ConcurrentHashMap
import pack1.ArrayList import pack1.ConcurrentHashMap
import java.util.* import java.util.concurrent.*
fun foo() { fun foo() {
ArrayList() ConcurrentHashMap()
ArrayList<String>() ConcurrentHashMap<String, String>()
} }
idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IMPORT: java.util.ArrayList // IMPORT: java.util.Calendar
package p package p
import dependency.* import dependency.*
idea/testData/editor/optimizeImports/jvm/SamConstructor.kt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
import java.util.* import java.util.concurrent.*
val c = Comparator {(x: Int, y: Int) -> 1} val c = Callable { -> 1 }
idea/testData/editor/optimizeImports/jvm/SamConstructor.kt.after
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
import java.util.Comparator import java.util.concurrent.Callable
val c = Comparator {(x: Int, y: Int) -> 1} val c = Callable { -> 1 }
idea/testData/shortenRefs/constructor/GenericType.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
class A { class A {
val x = <selection>java.util.HashMap<java.util.ArrayList<java.io.File>, String>()</selection> val x = <selection>java.util.TreeMap<kotlin.collections.List<java.io.File>, String>()</selection>
} }
idea/testData/shortenRefs/constructor/GenericType.kt.after
Vendored
+2 -3
View File
@@ -1,7 +1,6 @@
import java.io.File import java.io.File
import java.util.ArrayList import java.util.TreeMap
import java.util.HashMap
class A { class A {
val x = HashMap<ArrayList<File>, String>() val x = TreeMap<List<File>, String>()
} }
idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt
Vendored
+4 -5
View File
@@ -1,9 +1,8 @@
import java.util.Collections import java.util.concurrent.Executors
import java.util.ArrayList
fun foo() { fun foo() {
Collections.sort( Executors.callable(
ArrayList<Int>(), <selection>java.lang.Runnable</selection> { -> },
<selection>java.util.Comparator</selection> { x: Int, y: Int -> x - y } Unit
) )
} }
idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt.after
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
import java.util.Collections import java.util.concurrent.Executors
import java.util.ArrayList
import java.util.Comparator
fun foo() { fun foo() {
Collections.sort( Executors.callable(
ArrayList<Int>(), Runnable { -> },
Comparator { x: Int, y: Int -> x - y } Unit
) )
} }
idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt
Vendored
+1 -1
View File
@@ -1 +1 @@
val x = <selection>java.util.HashMap</selection><java.util.Date, String>(1) val x = <selection>java.util.TreeMap</selection><java.util.Date, String>(1)
idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt.after
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
import java.util.HashMap import java.util.TreeMap
val x = HashMap<java.util.Date, String>(1) val x = TreeMap<java.util.Date, String>(1)