Compliance level for Java source parsing during indexing

Author: BoykoAlex

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

@@ -34,11 +34,11 @@ public class ASTParserCleanupEnabled {
 
 	private final AnnotationHierarchies annotationHierachies;
 
-	public ASTParserCleanupEnabled(String[] classpathEntries, String[] sourceEntries, AnnotationHierarchies annotationHierarchies, boolean ignoreMethodBodies) {
+	public ASTParserCleanupEnabled(String[] classpathEntries, String[] sourceEntries, String complianceVersion, AnnotationHierarchies annotationHierarchies, boolean ignoreMethodBodies) {
 		this.annotationHierachies = annotationHierarchies; 
 		parser = ASTParser.newParser(AST.JLS21);
 		options = JavaCore.getOptions();
-		JavaCore.setComplianceOptions(JavaCore.VERSION_21, options);
+		JavaCore.setComplianceOptions(complianceVersion, options);
 
 		parser.setCompilerOptions(options);
 		parser.setKind(ASTParser.K_COMPILATION_UNIT);

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

@@ -36,6 +36,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
@@ -563,36 +564,38 @@ private String[] scanFiles(IJavaProject project, AnnotationHierarchies annotatio
 		PercentageProgressTask progressTask = this.progressService.createPercentageProgressTask(INDEX_FILES_TASK_ID + project.getElementName(),
 				javaFiles.length, "Spring Tools: Indexing Java Sources for '" + project.getElementName() + "'");
 
-		try {
-			List<String> nextPassFiles = new ArrayList<>();
-			final boolean ignoreMethodBodies = SCAN_PASS.ONE.equals(pass);
-	
-			FileASTRequestor requestor = new FileASTRequestor() {
+		List<String> nextPassFiles = new ArrayList<>();
+		final boolean ignoreMethodBodies = SCAN_PASS.ONE.equals(pass);
 
-				@Override
-				public void acceptAST(String sourceFilePath, CompilationUnit cu) {
-					File file = new File(sourceFilePath);
-					String docURI = UriUtil.toUri(file).toASCIIString();
-					long lastModified = file.lastModified();
-					AtomicReference<TextDocument> docRef = new AtomicReference<>();
-	
-					IProblemCollector problemCollector = problemCollectorCreator.apply(docRef, diagnosticsAggregator);
+		FileASTRequestor requestor = new FileASTRequestor() {
 
-					SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, sourceFilePath,
-							lastModified, docRef, null, generatedSymbols, generatedBeans, problemCollector, pass, nextPassFiles, !ignoreMethodBodies);
-	
-					scanAST(context, true);
-					progressTask.increment();
-				}
-			};
-	
-			ASTParserCleanupEnabled parser = createParser(project, annotations, ignoreMethodBodies);
-			parser.createASTs(javaFiles, null, new String[0], requestor, null);
-			parser.cleanup();
+			@Override
+			public void acceptAST(String sourceFilePath, CompilationUnit cu) {
+				File file = new File(sourceFilePath);
+				String docURI = UriUtil.toUri(file).toASCIIString();
+				long lastModified = file.lastModified();
+				AtomicReference<TextDocument> docRef = new AtomicReference<>();
+
+				IProblemCollector problemCollector = problemCollectorCreator.apply(docRef, diagnosticsAggregator);
+
+				SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, sourceFilePath,
+						lastModified, docRef, null, generatedSymbols, generatedBeans, problemCollector, pass, nextPassFiles, !ignoreMethodBodies);
+
+				scanAST(context, true);
+				progressTask.increment();
+			}
+		};
 
+		ASTParserCleanupEnabled parser = createParser(project, annotations, ignoreMethodBodies);
+		try {
+			parser.createASTs(javaFiles, null, new String[0], requestor, null);
 			return (String[]) nextPassFiles.toArray(new String[nextPassFiles.size()]);
+		} catch (Throwable t) {
+			log.error("Failed to index project '%s'".formatted(project.getElementName()), t);
+			return new String[0];
 		}
 		finally {
+			parser.cleanup();
 			progressTask.done();
 		}
 	}
@@ -803,8 +806,14 @@ private boolean isJakartaAnnotationWithDefaultSymbol(String qualifiedName) {
 	public static ASTParserCleanupEnabled createParser(IJavaProject project, AnnotationHierarchies annotationHierarchies, boolean ignoreMethodBodies) throws Exception {
 		String[] classpathEntries = getClasspathEntries(project);
 		String[] sourceEntries = getSourceEntries(project);
+		String complianceJavaVersion = getComplianceJavaVersion(project.getClasspath().getJavaVersion());
 
-		return new ASTParserCleanupEnabled(classpathEntries, sourceEntries, annotationHierarchies, ignoreMethodBodies);
+		return new ASTParserCleanupEnabled(classpathEntries, sourceEntries, complianceJavaVersion, annotationHierarchies, ignoreMethodBodies);
+	}
+
+	private static String getComplianceJavaVersion(String javaVersion) {
+		// Currently the java version in the classpath seems to be 1.8, 17, 21 etc.
+		return javaVersion == null || javaVersion.isBlank() ? JavaCore.VERSION_21 : javaVersion;
 	}
 
 	private static String[] getClasspathEntries(IJavaProject project) throws Exception {