MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

preserve javadoc refs during inplace rename (IDEA-85817)

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-15 15:05:01 +04:00
parent 7ca6a15de8
commit dde04a403d
9 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
View File

@@ -220,6 +220,7 @@ public class JavaDocCompletionContributor extends CompletionContributor {
if (context.getCompletionChar() == Lookup.REPLACE_SELECT_CHAR) {
final PsiDocTagValue valueElement = tag.getValueElement();
endOffset = valueElement.getTextRange().getEndOffset();
context.setTailOffset(endOffset);
}
editor.getDocument().deleteString(afterSharp, endOffset);
editor.getCaretModel().moveToOffset(signatureOffset);

12
java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
View File

@@ -381,18 +381,6 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
if (nextSibling != null) {
final int startOffset = nextSibling.getTextRange().getStartOffset() - getTextRange().getStartOffset();
int endOffset = nextSibling.getTextRange().getEndOffset() - getTextRange().getStartOffset();
final PsiElement nextParSibling = nextSibling.getNextSibling();
if (nextParSibling != null && "(".equals(nextParSibling.getText())) {
endOffset++;
PsiElement nextElement = nextParSibling.getNextSibling();
if (nextElement != null && SourceTreeToPsiMap.psiToTreeNotNull(nextElement).getElementType() == DOC_TAG_VALUE_TOKEN) {
endOffset += nextElement.getTextLength();
nextElement = nextElement.getNextSibling();
}
if (nextElement != null && ")".equals(nextElement.getText())) {
endOffset++;
}
}
return new TextRange(startOffset, endOffset);
}
return new TextRange(getTextLength(), getTextLength());

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkFromInnerClassToSelfMethod.java
View File

@@ -2,7 +2,7 @@ class Test {
public void i(int ppp) {}
/**
* {@link #<error>foo(int)</error>}
* {@link #<error descr="Cannot resolve symbol 'foo(int)'">foo</error>(int)}
* {@link #foo()}
* {@link #i(int)}
*/

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See3.java
View File

@@ -1,6 +1,6 @@
class Test {
/**
* @see #<error>perform(int)</error>
* @see #<error descr="Cannot resolve symbol 'perform(int)'">perform</error>(int)
*/
public void i() {}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java
View File

@@ -1,7 +1,7 @@
public class Test {
/**
* @see Test#test(String, int...)
* @see Test#<error>test(String, long...)</error>
* @see Test#<error descr="Cannot resolve symbol 'test(String, long...)'">test</error>(String, long...)
**/
void foo() {}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/resolve/pkg/See1.java
View File

@@ -1,10 +1,10 @@
package pkg;
/**
* @see #<error descr="Cannot resolve symbol 'method(B1.C)'">method(B1.C)</error>
* @see #<error descr="Cannot resolve symbol 'method(B1.C[][])'">method(B1.C[][])</error>
* @see #<error descr="Cannot resolve symbol 'method(B1.C..)'">method(<error descr="Cannot resolve symbol 'B1.C.'">B1.C.</error>.)</error>
* @see #<error descr="Cannot resolve symbol 'method(B1.C[)'">method(B1.C[)</error>
* @see #<error descr="Cannot resolve symbol 'method(B1.C)'">method</error>(B1.C)
* @see #<error descr="Cannot resolve symbol 'method(B1.C[][])'">method</error>(B1.C[][])
* @see #<error descr="Cannot resolve symbol 'method(B1.C..)'">method</error>(<error descr="Cannot resolve symbol 'B1.C.'">B1.C.</error>.)
* @see #<error descr="Cannot resolve symbol 'method(B1.C[)'">method</error>(B1.C[)
*/
class A1 {
public void method(B1.C[] c) { }

11
java/java-tests/testData/refactoring/renameInplace/MethodWithJavadocRef.java Normal file
View File

@@ -0,0 +1,11 @@
public class RefactorBug {
public static void som<caret>ething(int a, float b) {
}
/**
* @see #something(int, float)
*/
public static void somethingElse() {
}
}

11
java/java-tests/testData/refactoring/renameInplace/MethodWithJavadocRef_after.java Normal file
View File

@@ -0,0 +1,11 @@
public class RefactorBug {
public static void bar(int a, float b) {
}
/**
* @see #bar(int, float)
*/
public static void somethingElse() {
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java
View File

@@ -53,6 +53,10 @@ public class RenameMembersInplaceTest extends LightCodeInsightTestCase {
public void testClassWithMultipleConstructors() throws Exception {
doTestInplaceRename("Bar");
}
public void testMethodWithJavadocRef() throws Exception {
doTestInplaceRename("bar");
}
public void testConflictingMethodName() throws Exception {
try {