From b465df2f883cb1da6416fb216d19d59510914140 Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Fri, 6 Mar 2020 09:55:35 +0800
Subject: [PATCH] Update ASTParser to support Java 13 syntax

Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>
---
 com.microsoft.java.debug.core/pom.xml                |  2 +-
 com.microsoft.java.debug.plugin/.classpath           |  2 +-
 com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF |  4 ++--
 com.microsoft.java.debug.plugin/pom.xml              |  4 ++--
 .../plugin/internal/JdtSourceLookUpProvider.java     | 10 +++++-----
 com.microsoft.java.debug.repository/category.xml     |  2 +-
 com.microsoft.java.debug.repository/pom.xml          |  2 +-
 java.debug.target                                    |  8 ++++----
 pom.xml                                              | 12 ++++++------
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/com.microsoft.java.debug.core/pom.xml b/com.microsoft.java.debug.core/pom.xml
index ae4d98384..b25d216a3 100644
--- a/com.microsoft.java.debug.core/pom.xml
+++ b/com.microsoft.java.debug.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.25.0</version>
+        <version>0.25.1</version>
     </parent>
     <artifactId>com.microsoft.java.debug.core</artifactId>
     <packaging>jar</packaging>
diff --git a/com.microsoft.java.debug.plugin/.classpath b/com.microsoft.java.debug.plugin/.classpath
index c19e5f920..34f0d2046 100644
--- a/com.microsoft.java.debug.plugin/.classpath
+++ b/com.microsoft.java.debug.plugin/.classpath
@@ -6,6 +6,6 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry exported="true" kind="lib" path="lib/rxjava-2.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.25.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
+	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.25.1.jar" sourcepath="/com.microsoft.java.debug.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
index 7ab2cd374..83e487e96 100644
--- a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
+++ b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java Debug Server Plugin
 Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
-Bundle-Version: 0.25.0
+Bundle-Version: 0.25.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
@@ -24,4 +24,4 @@ Bundle-ClassPath: lib/commons-io-2.5.jar,
  .,
  lib/rxjava-2.1.1.jar,
  lib/reactive-streams-1.0.0.jar,
- lib/com.microsoft.java.debug.core-0.25.0.jar
+ lib/com.microsoft.java.debug.core-0.25.1.jar
diff --git a/com.microsoft.java.debug.plugin/pom.xml b/com.microsoft.java.debug.plugin/pom.xml
index 57d9d2f35..54f01eacb 100644
--- a/com.microsoft.java.debug.plugin/pom.xml
+++ b/com.microsoft.java.debug.plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.25.0</version>
+        <version>0.25.1</version>
     </parent>
     <artifactId>com.microsoft.java.debug.plugin</artifactId>
     <packaging>eclipse-plugin</packaging>
@@ -45,7 +45,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.java</groupId>
                             <artifactId>com.microsoft.java.debug.core</artifactId>
-                            <version>0.25.0</version>
+                            <version>0.25.1</version>
                         </artifactItem>
                     </artifactItems>
                 </configuration>
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java
index cc3086eca..99b4b330c 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java
@@ -92,8 +92,8 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
             return new String[0];
         }
 
-        // Currently the highest version the debugger supports is Java SE 9 Edition (JLS9).
-        final ASTParser parser = ASTParser.newParser(AST.JLS9);
+        // Currently the highest version the debugger supports is JavaSE-13  Edition (JLS13).
+        final ASTParser parser = ASTParser.newParser(AST.JLS13);
         parser.setResolveBindings(true);
         parser.setBindingsRecovery(true);
         parser.setStatementsRecovery(true);
@@ -122,9 +122,9 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
              * the user need specify the compiler options explicitly.
              */
             Map<String, String> javaOptions = JavaCore.getOptions();
-            javaOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_9);
-            javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_9);
-            javaOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_9);
+            javaOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_13);
+            javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_13);
+            javaOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_13);
             parser.setCompilerOptions(javaOptions);
             astUnit = (CompilationUnit) parser.createAST(null);
         } else {
diff --git a/com.microsoft.java.debug.repository/category.xml b/com.microsoft.java.debug.repository/category.xml
index 9d0253fff..9344404fb 100644
--- a/com.microsoft.java.debug.repository/category.xml
+++ b/com.microsoft.java.debug.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <bundle id="com.microsoft.java.debug.plugin" version="0.25.0">
+   <bundle id="com.microsoft.java.debug.plugin" version="0.25.1">
    <category name="javadebug" />
    </bundle>
    <category-def name="javadebug" label="Java Debug Server"/>
diff --git a/com.microsoft.java.debug.repository/pom.xml b/com.microsoft.java.debug.repository/pom.xml
index a2f8dc079..553b72c70 100644
--- a/com.microsoft.java.debug.repository/pom.xml
+++ b/com.microsoft.java.debug.repository/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.25.0</version>
+        <version>0.25.1</version>
     </parent>
 	<artifactId>com.microsoft.java.debug.repository</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/java.debug.target b/java.debug.target
index 530f178af..835c63801 100644
--- a/java.debug.target
+++ b/java.debug.target
@@ -7,20 +7,20 @@
             <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
             <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
             <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-            <repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
+            <repository location="https://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-            <repository location="http://download.eclipse.org/releases/2019-06/"/>
+            <repository location="https://download.eclipse.org/releases/2019-12/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
-            <repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
+            <repository location="https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
-            <repository location="http://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
+            <repository location="https://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
         </location>
     </locations>
 </target>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 58bc70ea7..132e28d5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <name>${base.name} :: Parent</name>
     <description>The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.</description>
     <url>https://github.com/Microsoft/java-debug</url>
-    <version>0.25.0</version>
+    <version>0.25.1</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Java Debug Server for Visual Studio Code</base.name>
@@ -154,9 +154,9 @@
     </profiles>
     <repositories>
         <repository>
-            <id>201906</id>
+            <id>201912</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/releases/2019-06/</url>
+            <url>https://download.eclipse.org/releases/2019-12/</url>
         </repository>
         <repository>
             <id>oss.sonatype.org</id>
@@ -168,17 +168,17 @@
         <repository>
             <id>JDT.LS</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
+            <url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
         </repository>
         <repository>
             <id>JBOLL.TOOLS</id>
             <layout>p2</layout>
-            <url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11</url>
+            <url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11</url>
         </repository>
         <repository>
             <id>orbit</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
+            <url>https://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
         </repository>
     </repositories>
 </project>