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

IDEA-167473 'Quick Documentation' doesn't work on a method call if there are several applicable overloads

Browse Source
This commit is contained in:
Dmitry Batrak
2017-02-02 19:34:05 +03:00
parent 4748ad3174
commit 42660e4ae7
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
+6 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -506,8 +506,11 @@ public class JavaDocumentationProvider extends DocumentationProviderEx implement
@Override
public String generateDoc(PsiElement element, PsiElement originalElement) {
if (element instanceof PsiExpressionList) {
element = element.getParent(); // for new Class(<caret>) or methodCall(<caret>) proceed from method call or new expression
// for new Class(<caret>) or methodCall(<caret>) proceed from method call or new expression
// same for new Cl<caret>ass() or method<caret>Call()
if (element instanceof PsiExpressionList ||
element instanceof PsiReferenceExpression && element.getParent() instanceof PsiMethodCallExpression) {
element = element.getParent();
originalElement = null;
}
if (element instanceof PsiMethodCallExpression) {
java/java-tests/testSrc/com/intellij/codeInsight/JavaDocumentationTest.groovy
+21 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -231,6 +231,26 @@ class Bar {
assert doc == expected
}
void "test at method name with overloads"() {
def input = """\
class Foo {
void foo(String s) {
s.region<caret>Matches()
}
}""".stripIndent()
def actual = JavaExternalDocumentationTest.getDocumentationText(myFixture.project, input)
def expected =
"<html>Candidates for method call <b>s.regionMatches()</b> are:<br>" +
"<br>" +
"&nbsp;&nbsp;<a href=\"psi_element://java.lang.String#regionMatches(int, java.lang.String, int, int)\">boolean regionMatches(int, String, int, int)</a><br>" +
"&nbsp;&nbsp;<a href=\"psi_element://java.lang.String#regionMatches(boolean, int, java.lang.String, int, int)\">boolean regionMatches(boolean, int, String, int, int)</a><br>" +
"</html>"
assert actual == expected
}
private void configure(String text) {
myFixture.configureByText 'a.java', text
}
java/java-tests/testSrc/com/intellij/codeInsight/JavaExternalDocumentationTest.java
+6 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -150,12 +150,16 @@ public class JavaExternalDocumentationTest extends PlatformTestCase {
}
private String getDocumentationText(String sourceEditorText) throws Exception {
return getDocumentationText(myProject, sourceEditorText);
}
public static String getDocumentationText(Project project, String sourceEditorText) throws Exception {
int caretPosition = sourceEditorText.indexOf(EditorTestUtil.CARET_TAG);
if (caretPosition >= 0) {
sourceEditorText = sourceEditorText.substring(0, caretPosition) +
sourceEditorText.substring(caretPosition + EditorTestUtil.CARET_TAG.length());
}
PsiFile psiFile = PsiFileFactory.getInstance(myProject).createFileFromText(JavaLanguage.INSTANCE, sourceEditorText);
PsiFile psiFile = PsiFileFactory.getInstance(project).createFileFromText(JavaLanguage.INSTANCE, sourceEditorText);
return getDocumentationText(psiFile, caretPosition);
}