From 28aea97b71a01a7743853de3003c9c10f77c030b Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 26 Feb 2021 12:06:15 +0100 Subject: [PATCH] updated java parsing to JLS 15 --- .../boot/java/handlers/BootJavaReferencesHandler.java | 4 ++-- .../ide/vscode/boot/java/utils/CompilationUnitCache.java | 6 +++--- .../ide/vscode/boot/java/utils/SpringIndexerJava.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 bcd601ec8..35de57170 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 @@ -75,9 +75,9 @@ public class BootJavaReferencesHandler implements ReferencesHandler { } private List provideReferences(TextDocument document, int offset) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS14); + ASTParser parser = ASTParser.newParser(AST.JLS15); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_14, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_15, 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 b6b484889..c22ca7514 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_14; + String apiLevel = JavaCore.VERSION_15; 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.JLS14, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); + CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS15, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); return cu; } private static List createClasspath(String[] classpathEntries) { - ASTParser parser = ASTParser.newParser(AST.JLS14); + ASTParser parser = ASTParser.newParser(AST.JLS15); 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 6a7306824..cd0100a05 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.JLS14); + ASTParser parser = ASTParser.newParser(AST.JLS15); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_14, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_15, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);