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

KT-13953 Import member popup should not suggest methods when only property or variable is valid

Browse Source 
#KT-13953 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-09-21 21:54:27 +03:00
parent e30c211b3e
commit 038068aa44
5 changed files with 85 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
+11 -2
View File
@@ -29,6 +29,7 @@ import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
import org.jetbrains.kotlin.diagnostics.Errors
@@ -122,7 +123,7 @@ internal abstract class ImportFixBase<T : KtExpression>(expression: T) :
}
}
fun computeSuggestionsForName(name: Name, callTypeAndReceiver: CallTypeAndReceiver<*, *>):
private fun computeSuggestionsForName(name: Name, callTypeAndReceiver: CallTypeAndReceiver<*, *>):
Collection<DeclarationDescriptor> {
val nameStr = name.asString()
if (nameStr.isEmpty()) return emptyList()
@@ -149,7 +150,15 @@ internal abstract class ImportFixBase<T : KtExpression>(expression: T) :
val indicesHelper = KotlinIndicesHelper(resolutionFacade, searchScope, ::isVisible)
val result = fillCandidates(nameStr, callTypeAndReceiver, bindingContext, indicesHelper)
var result = fillCandidates(nameStr, callTypeAndReceiver, bindingContext, indicesHelper)
// for CallType.DEFAULT do not include functions if there is no parenthesis
if (callTypeAndReceiver is CallTypeAndReceiver.DEFAULT) {
val isCall = element.parent is KtCallExpression
if (!isCall) {
result = result.filter { it !is FunctionDescriptor }
}
}
return if (result.size > 1)
reduceCandidatesBasedOnDependencyRuleViolation(result, file)