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

Added check to ImportInsertHelperImpl that inserted import successfully imports descriptor

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-23 19:52:20 +03:00
parent 88815c40cc
commit 9cc6d1cf58
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+29 -31
View File
@@ -108,37 +108,34 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
) {
private val resolutionFacade = file.getResolutionFacade()
private fun isAlreadyImported(target: DeclarationDescriptor, topLevelScope: JetScope, targetFqName: FqName): Boolean {
val name = target.name
when (target) {
is ClassDescriptor -> {
val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE)
if (classifier?.importableFqName == targetFqName) return true
}
is FunctionDescriptor -> {
val functions = topLevelScope.getFunctions(name, NoLookupLocation.FROM_IDE)
if (functions.map { it.importableFqName }.contains(targetFqName)) return true
}
is PropertyDescriptor -> {
val properties = topLevelScope.getProperties(name, NoLookupLocation.FROM_IDE)
if (properties.map { it.importableFqName }.contains(targetFqName)) return true
}
}
return false
}
fun importDescriptor(descriptor: DeclarationDescriptor): ImportDescriptorResult {
val target = descriptor.getImportableDescriptor()
val targetFqName = target.importableFqName ?: return ImportDescriptorResult.FAIL
val name = target.name
val topLevelScope = resolutionFacade.getFileTopLevelScope(file)
// check if import is not needed
when (target) {
is ClassDescriptor -> {
val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE)
if (classifier?.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
}
is PropertyDescriptor -> {
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
}
}
val targetFqName = target.importableFqName ?: return ImportDescriptorResult.FAIL
if (isAlreadyImported(target, topLevelScope, targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED
if (!mayImportByCodeStyle(descriptor)) {
return ImportDescriptorResult.FAIL
@@ -149,6 +146,10 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
else
file.getImportDirectives()
if (imports.any { !it.isAllUnder && it.importPath?.fqnPart() == targetFqName }) {
return ImportDescriptorResult.FAIL
}
// check there is an explicit import of a class/package with the same name already
val conflict = when (target) {
is ClassDescriptor -> topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE)
@@ -249,13 +250,10 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
val addedImport = addImport(parentFqName, true)
if (target is ClassDescriptor) {
val newTopLevelScope = resolutionFacade.getFileTopLevelScope(file)
val resolvedTo = newTopLevelScope.getClassifier(target.name, NoLookupLocation.FROM_IDE)
if (resolvedTo?.importableFqName != targetFqName) {
addedImport.delete()
return ImportDescriptorResult.FAIL
}
val newTopLevelScope = resolutionFacade.getFileTopLevelScope(file)
if (!isAlreadyImported(target, newTopLevelScope, targetFqName)) {
addedImport.delete()
return ImportDescriptorResult.FAIL
}
for (conflict in conflicts) {