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

IDEA-224244 Bad suggestions for fully qualified class in javadoc link

Browse Source 
GitOrigin-RevId: c77934e1d79b7ea12e90bd01db5ddfc1d0912a87
This commit is contained in:
peter
2019-10-10 12:34:43 +00:00
committed by intellij-monorepo-bot
parent 053c9c954d
commit b76ef269a4
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
+21 -5
View File
@@ -226,11 +226,13 @@ public class JavaDocCompletionContributor extends CompletionContributor {
PsiElement position) {
PrefixMatcher matcher = result.getPrefixMatcher();
int prefixStart = parameters.getOffset() - matcher.getPrefix().length() - position.getTextRange().getStartOffset();
if (prefixStart > 0 && position.getText().charAt(prefixStart - 1) == '#') {
String text = position.getText();
if (prefixStart > 0 && text.charAt(prefixStart - 1) == '#') {
int classNameStart = findClassNameStart(text, prefixStart - 1);
String mockCommentPrefix = "/** {@link ";
String mockText = mockCommentPrefix + position.getText().substring(prefixStart - 1) + "}*/";
String mockText = mockCommentPrefix + text.substring(classNameStart) + "}*/";
PsiDocComment mockComment = JavaPsiFacade.getElementFactory(position.getProject()).createDocCommentFromText(mockText, position);
PsiJavaReference ref = (PsiJavaReference)mockComment.findReferenceAt(mockCommentPrefix.length() + 1);
PsiJavaReference ref = (PsiJavaReference)mockComment.findReferenceAt(mockCommentPrefix.length() + prefixStart - classNameStart);
assert ref != null : mockText;
for (LookupElement element : completeJavadocReference(ref.getElement(), ref)) {
result.addElement(LookupElementDecorator.withInsertHandler(element, wrapIntoLinkTag((context, item) -> element.handleInsert(context))));
@@ -243,6 +245,18 @@ public class JavaDocCompletionContributor extends CompletionContributor {
}
}
private static int findClassNameStart(CharSequence text, int sharpOffset) {
int offset = sharpOffset;
while (offset > 0 && isQualifiedNamePart(text.charAt(offset - 1))) {
offset--;
}
return offset;
}
private static boolean isQualifiedNamePart(char c) {
return c == '.' || Character.isJavaIdentifierPart(c);
}
@NotNull
private static <T extends LookupElement> InsertHandler<T> wrapIntoLinkTag(InsertHandler<T> delegate) {
return (context, item) -> {
@@ -250,9 +264,11 @@ public class JavaDocCompletionContributor extends CompletionContributor {
String link = "{@link ";
int startOffset = context.getStartOffset();
int sharpLength = document.getCharsSequence().charAt(startOffset - 1) == '#' ? 1 : 0;
int qualifierStart = document.getCharsSequence().charAt(startOffset - 1) == '#'
? findClassNameStart(document.getCharsSequence(), startOffset - 1)
: startOffset;
document.insertString(startOffset - sharpLength, link);
document.insertString(qualifierStart, link);
document.insertString(context.getTailOffset(), "}");
context.setTailOffset(context.getTailOffset() - 1);
context.getOffsetMap().addOffset(CompletionInitializationContext.START_OFFSET, startOffset + link.length());
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/JavadocCompletionTest.groovy
+7
View File
@@ -671,6 +671,13 @@ class Foo {
assert !TemplateManagerImpl.getTemplateState(myFixture.editor)
}
void "test insert link to method in a q-named class"() {
myFixture.configureByText 'a.java', "/** a. java.io.File#liFi<caret> */ interface Foo {}"
myFixture.completeBasic()
myFixture.type('\n')
myFixture.checkResult "import java.io.File;\n\n/** a. {@link File#listFiles()} */ interface Foo {}"
}
void "test insert link to field"() {
myFixture.configureByText 'a.java', "/** a. #fo<caret> */ interface Foo { int foo; }}"
myFixture.completeBasic()