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

Minor refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-05 17:46:04 +03:00
parent d338731734
commit eb500e0fef
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
+8 -13
View File
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiElement
import com.intellij.ui.Gray import com.intellij.ui.Gray
import com.intellij.ui.JBColor import com.intellij.ui.JBColor
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
@@ -105,20 +104,16 @@ class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupp
val results: OverloadResolutionResults<FunctionDescriptor> = callResolver.resolveFunctionCall(callResolutionContext) val results: OverloadResolutionResults<FunctionDescriptor> = callResolver.resolveFunctionCall(callResolutionContext)
val itemsToShow = ArrayList<DeclarationDescriptor>() val descriptors = results.allCandidates!!
for (candidate in results.allCandidates!!) { .filter { it.status != ResolutionStatus.RECEIVER_TYPE_ERROR && it.status != ResolutionStatus.RECEIVER_PRESENCE_ERROR }
val status = candidate.status .filter {
if (status == ResolutionStatus.RECEIVER_TYPE_ERROR || status == ResolutionStatus.RECEIVER_PRESENCE_ERROR) continue val thisReceiver = ExpressionTypingUtils.normalizeReceiverValueForVisibility(it.dispatchReceiver, bindingContext)
Visibilities.isVisible(thisReceiver, it.resultingDescriptor, inDescriptor)
var descriptor = candidate.resultingDescriptor }
.map { it.resultingDescriptor }
val thisReceiver = ExpressionTypingUtils.normalizeReceiverValueForVisibility(candidate.dispatchReceiver, bindingContext) context.itemsToShow = descriptors.toTypedArray()
if (!Visibilities.isVisible(thisReceiver, descriptor, inDescriptor)) continue
itemsToShow.add(descriptor)
}
context.itemsToShow = itemsToShow.toArray()
return argumentList return argumentList
} }