From ad7a2a2e3918c6fdbc81e7aac065b920ad9b80b7 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 16 Nov 2020 13:09:00 +0100 Subject: [PATCH] update java parser language level --- .../boot/java/handlers/BootJavaReferencesHandler.java | 6 +++--- .../ide/vscode/boot/java/utils/CompilationUnitCache.java | 6 +++--- .../ide/vscode/boot/java/utils/SpringIndexerJava.java | 4 ++-- 3 files changed, 8 insertions(+), 8 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 886868c9a..474dd5b0a 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 Pivotal, Inc. + * Copyright (c) 2017, 2020 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -74,9 +74,9 @@ public class BootJavaReferencesHandler implements ReferencesHandler { } private List provideReferences(TextDocument document, int offset) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS10); + ASTParser parser = ASTParser.newParser(AST.JLS14); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_10, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_14, 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 77ea785ef..16823c289 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2019 Pivotal, Inc. + * Copyright (c) 2017, 2020 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -273,7 +273,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_11; + String apiLevel = JavaCore.VERSION_14; JavaCore.setComplianceOptions(apiLevel, options); if (environment == null) { environment = CUResolver.createLookupEnvironment(classpaths.toArray(new Classpath[classpaths.size()])); @@ -300,7 +300,7 @@ public final class CompilationUnitCache implements DocumentContentProvider { } private static List createClasspath(String[] classpathEntries) { - ASTParser parser = ASTParser.newParser(AST.JLS11); + ASTParser parser = ASTParser.newParser(AST.JLS14); 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 8165f0a94..af1b6840d 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 @@ -506,9 +506,9 @@ public class SpringIndexerJava implements SpringIndexer { String[] classpathEntries = getClasspathEntries(project); String[] sourceEntries = getSourceEntries(project); - ASTParser parser = ASTParser.newParser(AST.JLS11); + ASTParser parser = ASTParser.newParser(AST.JLS14); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_11, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_14, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);