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

More clear code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-03-03 13:35:06 +03:00
parent 5b4afa140b
commit 33bc234f45
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+7 -7
View File
@@ -331,14 +331,14 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
}
}
private fun detectNeededImports(importedDescriptors: Collection<DeclarationDescriptor>): Set<DeclarationDescriptor> {
if (importedDescriptors.isEmpty()) return setOf()
private fun detectNeededImports(importedClasses: Collection<ClassifierDescriptor>): Set<ClassifierDescriptor> {
if (importedClasses.isEmpty()) return setOf()
val descriptorsToCheck = importedDescriptors.map { it.getName() to it }.toMap().toLinkedMap()
val result = LinkedHashSet<DeclarationDescriptor>()
val classesToCheck = importedClasses.map { it.getName() to it }.toMap().toLinkedMap()
val result = LinkedHashSet<ClassifierDescriptor>()
file.accept(object : JetVisitorVoid() {
override fun visitElement(element: PsiElement) {
if (descriptorsToCheck.isEmpty()) return
if (classesToCheck.isEmpty()) return
element.acceptChildren(this)
}
@@ -352,11 +352,11 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
if (JetPsiUtil.isSelectorInQualified(expression)) return
val refName = expression.getReferencedNameAsName()
val descriptor = descriptorsToCheck[refName]
val descriptor = classesToCheck[refName]
if (descriptor != null) {
val targetFqName = targetFqName(expression)
if (targetFqName != null && targetFqName == DescriptorUtils.getFqNameSafe(descriptor)) {
descriptorsToCheck.remove(refName)
classesToCheck.remove(refName)
result.add(descriptor)
}
}