From 378f15dbb203fbe7445e1441ae80fa2aded6c12c Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 8 Aug 2022 21:02:15 +0200 Subject: [PATCH] updated Java language versions --- .../boot/java/handlers/BootJavaReferencesHandler.java | 6 +++--- .../ide/vscode/boot/java/utils/CompilationUnitCache.java | 8 ++++---- .../ide/vscode/boot/java/utils/SpringIndexerJava.java | 4 ++-- 3 files changed, 9 insertions(+), 9 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 289fd3bcd..008d2748d 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, 2021 Pivotal, Inc. + * Copyright (c) 2017, 2022 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 @@ -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.JLS16); + ASTParser parser = ASTParser.newParser(AST.JLS18); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_16, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_18, 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 420752a86..0a485746c 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, 2021 Pivotal, Inc. + * Copyright (c) 2017, 2022 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 @@ -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_16; + String apiLevel = JavaCore.VERSION_18; 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.JLS16, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); + CompilationUnit cu = CUResolver.convert(unit, source, AST.JLS18, options, needToResolveBindings, DefaultWorkingCopyOwner.PRIMARY, flags); return cu; } private static List createClasspath(String[] classpathEntries) { - ASTParser parser = ASTParser.newParser(AST.JLS16); + ASTParser parser = ASTParser.newParser(AST.JLS18); 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 f8ea5ed1d..af042587f 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 @@ -547,9 +547,9 @@ public class SpringIndexerJava implements SpringIndexer { String[] classpathEntries = getClasspathEntries(project); String[] sourceEntries = getSourceEntries(project); - ASTParser parser = ASTParser.newParser(AST.JLS16); + ASTParser parser = ASTParser.newParser(AST.JLS18); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_16, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_18, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);