From 48aae5bc9e2001b2412bad35ff54dde966cc693f Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 21 Mar 2018 18:59:54 +0100 Subject: [PATCH] add early java10 support --- headless-services/spring-boot-language-server/pom.xml | 5 +++++ .../boot/java/handlers/BootJavaReferencesHandler.java | 4 ++-- .../ide/vscode/boot/java/utils/CompilationUnitCache.java | 4 ++-- .../ide/vscode/boot/java/utils/SpringIndexer.java | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index 6d40c7c97..dee1cb69e 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -61,6 +61,11 @@ commons-boot-app-cli ${dependencies.version} + + org.eclipse.tycho + org.eclipse.jdt.core + 3.13.102.v20180320-1701_BETA_JAVA10 + org.eclipse.jdt org.eclipse.jdt.core 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 b6c81415c..3e91a28ff 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 @@ -71,9 +71,9 @@ public class BootJavaReferencesHandler implements ReferencesHandler { } private CompletableFuture> provideReferences(TextDocument document, int offset) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS9); + ASTParser parser = ASTParser.newParser(AST.JLS10); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_10, 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 0e1a9abf6..68ee5a3fd 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 @@ -141,9 +141,9 @@ public final class CompilationUnitCache { } public static CompilationUnit parse(char[] source, String docURI, String unitName, String[] classpathEntries) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS9); + ASTParser parser = ASTParser.newParser(AST.JLS10); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_10, 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/SpringIndexer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java index c9450129d..beb8609a4 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java @@ -356,7 +356,7 @@ public class SpringIndexer { private void scanProject(IJavaProject project, String[] files) { try { - ASTParser parser = ASTParser.newParser(AST.JLS9); + ASTParser parser = ASTParser.newParser(AST.JLS10); String[] classpathEntries = getClasspathEntries(project); scanFiles(parser, files, classpathEntries); @@ -367,9 +367,9 @@ public class SpringIndexer { } private void scanFile(String docURI, String content, String[] classpathEntries) throws Exception { - ASTParser parser = ASTParser.newParser(AST.JLS9); + ASTParser parser = ASTParser.newParser(AST.JLS10); Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_10, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true); @@ -405,7 +405,7 @@ public class SpringIndexer { private void scanFiles(ASTParser parser, String[] javaFiles, String[] classpathEntries) throws Exception { Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); + JavaCore.setComplianceOptions(JavaCore.VERSION_10, options); parser.setCompilerOptions(options); parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true);