Merge pull request #30 from apex-dev-tools/29-handle-+-on-switch-when-expressions-using-integer-or-long-literals

Support +/- on switch when numeric literals

Author: pwrightcertinia

.gitignore

@@ -0,0 +1,2 @@
+.metals/
+.vscode/

CHANGELOG.md

@@ -1,5 +1,9 @@
 # apex-parser - Changelog
 
+## 3.4.0 - 2023-08-22
+
+- Support +/- sequences on numeric literals in switch 'when' expressions
+
 ## 3.3.0 - 2023-04-30
 
 - Update to ANTLR 4.9.1

README.md

@@ -48,12 +48,12 @@ Maven
     <dependency>
         <groupId>io.github.apex-dev-tools</groupId>
         <artifactId>apex-parser</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
     </dependency>
 
 NPM
 
-    "@apexdevtools/apex-parser": "^3.3.0"
+    "@apexdevtools/apex-parser": "^3.4.0"
 
 ## Building
 

antlr/ApexParser.g4

@@ -300,8 +300,8 @@ whenValue
     ;
 
 whenLiteral
-    : (SUB)? IntegerLiteral
-    | LongLiteral
+    : (SUB|ADD)* IntegerLiteral
+    | (SUB|ADD)* LongLiteral
     | StringLiteral
     | NULL
     | id

jvm/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>io.github.apex-dev-tools</groupId>
   <artifactId>apex-parser</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
   <packaging>jar</packaging>
 
   <name>apex-parser</name>

jvm/src/test/java/com/nawforce/apexparser/ApexParserTest.java

@@ -125,6 +125,19 @@ void testWhenLiteralParens() {
         assertEquals(0, parserAndCounter.getValue().getNumErrors());
     }
 
+    @Test
+    void testWhenLiteralSigns() {
+        Map.Entry<ApexParser, SyntaxErrorCounter> parserAndCounter = createParser(
+                "switch on (x) { \n" +
+                        "  when -1 { return 1; } \n" +
+                        "  when (+2l) { return 1; } \n" +
+                        "  when -+-3 { return 3; } \n" +
+                        "}");
+        ApexParser.StatementContext context = parserAndCounter.getKey().statement();
+        assertNotNull(context);
+        assertEquals(0, parserAndCounter.getValue().getNumErrors());
+    }
+
     @Test
     void testSoqlModeKeywords() {
         String [] MODES = new String[] { "USER_MODE", "SYSTEM_MODE" };

npm/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@apexdevtools/apex-parser",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "author": "Apex Dev Tools Team <[email protected]> (https://github.com/apex-dev-tools)",
   "bugs": "https://github.com/apex-dev-tools/apex-parser/issues",
   "description": "Javascript parser for Salesforce Apex Language",

npm/package.json

@@ -145,6 +145,20 @@ test('testWhenLiteralParens', () => {
     expect(errorCounter.getNumErrors()).toEqual(0)
 })
 
+test("testWhenLiteralParens", () => {
+    const [parser, errorCounter] = createParser(`
+      switch on (x) {
+          when 1 { return 1; }
+          when ((2)) { return 2; }
+          when (3), (4) { return 3; }
+       }`);
+
+    const context = parser.statement();
+
+    expect(context).toBeInstanceOf(StatementContext);
+    expect(errorCounter.getNumErrors()).toEqual(0);
+});
+
 test('testSoqlModeKeywords', () => {
     const MODES = ["USER_MODE", "SYSTEM_MODE"];
     for (const mode of MODES) {