diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt index 5e8f7379769..39855a55826 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt @@ -119,7 +119,7 @@ class NewDeclarationNameValidator( if (nameAsName != name) return false if (this is KtCallableDeclaration && receiverTypeReference != null) return false return when(target) { - Target.VARIABLES -> this is KtVariableDeclaration + Target.VARIABLES -> this is KtVariableDeclaration || this is KtParameter Target.FUNCTIONS_AND_CLASSES -> this is KtNamedFunction || this is KtClassOrObject || this is KtTypeAlias } } diff --git a/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterPrimaryConstructor.kt.after b/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterPrimaryConstructor.kt.after index 9e1d864c053..7041b92d53c 100644 --- a/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterPrimaryConstructor.kt.after +++ b/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterPrimaryConstructor.kt.after @@ -31,9 +31,9 @@ fun baz(f: (Int, Boolean) -> String) { class Baz1(f: (Int, Boolean) -> String) : Foo({ i -> f(i, this) }) class Baz2 : Foo({ i -> (::g)(i, this) }) -val f = lambda() +val f1 = lambda() -class Baz3 : Foo({ i -> f(i, this) }) +class Baz3 : Foo({ i -> f1(i, this) }) class Baz4 : Foo({ i -> "${i + 1} ${this}" }) class Baz5 : Foo { diff --git a/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterSecondaryConstructor.kt.after b/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterSecondaryConstructor.kt.after index c0e9021425f..fc22b0fca5f 100644 --- a/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterSecondaryConstructor.kt.after +++ b/idea/testData/intentions/convertFunctionTypeParameterToReceiver/nonFirstParameterSecondaryConstructor.kt.after @@ -31,9 +31,9 @@ fun baz(f: (Int, Boolean) -> String) { class Baz1(f: (Int, Boolean) -> String) : Foo({ i -> f(i, this) }) class Baz2 : Foo({ i -> (::g)(i, this) }) -val f = lambda() +val f1 = lambda() -class Baz3 : Foo({ i -> f(i, this) }) +class Baz3 : Foo({ i -> f1(i, this) }) class Baz4 : Foo({ i -> "${i + 1} ${this}" }) class Baz5 : Foo {