Improve fix

- add more tests - update target to include latest jdt.core array completion fixes.
eclipse-jdtls · May 13, 2023 · 9122909 · 9122909
1 parent 89b76aa
commit 9122909
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -29,7 +29,7 @@
  <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
  <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
  <unit id="org.mockito.mockito-core" version="0.0.0"/>
- <repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230416-0550/"/>
+ <repository location="https://download.eclipse.org/eclipse/updates/4.28-I-builds/I20230511-1800/"/>
  </location>
  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
  <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>

diff --git a/...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandlerTest.java b/...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandlerTest.java
@@ -3546,7 +3546,7 @@ void f() {
  }
 
  @Test
- public void testCompletion_forArrayTypeReceivers() throws Exception {
+ public void testCompletion_forNonPrimitiveArrayTypeReceivers() throws Exception {
  ICompilationUnit unit = getWorkingCopy("src/java/Arr.java", """
  public class Arr {
  void foo() {
@@ -3561,6 +3561,38 @@ void foo() {
  assertEquals("Array type completion Label", "String[] - java.lang", completionItem.getLabel());
  }
 
+ @Test
+ public void testCompletion_forPrimitiveArrayTypeReceivers() throws Exception {
+ ICompilationUnit unit = getWorkingCopy("src/java/Arr.java", """
+ public class Arr {
+ void foo() {
+ int[] ages = new i
+ }
+ }
+ """);
+
+ CompletionList list = requestCompletions(unit, "new ");
+ CompletionItem completionItem = list.getItems().get(0);
+ assertEquals("Array type completion EditText", "int[]", completionItem.getInsertText());
+ assertEquals("Array type completion Label", "int[]", completionItem.getLabel());
+ }
+
+ @Test
+ public void testCompletion_forEnclosingTypeArrayTypeReceivers() throws Exception {
+ ICompilationUnit unit = getWorkingCopy("src/java/Arr.java", """
+ public class Arr {
+ void foo() {
+ Arr[] ages = new A
+ }
+ }
+ """);
+
+ CompletionList list = requestCompletions(unit, "new ");
+ CompletionItem completionItem = list.getItems().get(0);
+ assertEquals("Array type completion EditText", "Arr[]", completionItem.getInsertText());
+ assertEquals("Array type completion Label", "Arr[] - java", completionItem.getLabel());
+ }
+
  private CompletionList requestCompletions(ICompilationUnit unit, String completeBehind) throws JavaModelException {
  return requestCompletions(unit, completeBehind, 0);
  }