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

Change Signature: Use correct index in getOriginalParameter()

Browse Source 
#KT-18642 Fixed
 #KT-18606 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-26 14:32:14 +03:00
parent 9122f58d5d
commit 6060a39494
7 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt
+1 -3
View File
@@ -191,9 +191,7 @@ class KotlinParameterInfo @JvmOverloads constructor (
}
private fun getOriginalParameter(inheritedCallable: KotlinCallableDefinitionUsage<*>): KtParameter? {
val currentFunction = inheritedCallable.declaration as? KtFunction ?: return null
val originalParameterIndex = if (currentFunction.receiverTypeReference == null) originalIndex else originalIndex - 1
return currentFunction.valueParameters.getOrNull(originalParameterIndex)
return (inheritedCallable.declaration as? KtFunction)?.valueParameters?.getOrNull(originalIndex)
}
private fun buildNewParameter(inheritedCallable: KotlinCallableDefinitionUsage<*>, parameterIndex: Int): KtParameter {