From c2e369e7fead28d5b6ed248a159326e196ddc56e Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 2 Jul 2021 09:57:11 +0200 Subject: [PATCH] update jdt.core version to the latest one, including support for jdk16 --- 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 9659b2183..460df67f7 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.25.0 + 3.26.0 0.13.1 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 30e637f47..289fd3bcd 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.JLS15); + ASTParser parser = ASTParser.newParser(AST.JLS16); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_15, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_16, 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 c22ca7514..f5417627d 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 @@ -217,7 +217,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_15; + String apiLevel = JavaCore.VERSION_16; JavaCore.setComplianceOptions(apiLevel, options); if (environment == null) { environment = CUResolver.createLookupEnvironment(classpaths.toArray(new Classpath[classpaths.size()])); @@ -238,13 +238,13 @@ public final class CompilationUnitCache implements DocumentContentProvider { needToResolveBindings = false; } - CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS15, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); + CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS16, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); return cu; } private static List createClasspath(String[] classpathEntries) { - ASTParser parser = ASTParser.newParser(AST.JLS15); + ASTParser parser = ASTParser.newParser(AST.JLS16); 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 cd0100a05..652fd6ad5 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 @@ -517,9 +517,9 @@ public class SpringIndexerJava implements SpringIndexer { String[] classpathEntries = getClasspathEntries(project); String[] sourceEntries = getSourceEntries(project); - ASTParser parser = ASTParser.newParser(AST.JLS15); + ASTParser parser = ASTParser.newParser(AST.JLS16); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_15, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_16, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);