MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 06:11:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: Fixed completion of overloaded method parameters in getDeclaredMethod("methodName", ...) (IDEA-171721)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-04-25 14:41:26 +03:00
parent 5349c37432
commit e8dabd42ff
8 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/completion/reflectionOverload/OverloadedMethodPrefix.java
+11
View File
@@ -0,0 +1,11 @@
class Main {
void foo() {
Test.class.getDeclaredMethod("foo<caret>");
}
}
class Test {
public void foo(){}
public void foo(int n){}
public void foo(String s){}
}
java/java-tests/testData/codeInsight/completion/reflectionOverload/OverloadedMethodPrefix_after.java
+11
View File
@@ -0,0 +1,11 @@
class Main {
void foo() {
Test.class.getDeclaredMethod("foo", String.class);
}
}
class Test {
public void foo(){}
public void foo(int n){}
public void foo(String s){}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaReflectionCompletionOverloadTest.kt
+21 -18
View File
@@ -25,37 +25,40 @@ class JavaReflectionCompletionOverloadTest : LightFixtureCompletionTestCase() {
override fun getBasePath() = JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/completion/reflectionOverload/"
fun testOverloadMethods() = doTest(2,
"method()", "method(C c)", "method(A a,B b)",
"equals(java.lang.Object obj)")
"method()", "method(C)", "method(A, B)",
"equals(Object)")
fun testJavaLangObjectMethods() = doTest(6,
fun testJavaLangObjectMethods() = doTest(5,
"method()",
"equals(java.lang.Object obj)", "hashCode()", "toString()",
"getClass()", "notify()", "notifyAll()",
"wait()", "wait(long timeout)", "wait(long timeout,int nanos)"
"equals(Object)", "getClass()", "hashCode()",
"notify()", "notifyAll()", "toString()",
"wait()", "wait(long)", "wait(long, int)"
)
fun testJavaLangObjectOwnMethods() = doTest(9,
"clone()", "equals(java.lang.Object obj)", "hashCode()",
"toString()", "finalize()", "getClass()",
"notify()", "notifyAll()",
"wait()", "wait(long timeout)", "wait(long timeout,int nanos)")
fun testJavaLangObjectOwnMethods() = doTest(10,
"clone()", "equals(Object)",
"finalize()", "getClass()", "hashCode()",
"notify()", "notifyAll()", "registerNatives()", "toString()",
"wait()", "wait(long)", "wait(long, int)")
fun testOverriddenMethod() = doTest(2,
"gpMethod(A a,B b)", "method()", "pMethod(C c)",
"equals(java.lang.Object obj)")
"gpMethod(A, B)", "method()", "pMethod(C)",
"equals(Object)")
fun testShadowedMethod() = doTest(0,
"shadowed()",
"equals(java.lang.Object obj)")
"equals(Object)")
fun testOverloadedMethod() = doTest(1,
"overloaded()", "overloaded(int n)",
"equals(java.lang.Object obj)")
"overloaded()", "overloaded(int)",
"equals(Object)")
fun testOverloadedMethodPrefix() = doTest(2,
"foo()", "foo(int)", "foo(String)")
fun testOverloadedInheritedMethod() = doTest(1,
"overloaded(int n)", "overloaded(java.lang.String s)",
"equals(java.lang.Object obj)")
"overloaded(int)", "overloaded(String)",
"equals(Object)")
private fun doTest(index: Int, vararg expected: String) {
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaReflectionCompletionTest.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class JavaReflectionCompletionTest extends LightFixtureCompletionTestCase
}
public void testDeclaredMethod() throws Exception {
doTest(2, "method", "method1", "method2", "method0");
doTest(3, "method", "method0", "method1", "method2");
}
public void testDeclaredMethod2() throws Exception {
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaReflectionParametersCompletionTest.kt
+1 -1
View File
@@ -121,7 +121,7 @@ fun lookupFirstItemsTexts(lookupItems: List<LookupElement?>, maxSize: Int): List
else -> {
val presentation = LookupElementPresentation()
it?.renderElement(presentation)
presentation.itemText ?: ""
(presentation.itemText ?: "") + (presentation.tailText ?: "")
}
}
}