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

Suppressed inserting of package import from ImportInsertHelperImpl

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-16 22:10:25 +03:00
parent 1614de86d2
commit 81934b75c2
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/handlers/InsertFqnForJavaClass.kt.after
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import java.util
class SortedSet class SortedSet
fun test(set: SortedSet) { fun test(set: SortedSet) {
val a = util.SortedSet<caret> val a = java.util.SortedSet
} }
idea/idea-completion/testData/handlers/NonStandardArray.kt.after
Vendored
+1 -3
View File
@@ -1,4 +1,2 @@
import java.lang.reflect val x : java.lang.reflect.Array
val x : reflect.Array<caret>
val y: Array<String> val y: Array<String>
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+6 -3
View File
@@ -121,9 +121,6 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE)
if (classifier?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED if (classifier?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED
} }
is PackageViewDescriptor -> {
if (topLevelScope.getPackage(name)?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED
}
is FunctionDescriptor -> { is FunctionDescriptor -> {
val functions = topLevelScope.getFunctions(name, NoLookupLocation.FROM_IDE) val functions = topLevelScope.getFunctions(name, NoLookupLocation.FROM_IDE)
if (functions.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED 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) val properties = topLevelScope.getProperties(name, NoLookupLocation.FROM_IDE)
if (properties.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED 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 -> { else -> {
return ImportDescriptorResult.FAIL return ImportDescriptorResult.FAIL
} }