From 24c533df325cbf684cde51fa1c9653f8fd42a300 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 23 Apr 2015 18:13:44 +0300 Subject: [PATCH] KT-6285 Rename refactoring doesn't rename named arguments when rename function parameters or private val/var constructor parameters Just added test. Works automatically since rename parameter now delegates to change signature. #KT-6285 fixed --- .../renameArgumentsWhenParameterRenamed/after/main.kt | 6 ++++++ .../renameArgumentsWhenParameterRenamed/before/main.kt | 6 ++++++ .../renameArgumentsWhenParameterRenamed/parameter.test | 5 +++++ .../kotlin/idea/refactoring/rename/RenameTestGenerated.java | 6 ++++++ 4 files changed, 23 insertions(+) create mode 100644 idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/after/main.kt create mode 100644 idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/before/main.kt create mode 100644 idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test diff --git a/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/after/main.kt b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/after/main.kt new file mode 100644 index 00000000000..94f1a649ede --- /dev/null +++ b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/after/main.kt @@ -0,0 +1,6 @@ +fun foo(/*rename*/aa: Int, b: String) { +} + +fun main(args: Array) { + foo(b = "!", aa = 333) +} diff --git a/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/before/main.kt b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/before/main.kt new file mode 100644 index 00000000000..d294f7df0b0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/before/main.kt @@ -0,0 +1,6 @@ +fun foo(/*rename*/a: Int, b: String) { +} + +fun main(args: Array) { + foo(b = "!", a = 333) +} diff --git a/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test new file mode 100644 index 00000000000..13a6d7a6494 --- /dev/null +++ b/idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test @@ -0,0 +1,5 @@ +{ + "type": "MARKED_ELEMENT", + "newName": "aa", + "mainFile": "main.kt" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index 1df593a52d9..22aee121ab8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -95,6 +95,12 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameArgumentsWhenParameterRenamed/parameter.test") + public void testRenameArgumentsWhenParameterRenamed_Parameter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test"); + doTest(fileName); + } + @TestMetadata("renameCompareTo/compareTo.test") public void testRenameCompareTo_CompareTo() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameCompareTo/compareTo.test");