From 9849261daedd112b8aa577d24104ffb7174da217 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 11 Oct 2016 11:41:43 +0200 Subject: [PATCH] inline constructor: avoid javadoc references EA-89601 - UOE: InlineMethodProcessor$.inlineUsage --- .../refactoring/inline/InlineMethodProcessor.java | 2 +- .../refactoring/inlineMethod/ChainingConstructor1.java | 3 +++ .../inlineMethod/ChainingConstructor1.java.after | 3 +++ .../intellij/refactoring/inline/InlineMethodTest.java | 10 +++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index 37c292fa0732..bc09d0b41b6f 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -466,7 +466,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { else if (element instanceof PsiEnumConstant) { inlineConstructorCall((PsiEnumConstant) element); } - else { + else if (!(element instanceof PsiDocMethodOrFieldRef)){ GenericInlineHandler.inlineReference(usage, myMethod, myInliners); } } diff --git a/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java b/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java index 2165c6548405..64e1b128617d 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java +++ b/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java @@ -3,6 +3,9 @@ class TestInlineMethod { this(Integer.valueOf(s1, r1), Integer.valueOf(s2, r2)); } + /** + * {@link #TestInlineMethod(String, int, String, int)} + */ public TestInlineMethod(Integer i1, Integer i2) { } diff --git a/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java.after b/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java.after index 4a11b5071d12..f39994238970 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java.after +++ b/java/java-tests/testData/refactoring/inlineMethod/ChainingConstructor1.java.after @@ -1,5 +1,8 @@ class TestInlineMethod { + /** + * {@link #TestInlineMethod(String, int, String, int)} + */ public TestInlineMethod(Integer i1, Integer i2) { } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java index bfb89c443a83..20e7b428f771 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java @@ -107,7 +107,15 @@ public class InlineMethodTest extends LightRefactoringTestCase { public void testChainingConstructor() throws Exception { doTest(); } - public void testChainingConstructor1() throws Exception { doTest(); } + public void testChainingConstructor1() throws Exception { + BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(true); + try { + doTest(); + } + finally { + BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(false); + } + } public void testNestedCall() throws Exception { doTest(); }