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

Fixed other parameter references broken in new parameter values in conventional Change Signature

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-03-26 14:40:07 +02:00
parent 0adfa0357a
commit 88cd129549
4 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt
+53 -73
View File
@@ -40,86 +40,66 @@ class KotlinParameterInfo @JvmOverloads constructor(
) : ParameterInfo {
var currentTypeInfo: KotlinTypeInfo = originalTypeInfo
val defaultValueParameterReferences: Map<PsiReference, DeclarationDescriptor>
val defaultValueParameterReferences: Map<PsiReference, DeclarationDescriptor> by lazy { collectDefaultValueParameterReferences(defaultValueForCall) }
init {
val file = defaultValueForCall?.containingFile as? KtFile
defaultValueParameterReferences =
if (defaultValueForCall != null && file != null && (file.isPhysical || file.analysisContext != null)) {
val project = file.project
val map = LinkedHashMap<PsiReference, DeclarationDescriptor>()
private fun collectDefaultValueParameterReferences(defaultValueForCall: KtExpression?): Map<PsiReference, DeclarationDescriptor> {
val file = defaultValueForCall?.containingFile as? KtFile ?: return emptyMap()
if (!file.isPhysical && file.analysisContext == null) return emptyMap()
defaultValueForCall!!.accept(
object : KtTreeVisitorVoid() {
private fun selfParameterOrNull(parameter: DeclarationDescriptor?): ValueParameterDescriptor? {
return if (parameter is ValueParameterDescriptor &&
compareDescriptors(project, parameter.containingDeclaration, callableDescriptor)
) {
parameter
} else null
}
val project = file.project
val map = LinkedHashMap<PsiReference, DeclarationDescriptor>()
private fun selfReceiverOrNull(receiverDescriptor: DeclarationDescriptor?): DeclarationDescriptor? {
if (compareDescriptors(
project,
receiverDescriptor,
callableDescriptor.extensionReceiverParameter?.containingDeclaration
)
) {
return receiverDescriptor
}
if (compareDescriptors(
project,
receiverDescriptor,
callableDescriptor.dispatchReceiverParameter?.containingDeclaration
)
) {
return receiverDescriptor
}
return null
}
defaultValueForCall.accept(
object : KtTreeVisitorVoid() {
private fun selfParameterOrNull(parameter: DeclarationDescriptor?): ValueParameterDescriptor? {
return (parameter as? ValueParameterDescriptor)
?.takeIf { compareDescriptors(project, parameter.containingDeclaration, callableDescriptor) }
}
private fun selfReceiverOrNull(receiver: ImplicitReceiver?): DeclarationDescriptor? {
return selfReceiverOrNull(receiver?.declarationDescriptor)
}
private fun getRelevantDescriptor(
expression: KtSimpleNameExpression,
ref: KtReference
): DeclarationDescriptor? {
val context = expression.analyze(BodyResolveMode.PARTIAL)
val descriptor = ref.resolveToDescriptors(context).singleOrNull()
if (descriptor is ValueParameterDescriptor) return selfParameterOrNull(descriptor)
if (descriptor is PropertyDescriptor && callableDescriptor is ConstructorDescriptor) {
val parameter = DescriptorToSourceUtils.getSourceFromDescriptor(descriptor) as? KtParameter
return parameter?.let { selfParameterOrNull(context[BindingContext.VALUE_PARAMETER, it]) }
}
val resolvedCall = expression.getResolvedCall(context) ?: return null
(resolvedCall.resultingDescriptor as? ReceiverParameterDescriptor)?.let {
return if (selfReceiverOrNull(it.containingDeclaration) != null) it else null
}
selfReceiverOrNull(resolvedCall.extensionReceiver as? ImplicitReceiver)?.let { return it }
selfReceiverOrNull(resolvedCall.dispatchReceiver as? ImplicitReceiver)?.let { return it }
return null
}
override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
val ref = expression.mainReference
val descriptor = getRelevantDescriptor(expression, ref) ?: return
map[ref] = descriptor
}
private fun selfReceiverOrNull(receiverDescriptor: DeclarationDescriptor?): DeclarationDescriptor? {
if (compareDescriptors(project, receiverDescriptor, callableDescriptor.extensionReceiverParameter?.containingDeclaration)) {
return receiverDescriptor
}
)
if (compareDescriptors(project, receiverDescriptor, callableDescriptor.dispatchReceiverParameter?.containingDeclaration)) {
return receiverDescriptor
}
return null
}
map
} else {
emptyMap()
private fun selfReceiverOrNull(receiver: ImplicitReceiver?): DeclarationDescriptor? {
return selfReceiverOrNull(receiver?.declarationDescriptor)
}
private fun getRelevantDescriptor(expression: KtSimpleNameExpression, ref: KtReference): DeclarationDescriptor? {
val context = expression.analyze(BodyResolveMode.PARTIAL)
val descriptor = ref.resolveToDescriptors(context).singleOrNull()
if (descriptor is ValueParameterDescriptor) return selfParameterOrNull(descriptor)
if (descriptor is PropertyDescriptor && callableDescriptor is ConstructorDescriptor) {
val parameter = DescriptorToSourceUtils.getSourceFromDescriptor(descriptor) as? KtParameter
return parameter?.let { selfParameterOrNull(context[BindingContext.VALUE_PARAMETER, it]) }
}
val resolvedCall = expression.getResolvedCall(context) ?: return null
(resolvedCall.resultingDescriptor as? ReceiverParameterDescriptor)?.let {
return if (selfReceiverOrNull(it.containingDeclaration) != null) it else null
}
selfReceiverOrNull(resolvedCall.extensionReceiver as? ImplicitReceiver)?.let { return it }
selfReceiverOrNull(resolvedCall.dispatchReceiver as? ImplicitReceiver)?.let { return it }
return null
}
override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
val ref = expression.mainReference
val descriptor = getRelevantDescriptor(expression, ref) ?: return
map[ref] = descriptor
}
}
)
return map
}
override fun getOldIndex(): Int = originalIndex
idea/testData/refactoring/changeSignature/NewParamValueRefsOtherParamAfter.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
fun <caret>foo(p1: Int, p2: Int) {
}
fun bar() {
foo(1, 1 * 1)
foo(2, 2 * 2)
}
idea/testData/refactoring/changeSignature/NewParamValueRefsOtherParamBefore.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
fun <caret>foo(p1: Int) {
}
fun bar() {
foo(1)
foo(2)
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt
+9
View File
@@ -1599,4 +1599,13 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() {
fun testRemoveLambdaParameter2() {
doTest { removeParameter(0) }
}
fun testNewParamValueRefsOtherParam() {
doTest {
val parameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "p2", KotlinTypeInfo(false, BUILT_INS.intType))
val codeFragment = KtPsiFactory(project).createExpressionCodeFragment("p1 * p1", context)
parameterInfo.defaultValueForCall = codeFragment.getContentElement()!!
addParameter(parameterInfo)
}
}
}