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

KT-15141 Bogus import popup for when function call cannot be resolved fully

Browse Source 
#KT-15141 fixed
This commit is contained in:
Simon Ogorodnik
2016-12-26 21:06:56 +03:00
committed by Simon Ogorodnik
parent db8edb01c3
commit c5e3f0ad01
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
+3 -1
View File
@@ -506,10 +506,12 @@ internal class ImportForMismatchingArgumentsFix(
val resolutionFacade = file.getResolutionFacade() val resolutionFacade = file.getResolutionFacade()
val resolutionScope = elementToAnalyze.getResolutionScope(bindingContext, resolutionFacade) val resolutionScope = elementToAnalyze.getResolutionScope(bindingContext, resolutionFacade)
val imported = resolutionScope.collectFunctions(identifier, NoLookupLocation.FROM_IDE)
fun filterFunction(descriptor: FunctionDescriptor): Boolean { fun filterFunction(descriptor: FunctionDescriptor): Boolean {
if (!callTypeAndReceiver.callType.descriptorKindFilter.accepts(descriptor)) return false if (!callTypeAndReceiver.callType.descriptorKindFilter.accepts(descriptor)) return false
if (descriptor in resolutionScope.collectFunctions(identifier, NoLookupLocation.FROM_IDE)) return false // already imported if (descriptor.original in imported) return false // already imported
// check that this function matches all arguments // check that this function matches all arguments
val resolutionScopeWithAddedImport = resolutionScope.addImportingScope(ExplicitImportsScope(listOf(descriptor))) val resolutionScopeWithAddedImport = resolutionScope.addImportingScope(ExplicitImportsScope(listOf(descriptor)))