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

GH-1560: avoid duplicate property keys in completion proposala

Browse Source 
Fixes GH-1560
This commit is contained in:
Martin Lippert
2025-05-14 11:54:16 +02:00
parent a65c4f8ab1
commit 607f072238
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnPropertyCompletionProcessor.java
View File

@@ -12,6 +12,7 @@ package org.springframework.ide.vscode.boot.java.conditionals;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -66,10 +67,11 @@ public class ConditionalOnPropertyCompletionProcessor implements AnnotationAttri
private List<AnnotationAttributeProposal> findProperties(IJavaProject project, String prefix) {
List<AnnotationAttributeProposal> result = new ArrayList<>();
Set<String> propertyKeys = new HashSet<>();
// First the 'real' properties, Then also add 'ad-hoc' properties
addPropertyProposals(indexProvider.getIndex(project).getProperties(), prefix, result);
addPropertyProposals(adHocIndexProvider.getIndex(project), prefix, result);
addPropertyProposals(indexProvider.getIndex(project).getProperties(), prefix, result, propertyKeys);
addPropertyProposals(adHocIndexProvider.getIndex(project), prefix, result, propertyKeys);
result.sort((p1, p2) -> p1.getLabel().compareTo(p2.getLabel()));
@@ -86,9 +88,14 @@ public class ConditionalOnPropertyCompletionProcessor implements AnnotationAttri
return new ArrayList<>(prefixes);
}
private void addPropertyProposals(FuzzyMap<PropertyInfo> properties, String prefix, List<AnnotationAttributeProposal> result) {
private void addPropertyProposals(FuzzyMap<PropertyInfo> properties, String prefix, List<AnnotationAttributeProposal> result, Set<String> propertyKeys) {
properties.forEach(propertyInfo -> {
String propID = propertyInfo.getId();
// avoid duplicate property keys
if (!propertyKeys.add(propID)) {
return;
}
if (prefix != null) {
if (prefix.length() > 0

25
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyCompletionTest.java
View File

@@ -147,6 +147,31 @@ public class ConditionalOnPropertyCompletionTest {
assertEquals("spring.boot.prop1", completions.get(2).getLabel());
}
@Test
public void testConditionalOnPropertyCompletionWithAdhocProperties() throws Exception {
adHocProperties.add("adhoc.prop");
List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(<*>)");
assertEquals(4, completions.size());
assertEquals("adhoc.prop", completions.get(0).getLabel());
assertEquals("data.prop2", completions.get(1).getLabel());
assertEquals("else.prop3", completions.get(2).getLabel());
assertEquals("spring.boot.prop1", completions.get(3).getLabel());
}
@Test
public void testConditionalOnPropertyCompletionWithAdhocPropertiesDuplicatedKey() throws Exception {
adHocProperties.add("data.prop2");
List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(<*>)");
assertEquals(3, completions.size());
assertEquals("data.prop2", completions.get(0).getLabel());
assertEquals("else.prop3", completions.get(1).getLabel());
assertEquals("spring.boot.prop1", completions.get(2).getLabel());
}
@Test
public void testConditionalOnPropertyCompletionWithoutPrefixAttributeWithNameAttribute() throws Exception {
List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(name=<*>)");