diff --git a/idea/idea-completion/testData/handlers/InsertFqnForJavaClass.kt.after b/idea/idea-completion/testData/handlers/InsertFqnForJavaClass.kt.after index f746412689e..80ed3b4d79d 100644 --- a/idea/idea-completion/testData/handlers/InsertFqnForJavaClass.kt.after +++ b/idea/idea-completion/testData/handlers/InsertFqnForJavaClass.kt.after @@ -1,7 +1,5 @@ -import java.util - class SortedSet fun test(set: SortedSet) { - val a = util.SortedSet + val a = java.util.SortedSet } diff --git a/idea/idea-completion/testData/handlers/NonStandardArray.kt.after b/idea/idea-completion/testData/handlers/NonStandardArray.kt.after index a89783e3154..e651b5295e1 100644 --- a/idea/idea-completion/testData/handlers/NonStandardArray.kt.after +++ b/idea/idea-completion/testData/handlers/NonStandardArray.kt.after @@ -1,4 +1,2 @@ -import java.lang.reflect - -val x : reflect.Array +val x : java.lang.reflect.Array val y: Array \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index a0c91d8eab8..73ed93f0169 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -121,9 +121,6 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) if (classifier?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED } - is PackageViewDescriptor -> { - if (topLevelScope.getPackage(name)?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED - } is FunctionDescriptor -> { val functions = topLevelScope.getFunctions(name, NoLookupLocation.FROM_IDE) if (functions.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED @@ -132,6 +129,12 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert val properties = topLevelScope.getProperties(name, NoLookupLocation.FROM_IDE) if (properties.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED } + // todo change this after adding special syntax for package import + // now impossible import package + // + // is PackageViewDescriptor -> { + // if (topLevelScope.getPackage(name)?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED + // } else -> { return ImportDescriptorResult.FAIL }