From a62cda8365a741cd0bfe7fc81a6c9e762bacf842 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 2 Sep 2016 17:15:04 +0300 Subject: [PATCH] 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. --- .../testData/handlers/runtimeCast/InsertImport.kt | 4 ++-- .../handlers/runtimeCast/InsertImport.kt.after | 2 +- .../handlers/runtimeCast/InsertImport.kt.after.imports | 2 +- .../handlers/runtimeCast/InsertImport.kt.fragment | 2 +- idea/testData/addImport/Comments.kt | 2 +- idea/testData/addImport/Comments.kt.after | 2 +- idea/testData/addImport/CommentsNoPackageDirective.kt | 2 +- .../addImport/CommentsNoPackageDirective.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage1.kt | 2 +- .../ConflictingNameAppearsAndHasUsage1.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage2.kt | 2 +- .../ConflictingNameAppearsAndHasUsage2.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage3.kt | 2 +- .../ConflictingNameAppearsAndHasUsage3.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage4.kt | 2 +- .../ConflictingNameAppearsAndHasUsage4.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage5.kt | 2 +- .../ConflictingNameAppearsAndHasUsage5.kt.after | 2 +- .../addImport/ConflictingNameAppearsAndHasUsage6.kt | 2 +- .../ConflictingNameAppearsAndHasUsage6.kt.after | 2 +- .../ConflictingNameAppearsButUsageIsQualified.kt | 2 +- .../ConflictingNameAppearsButUsageIsQualified.kt.after | 2 +- .../addImport/ConflictingNameAppearsFalseUsage.kt | 2 +- .../ConflictingNameAppearsFalseUsage.kt.after | 2 +- .../addImport/ConflictingNameAppearsFalseUsage2.kt | 2 +- .../ConflictingNameAppearsFalseUsage2.kt.after | 2 +- .../addImport/ConflictingNameAppearsNoUsage.kt | 2 +- .../addImport/ConflictingNameAppearsNoUsage.kt.after | 2 +- .../ConflictingNameHasExplicitImportAlready.kt | 2 +- .../ConflictingNameHasExplicitImportAlready.kt.after | 2 +- idea/testData/addImport/DropExplicitImports.kt | 6 +++--- idea/testData/addImport/DropExplicitImports.kt.after | 4 ++-- idea/testData/addImport/ImportClassSimple.kt | 2 +- idea/testData/addImport/ImportClassSimple.kt.after | 2 +- .../ImportClassWhenFunctionImported.dependency.kt | 2 +- .../addImport/ImportClassWhenFunctionImported.kt | 8 ++++---- .../addImport/ImportClassWhenFunctionImported.kt.after | 10 +++++----- .../NoConflictingNameForInaccessibleClass1.kt | 2 +- .../NoConflictingNameForInaccessibleClass1.kt.after | 2 +- .../editor/optimizeImports/jvm/SamConstructor.kt | 4 ++-- .../editor/optimizeImports/jvm/SamConstructor.kt.after | 4 ++-- idea/testData/shortenRefs/constructor/GenericType.kt | 2 +- .../shortenRefs/constructor/GenericType.kt.after | 5 ++--- .../constructor/SAMConstructorFromLambda.kt | 9 ++++----- .../constructor/SAMConstructorFromLambda.kt.after | 10 ++++------ .../shortenRefs/constructor/WorksForClassNameRange2.kt | 2 +- .../constructor/WorksForClassNameRange2.kt.after | 4 ++-- 47 files changed, 68 insertions(+), 72 deletions(-) diff --git a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt index ade799a5501..ee95ba05d3a 100644 --- a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt +++ b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt @@ -2,5 +2,5 @@ fun main(args: Array) { val a = 1 } -// ELEMENT: ArrayList -// TAIL_TEXT: (java.util) \ No newline at end of file +// ELEMENT: TreeMap +// TAIL_TEXT: " (java.util)" \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after index cf172a911d3..598887b2aec 100644 --- a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after +++ b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after @@ -1 +1 @@ -ArrayList \ No newline at end of file +TreeMap \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after.imports b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after.imports index 9596157ef46..0dea6ebc6fd 100644 --- a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after.imports +++ b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.after.imports @@ -1 +1 @@ -import java.util.ArrayList \ No newline at end of file +import java.util.TreeMap \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.fragment b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.fragment index d29f3931df9..99d6df47729 100644 --- a/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.fragment +++ b/idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt.fragment @@ -1 +1 @@ -ArrayLis \ No newline at end of file +TreeM \ No newline at end of file diff --git a/idea/testData/addImport/Comments.kt b/idea/testData/addImport/Comments.kt index b90ccedae2e..90ac88f7da6 100644 --- a/idea/testData/addImport/Comments.kt +++ b/idea/testData/addImport/Comments.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p // comment diff --git a/idea/testData/addImport/Comments.kt.after b/idea/testData/addImport/Comments.kt.after index 67a3c14f16c..d084d2bec0d 100644 --- a/idea/testData/addImport/Comments.kt.after +++ b/idea/testData/addImport/Comments.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.util.* diff --git a/idea/testData/addImport/CommentsNoPackageDirective.kt b/idea/testData/addImport/CommentsNoPackageDirective.kt index 0a9f1830b58..bec6bce1346 100644 --- a/idea/testData/addImport/CommentsNoPackageDirective.kt +++ b/idea/testData/addImport/CommentsNoPackageDirective.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar // comment fun foo() {} diff --git a/idea/testData/addImport/CommentsNoPackageDirective.kt.after b/idea/testData/addImport/CommentsNoPackageDirective.kt.after index 1ed62d128c4..f16d68ff839 100644 --- a/idea/testData/addImport/CommentsNoPackageDirective.kt.after +++ b/idea/testData/addImport/CommentsNoPackageDirective.kt.after @@ -1,6 +1,6 @@ import java.util.* -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar // comment fun foo() {} diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt index 64a1fde6dcd..3481e210d27 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after index 85405d40612..ed476a6f67d 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt index 501d2c5363a..fd394c7666f 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after index c8e4662dc8b..6fdf2a7f0f8 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage2.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt index 854530337b9..82a3b79468b 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after index 03a9602b88e..c221f40d2a5 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage3.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt index 932b0fc8899..4a53634d2ac 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after index 7611254b766..f187c0f5b2d 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt index a2ae6fc2452..cefc87ffbea 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.AClass.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after index 987b1ac2390..6a36317388e 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage5.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.AClass.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt index 329b45354a4..20d8c0a62ff 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt.after b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt.after index 41c9370fa4f..67bd34cfbd1 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage6.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt b/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt index 2e142bc1b84..303d46de38f 100644 --- a/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt +++ b/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after b/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after index 3565b51ddd7..6339ee57c04 100644 --- a/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsButUsageIsQualified.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt b/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt index 282cfea6cc4..e4fdb6a41c2 100644 --- a/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt +++ b/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after b/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after index 007e7beef1d..2b76f4690e4 100644 --- a/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsFalseUsage.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt b/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt index 2122c35cf1b..74e6f0d7851 100644 --- a/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt +++ b/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after b/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after index 136aa239706..2136747b89e 100644 --- a/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsFalseUsage2.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt b/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt index 4accd4e9123..f81c55bc60d 100644 --- a/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt +++ b/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after b/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after index 7621599fd58..472df1851dc 100644 --- a/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after +++ b/idea/testData/addImport/ConflictingNameAppearsNoUsage.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt b/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt index f7271bf2435..5ae7f09098a 100644 --- a/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt +++ b/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after b/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after index c8e4662dc8b..6fdf2a7f0f8 100644 --- a/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after +++ b/idea/testData/addImport/ConflictingNameHasExplicitImportAlready.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.sql.* diff --git a/idea/testData/addImport/DropExplicitImports.kt b/idea/testData/addImport/DropExplicitImports.kt index 1bac7c758cd..7dee14395f6 100644 --- a/idea/testData/addImport/DropExplicitImports.kt +++ b/idea/testData/addImport/DropExplicitImports.kt @@ -1,13 +1,13 @@ -// IMPORT: java.util.HashMap +// IMPORT: java.util.Calendar package p 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.HashSet as JavaHashSet // alias import should not be dropped fun foo() { val v1 = JavaHashSet() val v2 = Date() - val v3 = ArrayList() + val v3 = Properties() } \ No newline at end of file diff --git a/idea/testData/addImport/DropExplicitImports.kt.after b/idea/testData/addImport/DropExplicitImports.kt.after index 6e7b6ada8f1..8de64328d36 100644 --- a/idea/testData/addImport/DropExplicitImports.kt.after +++ b/idea/testData/addImport/DropExplicitImports.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.HashMap +// IMPORT: java.util.Calendar package p import java.sql.* @@ -9,5 +9,5 @@ import java.util.HashSet as JavaHashSet // alias import should not be dropped fun foo() { val v1 = JavaHashSet() val v2 = Date() - val v3 = ArrayList() + val v3 = Properties() } \ No newline at end of file diff --git a/idea/testData/addImport/ImportClassSimple.kt b/idea/testData/addImport/ImportClassSimple.kt index 946467d6551..5ba6a160d2b 100644 --- a/idea/testData/addImport/ImportClassSimple.kt +++ b/idea/testData/addImport/ImportClassSimple.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p fun foo() {} diff --git a/idea/testData/addImport/ImportClassSimple.kt.after b/idea/testData/addImport/ImportClassSimple.kt.after index 1cc467eaaed..5299742c810 100644 --- a/idea/testData/addImport/ImportClassSimple.kt.after +++ b/idea/testData/addImport/ImportClassSimple.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import java.util.* diff --git a/idea/testData/addImport/ImportClassWhenFunctionImported.dependency.kt b/idea/testData/addImport/ImportClassWhenFunctionImported.dependency.kt index f6e0a597b5e..064cb1d989c 100644 --- a/idea/testData/addImport/ImportClassWhenFunctionImported.dependency.kt +++ b/idea/testData/addImport/ImportClassWhenFunctionImported.dependency.kt @@ -1,3 +1,3 @@ package pack1 -fun ArrayList(){} \ No newline at end of file +fun ConcurrentHashMap(){} \ No newline at end of file diff --git a/idea/testData/addImport/ImportClassWhenFunctionImported.kt b/idea/testData/addImport/ImportClassWhenFunctionImported.kt index 7684775c9a8..c0d299159ae 100644 --- a/idea/testData/addImport/ImportClassWhenFunctionImported.kt +++ b/idea/testData/addImport/ImportClassWhenFunctionImported.kt @@ -1,7 +1,7 @@ -// IMPORT: java.util.ArrayList -import pack1.ArrayList +// IMPORT: java.util.concurrent.ConcurrentHashMap +import pack1.ConcurrentHashMap fun foo() { - ArrayList() - ArrayList() + ConcurrentHashMap() + ConcurrentHashMap() } \ No newline at end of file diff --git a/idea/testData/addImport/ImportClassWhenFunctionImported.kt.after b/idea/testData/addImport/ImportClassWhenFunctionImported.kt.after index 36203f014ca..b4242ae02d7 100644 --- a/idea/testData/addImport/ImportClassWhenFunctionImported.kt.after +++ b/idea/testData/addImport/ImportClassWhenFunctionImported.kt.after @@ -1,8 +1,8 @@ -// IMPORT: java.util.ArrayList -import pack1.ArrayList -import java.util.* +// IMPORT: java.util.concurrent.ConcurrentHashMap +import pack1.ConcurrentHashMap +import java.util.concurrent.* fun foo() { - ArrayList() - ArrayList() + ConcurrentHashMap() + ConcurrentHashMap() } \ No newline at end of file diff --git a/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt b/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt index 854530337b9..82a3b79468b 100644 --- a/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt +++ b/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt.after b/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt.after index e21716fdd94..67d06daf419 100644 --- a/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt.after +++ b/idea/testData/addImport/NoConflictingNameForInaccessibleClass1.kt.after @@ -1,4 +1,4 @@ -// IMPORT: java.util.ArrayList +// IMPORT: java.util.Calendar package p import dependency.* diff --git a/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt b/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt index 4a5253f9406..ddeb404ffae 100644 --- a/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt +++ b/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt @@ -1,3 +1,3 @@ -import java.util.* +import java.util.concurrent.* -val c = Comparator {(x: Int, y: Int) -> 1} +val c = Callable { -> 1 } diff --git a/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt.after b/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt.after index 990298a1c51..6d16bde730c 100644 --- a/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt.after +++ b/idea/testData/editor/optimizeImports/jvm/SamConstructor.kt.after @@ -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 } diff --git a/idea/testData/shortenRefs/constructor/GenericType.kt b/idea/testData/shortenRefs/constructor/GenericType.kt index 2165ddc6b9b..58f832f9d96 100644 --- a/idea/testData/shortenRefs/constructor/GenericType.kt +++ b/idea/testData/shortenRefs/constructor/GenericType.kt @@ -1,3 +1,3 @@ class A { - val x = java.util.HashMap, String>() + val x = java.util.TreeMap, String>() } diff --git a/idea/testData/shortenRefs/constructor/GenericType.kt.after b/idea/testData/shortenRefs/constructor/GenericType.kt.after index f9d331b584a..66a944229f3 100644 --- a/idea/testData/shortenRefs/constructor/GenericType.kt.after +++ b/idea/testData/shortenRefs/constructor/GenericType.kt.after @@ -1,7 +1,6 @@ import java.io.File -import java.util.ArrayList -import java.util.HashMap +import java.util.TreeMap class A { - val x = HashMap, String>() + val x = TreeMap, String>() } diff --git a/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt b/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt index 0d431ac8c7c..b41c27c468e 100644 --- a/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt +++ b/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt @@ -1,9 +1,8 @@ -import java.util.Collections -import java.util.ArrayList +import java.util.concurrent.Executors fun foo() { - Collections.sort( - ArrayList(), - java.util.Comparator { x: Int, y: Int -> x - y } + Executors.callable( + java.lang.Runnable { -> }, + Unit ) } \ No newline at end of file diff --git a/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt.after b/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt.after index 5df0746b1fc..fa66a8e1b24 100644 --- a/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt.after +++ b/idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt.after @@ -1,10 +1,8 @@ -import java.util.Collections -import java.util.ArrayList -import java.util.Comparator +import java.util.concurrent.Executors fun foo() { - Collections.sort( - ArrayList(), - Comparator { x: Int, y: Int -> x - y } + Executors.callable( + Runnable { -> }, + Unit ) } \ No newline at end of file diff --git a/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt b/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt index a9996a3eec5..f8c55ca08af 100644 --- a/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt +++ b/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt @@ -1 +1 @@ -val x = java.util.HashMap(1) +val x = java.util.TreeMap(1) diff --git a/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt.after b/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt.after index 0aad007ac1a..1ded772afb0 100644 --- a/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt.after +++ b/idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt.after @@ -1,3 +1,3 @@ -import java.util.HashMap +import java.util.TreeMap -val x = HashMap(1) +val x = TreeMap(1)