From 6f39da37617a8c800cb447ed84a0827601623d2e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 18 May 2015 18:14:07 +0200 Subject: [PATCH] safe delete parameter: typo in javadoc ref composition (IDEA-140384) --- .../refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java | 2 +- .../safeDelete/DeleteParameterAndUpdateJavadocRef.java | 6 ++++++ .../DeleteParameterAndUpdateJavadocRef_after.java | 6 ++++++ .../testSrc/com/intellij/refactoring/SafeDeleteTest.java | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef.java create mode 100644 java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef_after.java diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java index b3d10e606f5f..a57af58e8457 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java @@ -76,7 +76,7 @@ public class JavaSafeDeleteDelegateImpl implements JavaSafeDeleteDelegate { newText.append(StringUtil.join(parameters, new Function() { @Override public String fun(PsiParameter psiParameter) { - return parameter.getType().getCanonicalText(); + return psiParameter.getType().getCanonicalText(); } }, ",")); newText.append(")*/"); diff --git a/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef.java b/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef.java new file mode 100644 index 000000000000..d2db572f1a36 --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef.java @@ -0,0 +1,6 @@ +class Test { + public void abc(Integer arg1, String arg2, Integer arg3) {} + + /** {@link #abc(Integer, String, Integer)} */ + public void def() {} +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef_after.java b/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef_after.java new file mode 100644 index 000000000000..c4703325534a --- /dev/null +++ b/java/java-tests/testData/refactoring/safeDelete/DeleteParameterAndUpdateJavadocRef_after.java @@ -0,0 +1,6 @@ +class Test { + public void abc(Integer arg1, Integer arg3) {} + + /** {@link #abc(Integer, Integer)} */ + public void def() {} +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java index b52048be0b95..98a72b4e989e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java @@ -112,6 +112,10 @@ public class SafeDeleteTest extends MultiFileTestCase { doSingleFileTest(); } + public void testDeleteParameterAndUpdateJavadocRef() throws Exception { + doSingleFileTest(); + } + public void testDeleteConstructorParameterWithAnonymousClassUsage() throws Exception { doSingleFileTest(); }