Fix missing proposal if the prefix starts with "/" for @ContextConfiguration

karthiksms · martinlippert · commit 007ba15da2be · 2024-08-20T10:03:41.000+02:00
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/contextconfiguration/ContextConfigurationProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/contextconfiguration/ContextConfigurationProcessor.java
@@ -169,6 +169,7 @@ public String identifyPropertyPrefix(String nodeContent, int offset) {
     }
 
     private String[] findResources(IJavaProject project, String prefix) {
+        String filteredPrefix = prefix.replaceAll("^/+", "");
         String[] resources = IClasspathUtil.getClasspathResources(project.getClasspath()).stream()
                 .distinct()
                 .sorted(new Comparator<String>() {
@@ -178,7 +179,7 @@ public int compare(String o1, String o2) {
                     }
                 })
                 .map(r -> r.replaceAll("\\\\", "/"))
-                .filter(r -> ("classpath:" + r).contains(prefix))
+                .filter(r -> ("classpath:" + r).contains(filteredPrefix))
                 .toArray(String[]::new);
 
         return resources;
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/contextconfiguration/test/ContextConfigurationCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/contextconfiguration/test/ContextConfigurationCompletionTest.java
@@ -222,7 +222,39 @@ void testComplexResourceNameInPrefixWithinQuotesAndParamNameCompletion() throws
                 "@ContextConfiguration(locations=\"/a-random-resource-root.xml<*>\")");
     }
 
+    @Test
+    void testComplexResourceNameWithSlashPrefixAndWithLocationsAndParamNameCompletion() throws Exception {
+        prepareCase("@ContextConfiguration(\"onClass\")", "@ContextConfiguration(locations=\"/root.xml<*>\")");
+
+        assertClasspathCompletions(
+                "@ContextConfiguration(locations=\"/a-random-resource-root.xml<*>\")");
+    }
+
+    @Test
+    void testComplexResourceNameWithSlashPrefixAndWithValueAndParamNameCompletion() throws Exception {
+        prepareCase("@ContextConfiguration(\"onClass\")", "@ContextConfiguration(value=\"/root.xml<*>\")");
+
+        assertClasspathCompletions(
+                "@ContextConfiguration(value=\"/a-random-resource-root.xml<*>\")");
+    }
 
+    @Test
+    void testComplexResourceNameWithSlashPrefixAndParamNameCompletion() throws Exception {
+        prepareCase("@ContextConfiguration(\"onClass\")", "@ContextConfiguration(\"/root.xml<*>\")");
+
+        assertClasspathCompletions(
+                "@ContextConfiguration(\"/a-random-resource-root.xml<*>\")");
+    }
+
+    @Test
+    void testComplexResourceNameWithSlashPrefixAndDifferentParamNameCompletion() throws Exception {
+        prepareCase("@ContextConfiguration(\"onClass\")", "@ContextConfiguration(locations=\"/random<*>\")");
+
+        assertClasspathCompletions(
+                "@ContextConfiguration(locations=\"/a-random-resource-root.xml<*>\")",
+                "@ContextConfiguration(locations=\"/org/random-resource-org.xml<*>\")",
+                "@ContextConfiguration(locations=\"/org/test/random-resource-org-test.xml<*>\")");
+    }
 
     private void prepareCase(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception {
         InputStream resource = this.getClass().getResourceAsStream("/test-projects/test-annotation-contextconfiguration/src/main/java/org/test/TestContextConfigurationCompletion.java");

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public String identifyPropertyPrefix(String nodeContent, int offset) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`private String[] findResources(IJavaProject project, String prefix) {`
	`172`	`+ String filteredPrefix = prefix.replaceAll("^/+", "");`
`172`	`173`	`String[] resources = IClasspathUtil.getClasspathResources(project.getClasspath()).stream()`
`173`	`174`	`.distinct()`
`174`	`175`	`.sorted(new Comparator<String>() {`
`@@ -178,7 +179,7 @@ public int compare(String o1, String o2) {`
`178`	`179`	`}`
`179`	`180`	`})`
`180`	`181`	`.map(r -> r.replaceAll("\\\\", "/"))`
`181`		`- .filter(r -> ("classpath:" + r).contains(prefix))`
	`182`	`+ .filter(r -> ("classpath:" + r).contains(filteredPrefix))`
`182`	`183`	`.toArray(String[]::new);`
`183`	`184`
`184`	`185`	`return resources;`