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

Include in MethodInfo only names of arguments actually in the call

Browse Source 
Needed to apply blacklist for e.g. startsWith more correctly.
This commit is contained in:
Dmitry Jemerov
2017-04-21 20:04:27 +02:00
parent aad79f4d63
commit 760e43d4f1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsProvider.kt
+11 -4
View File
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.RenderingFormat import org.jetbrains.kotlin.renderer.RenderingFormat
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -210,10 +211,16 @@ class KotlinInlayParameterHintsProvider : InlayParameterHintsProvider {
private fun getMethodInfo(elem: KtCallExpression): HintInfo.MethodInfo? { private fun getMethodInfo(elem: KtCallExpression): HintInfo.MethodInfo? {
val ctx = elem.analyze(BodyResolveMode.PARTIAL) val ctx = elem.analyze(BodyResolveMode.PARTIAL)
val resolvedCall = elem.getResolvedCall(ctx)?.candidateDescriptor val resolvedCall = elem.getResolvedCall(ctx)
if (resolvedCall is FunctionDescriptor) { val resolvedCallee = resolvedCall?.candidateDescriptor
val fqName = resolvedCall.fqNameOrNull()?.asString() ?: return null if (resolvedCallee is FunctionDescriptor) {
val paramNames = resolvedCall.valueParameters.map { it.name }.filter { !it.isSpecial }.map(Name::asString) val fqName = resolvedCallee.fqNameOrNull()?.asString() ?: return null
val paramNames = resolvedCall.valueArguments
.mapNotNull { (valueParameterDescriptor, resolvedValueArgument) ->
if (resolvedValueArgument !is DefaultValueArgument) valueParameterDescriptor.name else null
}
.filter { !it.isSpecial }
.map(Name::asString)
return HintInfo.MethodInfo(fqName, paramNames) return HintInfo.MethodInfo(fqName, paramNames)
} }
return null return null