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

Inlined function

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-05 21:26:10 +03:00
parent 064ff5d8cc
commit 192ce59a63
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
+15 -19
View File
@@ -101,7 +101,21 @@ class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupp
}
override fun findElementForUpdatingParameterInfo(context: UpdateParameterInfoContext): JetValueArgumentList? {
return findCallAndUpdateContext(context)
var element = context.file.findElementAt(context.offset) ?: return null
var parent = element.parent
while (parent != null && parent !is JetValueArgumentList) {
element = element!!.parent
parent = parent.parent
}
if (parent == null) return null
val argumentList = parent as JetValueArgumentList
if (element is JetValueArgument) {
val i = argumentList.arguments.indexOf(element)
context.setCurrentParameter(i)
context.setHighlightedParameter(element)
}
return argumentList
}
override fun updateParameterInfo(argumentList: JetValueArgumentList, context: UpdateParameterInfoContext) {
@@ -268,24 +282,6 @@ class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupp
return (argumentList.parent as? JetCallElement)?.getCallNameExpression()
}
private fun findCallAndUpdateContext(context: UpdateParameterInfoContext): JetValueArgumentList? {
var element = context.file.findElementAt(context.offset) ?: return null
var parent = element.parent
while (parent != null && parent !is JetValueArgumentList) {
element = element!!.parent
parent = parent.parent
}
if (parent == null) return null
val argumentList = parent as JetValueArgumentList
if (element is JetValueArgument) {
val i = argumentList.arguments.indexOf(element)
context.setCurrentParameter(i)
context.setHighlightedParameter(element)
}
return argumentList
}
private data class SignatureInfo(
val substitutedDescriptor: FunctionDescriptor,
val argumentToParameter: (ValueArgument) -> ValueParameterDescriptor?,