Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update jdt.core version to the latest one, including support for jdk16

Browse Source
This commit is contained in:
Martin Lippert
2021-07-02 09:57:11 +02:00
parent 8de63a25a1
commit c2e369e7fe
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/spring-boot-language-server/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<dependencies.version>${project.version}</dependencies.version>
<jdt.core.version>3.25.0</jdt.core.version>
<jdt.core.version>3.26.0</jdt.core.version>
<lsp4xml.version>0.13.1</lsp4xml.version>
</properties>

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java
View File

@@ -83,9 +83,9 @@ public class BootJavaReferencesHandler implements ReferencesHandler {
}
private List<? extends Location> provideReferences(CancelChecker cancelToken, TextDocument document, int offset) throws Exception {
ASTParser parser = ASTParser.newParser(AST.JLS15);
ASTParser parser = ASTParser.newParser(AST.JLS16);
Map<String, String> 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);

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
View File

@@ -217,7 +217,7 @@ public final class CompilationUnitCache implements DocumentContentProvider {
private static CompilationUnit parse2(char[] source, String docURI, String unitName, List<Classpath> classpaths, INameEnvironmentWithProgress environment) throws Exception {
Map<String, String> 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<Classpath> 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);

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

@@ -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<String, String> 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);