diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java index bbe26ffc0041..4fe09b22231d 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java @@ -401,6 +401,14 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori } } } + + @Override + public void visitReferenceElement(PsiJavaCodeReferenceElement reference) { + super.visitReferenceElement(reference); + if (reference.resolve() == mySuperClass && PsiTreeUtil.getParentOfType(reference, PsiComment.class) != null) { + replacementMap.put(new UsageInfo(reference), elementFactory.createClassReferenceElement(targetClass)); + } + } }); } try { diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/after/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/after/Test.java new file mode 100644 index 000000000000..aa81bfcfcbdc --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/after/Test.java @@ -0,0 +1,6 @@ +interface Test { + /** + * {@link Test} + */ + void m(); +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Super.java b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Super.java new file mode 100644 index 000000000000..d68dcc7f1f50 --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Super.java @@ -0,0 +1,6 @@ +interface Super { + /** + * {@link Super} + */ + void m(); +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Test.java new file mode 100644 index 000000000000..92ff974a972c --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineSuperClass/inlineClassUsedInJavadocLink/before/Test.java @@ -0,0 +1 @@ +interface Test extends Super {} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java index 59b8ca4a981d..592061133d21 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java @@ -67,6 +67,7 @@ public class InlineSuperClassTest extends MultiFileTestCase { public void testMultipleSubclasses() { doTestMultipleSubclasses(); } public void testMultipleSubstitutions() { doTestMultipleSubclasses(); } public void testMultipleSubclassesInheritsOneBaseBase() { doTestMultipleSubclasses(); } + public void testInlineClassUsedInJavadocLink() { doTest(); } public void testInlineSuperclassExtendsList() { doTest(); } public void testInterfaceHierarchyWithSubstitution() { doTest(); } public void testTypeParameterBound() { doTest();}