From 6e25db990d2b49c842806a44620d30b5c76a6bea Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 24 May 2018 21:22:08 +0300 Subject: [PATCH] Change Signature: Use target declaration as a context for types #KT-22387 Fixed --- .../changeSignature/ui/KotlinChangeSignatureDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index 8788b2a33d0..d3bf9ddad0c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -402,7 +402,7 @@ class KotlinChangeSignatureDialog( companion object { private fun createParametersInfoModel(descriptor: KotlinMethodDescriptor, defaultValueContext: PsiElement): KotlinCallableParameterTableModel { - val typeContext = getTypeCodeFragmentContext(defaultValueContext) + val typeContext = getTypeCodeFragmentContext(descriptor.baseDeclaration) return when (descriptor.kind) { KotlinMethodDescriptor.Kind.FUNCTION -> KotlinFunctionParameterTableModel(descriptor, typeContext, defaultValueContext) KotlinMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR -> KotlinPrimaryConstructorParameterTableModel(descriptor, typeContext, defaultValueContext)