Skip to content

Update TP to 4.22-I-builds/I20211010-1800 #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2021
Merged

Update TP to 4.22-I-builds/I20211010-1800 #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20210921-1800/"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211010-1800/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
Expand Down
16 changes: 8 additions & 8 deletions ....jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/SignatureHelpHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ public void testSignatureHelp_singleMethod() throws JavaModelException {

SignatureHelp help = getSignatureHelp(cu, 4, 39);
assertNotNull(help);
assertEquals(13, help.getSignatures().size());
assertEquals(1, help.getSignatures().size());
assertEquals("foo(String s) : int", help.getSignatures().get(help.getActiveSignature()).getLabel());
assertTrue(help.getSignatures().get(help.getActiveSignature()).getDocumentation().getLeft().length() > 0);
assertEquals((Integer) 0, help.getActiveParameter());
}

@Test
public void testSignatureHelp_multipeMethod() throws JavaModelException {
public void testSignatureHelp_multipleMethods() throws JavaModelException {
IPackageFragment pack1 = sourceFolder.createPackageFragment("test1", false, null);
StringBuilder buf = new StringBuilder();
buf.append("package test1;\n");
Expand All @@ -112,7 +112,7 @@ public void testSignatureHelp_multipeMethod() throws JavaModelException {

SignatureHelp help = getSignatureHelp(cu, 5, 42);
assertNotNull(help);
assertEquals(15, help.getSignatures().size());
assertEquals(3, help.getSignatures().size());
assertEquals((Integer) 1, help.getActiveParameter());
assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(int s, String s) : int");
}
Expand Down Expand Up @@ -167,7 +167,7 @@ public void testSignatureHelp_parameters() throws JavaModelException {
ICompilationUnit cu = pack1.createCompilationUnit("E.java", buf.toString(), false, null);
SignatureHelp help = getSignatureHelp(cu, 3, 12);
assertNotNull(help);
assertEquals(14, help.getSignatures().size());
assertEquals(2, help.getSignatures().size());
assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(String s, boolean bar) : void");
}

Expand All @@ -187,7 +187,7 @@ public void testSignatureHelp_activeSignature() throws JavaModelException {
ICompilationUnit cu = pack1.createCompilationUnit("E.java", buf.toString(), false, null);
SignatureHelp help = getSignatureHelp(cu, 3, 12);
assertNotNull(help);
assertEquals(15, help.getSignatures().size());
assertEquals(3, help.getSignatures().size());
assertEquals(help.getSignatures().get(help.getActiveSignature()).getLabel(), "foo(String s, String b) : void");
}

Expand Down Expand Up @@ -325,7 +325,7 @@ public void testSignatureHelp_varargs() throws JavaModelException {
assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().startsWith("asList(T... "));
help = getSignatureHelp(cu, 5, 19);
assertNotNull(help);
assertEquals(2, help.getSignatures().size());
assertEquals(1, help.getSignatures().size());
assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("demo(String s, String... s2) : void"));
}

Expand All @@ -336,7 +336,7 @@ public void testSignatureHelp_varargs2() throws JavaModelException {
ICompilationUnit cu = type.getCompilationUnit();
SignatureHelp help = getSignatureHelp(cu, 4, 16);
assertNotNull(help);
assertEquals(3, help.getSignatures().size());
assertEquals(2, help.getSignatures().size());
assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("run(Class<?> clazz, String... args) : void"));
}

Expand All @@ -347,7 +347,7 @@ public void testSignatureHelp_lambda() throws JavaModelException {
ICompilationUnit cu = type.getCompilationUnit();
SignatureHelp help = getSignatureHelp(cu, 8, 14);
assertNotNull(help);
assertEquals(12, help.getSignatures().size());
assertEquals(1, help.getSignatures().size());
assertTrue(help.getSignatures().get(help.getActiveSignature()).getLabel().equals("test(Function<String,String> f) : void"));
}

Expand Down