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

Removed redundant

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-10-04 21:04:11 +03:00
parent c06e2d994e
commit 49ac6b99f6
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
+10 -12
View File
@@ -398,19 +398,17 @@ internal class ImportMemberFix(expression: KtSimpleNameExpression) : ImportFixBa
): List<DeclarationDescriptor> {
val result = ArrayList<DeclarationDescriptor>()
val expression = element
if (expression is KtSimpleNameExpression) {
if (!expression.isImportDirectiveExpression() && !KtPsiUtil.isSelectorInQualified(expression)) {
val filterByCallType = { descriptor: DeclarationDescriptor -> callTypeAndReceiver.callType.descriptorKindFilter.accepts(descriptor) }
if (!expression.isImportDirectiveExpression() && !KtPsiUtil.isSelectorInQualified(expression)) {
val filterByCallType = { descriptor: DeclarationDescriptor -> callTypeAndReceiver.callType.descriptorKindFilter.accepts(descriptor) }
indicesHelper.getKotlinCallablesByName(name)
.filter { it.canBeReferencedViaImport() && !isTopLevelDeclaration(it) }
indicesHelper.getKotlinCallablesByName(name)
.filter { it.canBeReferencedViaImport() && !isTopLevelDeclaration(it) }
.filterTo(result, filterByCallType)
if (!ProjectStructureUtil.isJsKotlinModule(expression.getContainingKtFile())) {
indicesHelper.getJvmCallablesByName(name)
.filter { it.canBeReferencedViaImport() }
.filterTo(result, filterByCallType)
if (!ProjectStructureUtil.isJsKotlinModule(expression.getContainingKtFile())) {
indicesHelper.getJvmCallablesByName(name)
.filter { it.canBeReferencedViaImport() }
.filterTo(result, filterByCallType)
}
}
}
return result
@@ -425,7 +423,7 @@ internal class ImportMemberFix(expression: KtSimpleNameExpression) : ImportFixBa
return@run Name.identifier(name).singletonList()
}
}
return@run emptyList<Name>()
return@run emptyList()
}
override fun getSupportedErrors(): Collection<DiagnosticFactory<*>> = ERRORS