diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt index 1376077f2d3..1c3128d8492 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.idea.refactoring.dropOverrideKeywordIfNecessary import org.jetbrains.kotlin.idea.refactoring.replaceListPsiAndKeepDelimiters import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.idea.core.ShortenReferences.Options +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getValueParameterList @@ -260,7 +261,11 @@ class KotlinCallableDefinitionUsage( parameter.setTypeReference(psiFactory.createType(renderedType)) } - val newIdentifier = psiFactory.createIdentifier(parameterInfo.getInheritedName(this)) - parameter.nameIdentifier?.replace(newIdentifier) + + val inheritedName = parameterInfo.getInheritedName(this) + if (Name.isValidIdentifier(inheritedName)) { + val newIdentifier = psiFactory.createIdentifier(inheritedName) + parameter.nameIdentifier?.replace(newIdentifier) + } } }