GH-1458: ignore org.springframework.lang annotations when creating default symbols

Fixed GH-1458

Author: martinlippert

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java

@@ -786,7 +786,9 @@ private WorkspaceSymbol provideDefaultSymbol(Annotation node, final SpringIndexe
 			ITypeBinding type = node.resolveTypeBinding();
 			if (type != null) {
 				String qualifiedName = type.getQualifiedName();
-				if (qualifiedName != null && qualifiedName.startsWith("org.springframework") || isJakartaAnnotationWithDefaultSymbol(qualifiedName)) {
+				if (qualifiedName != null
+						&& ((qualifiedName.startsWith("org.springframework") && !qualifiedName.startsWith("org.springframework.lang"))
+							|| isJakartaAnnotationWithDefaultSymbol(qualifiedName))) {
 					TextDocument doc = DocumentUtils.getTempTextDocument(context.getDocURI(), context.getDocRef(), context.getContent());
 					return DefaultSymbolProvider.provideDefaultSymbol(node, doc);
 				}

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java

@@ -94,7 +94,7 @@ void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception {
         assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test
@@ -153,7 +153,7 @@ void testScanningAllAnnotationsMultiModuleProjectUpfront() throws Exception {
 
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test
@@ -190,7 +190,7 @@ void testUpdateChangedDocument() throws Exception {
         assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test
@@ -251,7 +251,7 @@ void testNewDocumentCreated() throws Exception {
             assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
             docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-            assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+            assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
 
             assertTrue(containsSymbol(allSymbols, "@/created-mapping1", createdDocURI, 6, 1, 6, 36));
             assertTrue(containsSymbol(allSymbols, "@/created-mapping2", createdDocURI, 11, 1, 11, 36));
@@ -286,7 +286,7 @@ void testRemoveSymbolsFromDeletedDocument() throws Exception {
         assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test
@@ -322,7 +322,7 @@ void testRemoveSymbolsFromDeletedFolder() throws Exception {
         assertFalse(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test
@@ -358,7 +358,7 @@ void testAddSymbolsFromCreatedFolder() throws Exception {
         assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
         docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 5, 0, 5, 13));
     }
 
     @Test

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/ClassWithDefaultSymbol.java

@@ -1,7 +1,13 @@
 package org.test;
 
 import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.lang.NonNull;
 
 @Configurable
 public class ClassWithDefaultSymbol {
+	
+	@NonNull
+	public String foo() {
+		return "foo";
+	}
 }