Skip to content

Commit 32f3a1f

Browse files
testforstephentestforstephen
authored
Update ASTParser to support Java 13 syntax (#323)
Signed-off-by: Jinbo Wang <[email protected]>
1 parent fc691fd commit 32f3a1f

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎com.microsoft.java.debug.core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.microsoft.java</groupId>
77
<artifactId>java-debug-parent</artifactId>
8-
<version>0.25.0</version>
8+
<version>0.25.1</version>
99
</parent>
1010
<artifactId>com.microsoft.java.debug.core</artifactId>
1111
<packaging>jar</packaging>

‎com.microsoft.java.debug.plugin/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<classpathentry kind="src" path="src/main/java"/>
77
<classpathentry exported="true" kind="lib" path="lib/rxjava-2.1.1.jar"/>
88
<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.0.jar"/>
9-
<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.25.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
9+
<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.25.1.jar" sourcepath="/com.microsoft.java.debug.core"/>
1010
<classpathentry kind="output" path="target/classes"/>
1111
</classpath>

‎com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Java Debug Server Plugin
44
Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
5-
Bundle-Version: 0.25.0
5+
Bundle-Version: 0.25.1
66
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
77
Bundle-ActivationPolicy: lazy
88
Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
@@ -24,4 +24,4 @@ Bundle-ClassPath: lib/commons-io-2.5.jar,
2424
.,
2525
lib/rxjava-2.1.1.jar,
2626
lib/reactive-streams-1.0.0.jar,
27-
lib/com.microsoft.java.debug.core-0.25.0.jar
27+
lib/com.microsoft.java.debug.core-0.25.1.jar

‎com.microsoft.java.debug.plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.microsoft.java</groupId>
77
<artifactId>java-debug-parent</artifactId>
8-
<version>0.25.0</version>
8+
<version>0.25.1</version>
99
</parent>
1010
<artifactId>com.microsoft.java.debug.plugin</artifactId>
1111
<packaging>eclipse-plugin</packaging>
@@ -45,7 +45,7 @@
4545
<artifactItem>
4646
<groupId>com.microsoft.java</groupId>
4747
<artifactId>com.microsoft.java.debug.core</artifactId>
48-
<version>0.25.0</version>
48+
<version>0.25.1</version>
4949
</artifactItem>
5050
</artifactItems>
5151
</configuration>

‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
9292
return new String[0];
9393
}
9494

95-
// Currently the highest version the debugger supports is Java SE 9 Edition (JLS9).
96-
final ASTParser parser = ASTParser.newParser(AST.JLS9);
95+
// Currently the highest version the debugger supports is JavaSE-13 Edition (JLS13).
96+
final ASTParser parser = ASTParser.newParser(AST.JLS13);
9797
parser.setResolveBindings(true);
9898
parser.setBindingsRecovery(true);
9999
parser.setStatementsRecovery(true);
@@ -122,9 +122,9 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
122122
* the user need specify the compiler options explicitly.
123123
*/
124124
Map<String, String> javaOptions = JavaCore.getOptions();
125-
javaOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_9);
126-
javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_9);
127-
javaOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_9);
125+
javaOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_13);
126+
javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_13);
127+
javaOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_13);
128128
parser.setCompilerOptions(javaOptions);
129129
astUnit = (CompilationUnit) parser.createAST(null);
130130
} else {

‎com.microsoft.java.debug.repository/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<bundle id="com.microsoft.java.debug.plugin" version="0.25.0">
3+
<bundle id="com.microsoft.java.debug.plugin" version="0.25.1">
44
<category name="javadebug" />
55
</bundle>
66
<category-def name="javadebug" label="Java Debug Server"/>

‎com.microsoft.java.debug.repository/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.microsoft.java</groupId>
66
<artifactId>java-debug-parent</artifactId>
7-
<version>0.25.0</version>
7+
<version>0.25.1</version>
88
</parent>
99
<artifactId>com.microsoft.java.debug.repository</artifactId>
1010
<packaging>eclipse-repository</packaging>

‎java.debug.target‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
88
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
99
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
10-
<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
10+
<repository location="https://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
1111
</location>
1212
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1313
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
1414
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
15-
<repository location="http://download.eclipse.org/releases/2019-06/"/>
15+
<repository location="https://download.eclipse.org/releases/2019-12/"/>
1616
</location>
1717
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1818
<unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
19-
<repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
19+
<repository location="https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
2020
</location>
2121
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2222
<unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
23-
<repository location="http://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
23+
<repository location="https://download.eclipse.org/jdtls/snapshots/repository/latest/"/>
2424
</location>
2525
</locations>
2626
</target>

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<name>${base.name} :: Parent</name>
77
<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>
88
<url>https://github.com/Microsoft/java-debug</url>
9-
<version>0.25.0</version>
9+
<version>0.25.1</version>
1010
<packaging>pom</packaging>
1111
<properties>
1212
<base.name>Java Debug Server for Visual Studio Code</base.name>
@@ -154,9 +154,9 @@
154154
</profiles>
155155
<repositories>
156156
<repository>
157-
<id>201906</id>
157+
<id>201912</id>
158158
<layout>p2</layout>
159-
<url>http://download.eclipse.org/releases/2019-06/</url>
159+
<url>https://download.eclipse.org/releases/2019-12/</url>
160160
</repository>
161161
<repository>
162162
<id>oss.sonatype.org</id>
@@ -168,17 +168,17 @@
168168
<repository>
169169
<id>JDT.LS</id>
170170
<layout>p2</layout>
171-
<url>http://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
171+
<url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
172172
</repository>
173173
<repository>
174174
<id>JBOLL.TOOLS</id>
175175
<layout>p2</layout>
176-
<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11</url>
176+
<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-05-16_00-46-30-H11</url>
177177
</repository>
178178
<repository>
179179
<id>orbit</id>
180180
<layout>p2</layout>
181-
<url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
181+
<url>https://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository/</url>
182182
</repository>
183183
</repositories>
184184
</project>

0 commit comments

Comments
 (0)