Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1285: avoid test failures by sorting classpath proposals

Browse Source
This commit is contained in:
Martin Lippert
2024-07-03 21:51:51 +02:00
parent 6a362064d7
commit c9656f5c36
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java
View File

@@ -12,7 +12,9 @@ package org.springframework.ide.vscode.boot.java.value;
import static org.springframework.ide.vscode.commons.util.StringUtil.camelCaseToHyphens;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
@@ -275,6 +277,12 @@ public class ValueCompletionProcessor implements CompletionProvider {
private String[] findResources(IJavaProject project, String prefix) {
String[] resources = IClasspathUtil.getClasspathResources(project.getClasspath()).stream()
.distinct()
.sorted(new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
return Paths.get(o1).compareTo(Paths.get(o2));
}
})
.map(r -> r.replaceAll("\\\\", "/"))
.filter(r -> ("classpath:" + r).contains(prefix))
.toArray(String[]::new);