From 7f13fd996d64d025e4bf19dd17df99a865d5bc89 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 12 Feb 2024 10:44:46 +0100 Subject: [PATCH] update jdt.core to 3.36.0 in order to get early Java21 support --- headless-services/spring-boot-language-server/pom.xml | 2 +- .../boot/java/handlers/BootJavaReferencesHandler.java | 4 ++-- .../ide/vscode/boot/java/utils/CompilationUnitCache.java | 6 +++--- .../ide/vscode/boot/java/utils/SpringIndexerJava.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index 7c3eff2f6..b12de4e70 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -15,7 +15,7 @@ ${project.version} - 3.33.0 + 3.36.0 0.24.0 diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java index 2abb9517c..24dd939f1 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java @@ -83,9 +83,9 @@ public class BootJavaReferencesHandler implements ReferencesHandler { } private List provideReferences(CancelChecker cancelToken, TextDocument document, int offset) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS19); + ASTParser parser = ASTParser.newParser(AST.JLS21); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_19, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_21, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java index c794458b0..a99deea8f 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java @@ -270,7 +270,7 @@ public final class CompilationUnitCache implements DocumentContentProvider { private static CompilationUnit parse2(char[] source, String docURI, String unitName, List classpaths, INameEnvironmentWithProgress environment) throws Exception { Map options = JavaCore.getOptions(); - String apiLevel = JavaCore.VERSION_19; + String apiLevel = JavaCore.VERSION_21; JavaCore.setComplianceOptions(apiLevel, options); if (environment == null) { environment = CUResolver.createLookupEnvironment(classpaths.toArray(new Classpath[classpaths.size()])); @@ -291,13 +291,13 @@ public final class CompilationUnitCache implements DocumentContentProvider { needToResolveBindings = false; } - CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS19, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); + CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS21, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); return cu; } private static List createClasspath(String[] classpathEntries) { - ASTParser parser = ASTParser.newParser(AST.JLS19); + ASTParser parser = ASTParser.newParser(AST.JLS21); String[] sourceEntries = new String[] {}; parser.setEnvironment(classpathEntries, sourceEntries, null, false); return CUResolver.getClasspath(parser); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java index d274c641b..738b5cbaa 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java @@ -764,9 +764,9 @@ public class SpringIndexerJava implements SpringIndexer { String[] classpathEntries = getClasspathEntries(project); String[] sourceEntries = getSourceEntries(project); - ASTParser parser = ASTParser.newParser(AST.JLS19); + ASTParser parser = ASTParser.newParser(AST.JLS21); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_19, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_21, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);