@apexdevtools/apex-parser 5.0.0-beta.1 → 5.0.0-beta.2

package/CHANGELOG.md

@@ -18,6 +18,8 @@
 
 - Added support for parsing Anonymous Apex via `anonymousUnit` (.apex files) and `anonymousBlock` parser rules.
 
+- Re-ordered `memberDeclaration` alternate rules to de-prioritise field declarations due to its `typeDef` rule.
+
 ### Java
 
 - Added `Check.run` to programmatically run syntax check operation on a path.

package/lib/antlr/ApexParser.d.ts

@@ -802,12 +802,12 @@ export declare class ModifierContext extends ParserRuleContext {
 export declare class MemberDeclarationContext extends ParserRuleContext {
     constructor(parser?: ApexParser, parent?: ParserRuleContext, invokingState?: number);
     methodDeclaration(): MethodDeclarationContext;
-    fieldDeclaration(): FieldDeclarationContext;
     constructorDeclaration(): ConstructorDeclarationContext;
     interfaceDeclaration(): InterfaceDeclarationContext;
     classDeclaration(): ClassDeclarationContext;
     enumDeclaration(): EnumDeclarationContext;
     propertyDeclaration(): PropertyDeclarationContext;
+    fieldDeclaration(): FieldDeclarationContext;
     get ruleIndex(): number;
     enterRule(listener: ApexParserListener): void;
     exitRule(listener: ApexParserListener): void;
@@ -816,11 +816,11 @@ export declare class MemberDeclarationContext extends ParserRuleContext {
 export declare class TriggerMemberDeclarationContext extends ParserRuleContext {
     constructor(parser?: ApexParser, parent?: ParserRuleContext, invokingState?: number);
     methodDeclaration(): MethodDeclarationContext;
-    fieldDeclaration(): FieldDeclarationContext;
     interfaceDeclaration(): InterfaceDeclarationContext;
     classDeclaration(): ClassDeclarationContext;
     enumDeclaration(): EnumDeclarationContext;
     propertyDeclaration(): PropertyDeclarationContext;
+    fieldDeclaration(): FieldDeclarationContext;
     get ruleIndex(): number;
     enterRule(listener: ApexParserListener): void;
     exitRule(listener: ApexParserListener): void;
@@ -829,11 +829,11 @@ export declare class TriggerMemberDeclarationContext extends ParserRuleContext {
 export declare class AnonymousMemberDeclarationContext extends ParserRuleContext {
     constructor(parser?: ApexParser, parent?: ParserRuleContext, invokingState?: number);
     methodDeclaration(): MethodDeclarationContext;
-    fieldDeclaration(): FieldDeclarationContext;
     interfaceDeclaration(): InterfaceDeclarationContext;
     classDeclaration(): ClassDeclarationContext;
     enumDeclaration(): EnumDeclarationContext;
     propertyDeclaration(): PropertyDeclarationContext;
+    fieldDeclaration(): FieldDeclarationContext;
     get ruleIndex(): number;
     enterRule(listener: ApexParserListener): void;
     exitRule(listener: ApexParserListener): void;

package/lib/antlr/ApexParser.js

@@ -1007,42 +1007,42 @@ class ApexParser extends antlr4_1.Parser {
                     this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 486;
-                        this.fieldDeclaration();
+                        this.constructorDeclaration();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 487;
-                        this.constructorDeclaration();
+                        this.interfaceDeclaration();
                     }
                     break;
                 case 4:
                     this.enterOuterAlt(localctx, 4);
                     {
                         this.state = 488;
-                        this.interfaceDeclaration();
+                        this.classDeclaration();
                     }
                     break;
                 case 5:
                     this.enterOuterAlt(localctx, 5);
                     {
                         this.state = 489;
-                        this.classDeclaration();
+                        this.enumDeclaration();
                     }
                     break;
                 case 6:
                     this.enterOuterAlt(localctx, 6);
                     {
                         this.state = 490;
-                        this.enumDeclaration();
+                        this.propertyDeclaration();
                     }
                     break;
                 case 7:
                     this.enterOuterAlt(localctx, 7);
                     {
                         this.state = 491;
-                        this.propertyDeclaration();
+                        this.fieldDeclaration();
                     }
                     break;
             }
@@ -1081,35 +1081,35 @@ class ApexParser extends antlr4_1.Parser {
                     this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 495;
-                        this.fieldDeclaration();
+                        this.interfaceDeclaration();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 496;
-                        this.interfaceDeclaration();
+                        this.classDeclaration();
                     }
                     break;
                 case 4:
                     this.enterOuterAlt(localctx, 4);
                     {
                         this.state = 497;
-                        this.classDeclaration();
+                        this.enumDeclaration();
                     }
                     break;
                 case 5:
                     this.enterOuterAlt(localctx, 5);
                     {
                         this.state = 498;
-                        this.enumDeclaration();
+                        this.propertyDeclaration();
                     }
                     break;
                 case 6:
                     this.enterOuterAlt(localctx, 6);
                     {
                         this.state = 499;
-                        this.propertyDeclaration();
+                        this.fieldDeclaration();
                     }
                     break;
             }
@@ -1148,35 +1148,35 @@ class ApexParser extends antlr4_1.Parser {
                     this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 503;
-                        this.fieldDeclaration();
+                        this.interfaceDeclaration();
                     }
                     break;
                 case 3:
                     this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 504;
-                        this.interfaceDeclaration();
+                        this.classDeclaration();
                     }
                     break;
                 case 4:
                     this.enterOuterAlt(localctx, 4);
                     {
                         this.state = 505;
-                        this.classDeclaration();
+                        this.enumDeclaration();
                     }
                     break;
                 case 5:
                     this.enterOuterAlt(localctx, 5);
                     {
                         this.state = 506;
-                        this.enumDeclaration();
+                        this.propertyDeclaration();
                     }
                     break;
                 case 6:
                     this.enterOuterAlt(localctx, 6);
                     {
                         this.state = 507;
-                        this.propertyDeclaration();
+                        this.fieldDeclaration();
                     }
                     break;
             }
@@ -11467,32 +11467,32 @@ ApexParser._serializedATN = [4, 1, 251, 2014, 2, 0, 7, 0,
     465, 1, 0, 0, 0, 483, 466, 1, 0, 0, 0, 483, 467, 1, 0, 0, 0, 483, 468, 1, 0, 0, 0, 483, 469, 1, 0,
     0, 0, 483, 470, 1, 0, 0, 0, 483, 471, 1, 0, 0, 0, 483, 472, 1, 0, 0, 0, 483, 473, 1, 0, 0, 0, 483,
     474, 1, 0, 0, 0, 483, 475, 1, 0, 0, 0, 483, 476, 1, 0, 0, 0, 483, 477, 1, 0, 0, 0, 483, 479, 1, 0,
-    0, 0, 483, 481, 1, 0, 0, 0, 484, 35, 1, 0, 0, 0, 485, 493, 3, 42, 21, 0, 486, 493, 3, 46, 23, 0,
-    487, 493, 3, 44, 22, 0, 488, 493, 3, 24, 12, 0, 489, 493, 3, 18, 9, 0, 490, 493, 3, 20, 10, 0,
-    491, 493, 3, 48, 24, 0, 492, 485, 1, 0, 0, 0, 492, 486, 1, 0, 0, 0, 492, 487, 1, 0, 0, 0, 492, 488,
+    0, 0, 483, 481, 1, 0, 0, 0, 484, 35, 1, 0, 0, 0, 485, 493, 3, 42, 21, 0, 486, 493, 3, 44, 22, 0,
+    487, 493, 3, 24, 12, 0, 488, 493, 3, 18, 9, 0, 489, 493, 3, 20, 10, 0, 490, 493, 3, 48, 24, 0,
+    491, 493, 3, 46, 23, 0, 492, 485, 1, 0, 0, 0, 492, 486, 1, 0, 0, 0, 492, 487, 1, 0, 0, 0, 492, 488,
     1, 0, 0, 0, 492, 489, 1, 0, 0, 0, 492, 490, 1, 0, 0, 0, 492, 491, 1, 0, 0, 0, 493, 37, 1, 0, 0, 0,
-    494, 501, 3, 42, 21, 0, 495, 501, 3, 46, 23, 0, 496, 501, 3, 24, 12, 0, 497, 501, 3, 18, 9, 0,
-    498, 501, 3, 20, 10, 0, 499, 501, 3, 48, 24, 0, 500, 494, 1, 0, 0, 0, 500, 495, 1, 0, 0, 0, 500,
+    494, 501, 3, 42, 21, 0, 495, 501, 3, 24, 12, 0, 496, 501, 3, 18, 9, 0, 497, 501, 3, 20, 10, 0,
+    498, 501, 3, 48, 24, 0, 499, 501, 3, 46, 23, 0, 500, 494, 1, 0, 0, 0, 500, 495, 1, 0, 0, 0, 500,
     496, 1, 0, 0, 0, 500, 497, 1, 0, 0, 0, 500, 498, 1, 0, 0, 0, 500, 499, 1, 0, 0, 0, 501, 39, 1, 0,
-    0, 0, 502, 509, 3, 42, 21, 0, 503, 509, 3, 46, 23, 0, 504, 509, 3, 24, 12, 0, 505, 509, 3, 18,
-    9, 0, 506, 509, 3, 20, 10, 0, 507, 509, 3, 48, 24, 0, 508, 502, 1, 0, 0, 0, 508, 503, 1, 0, 0, 0,
-    508, 504, 1, 0, 0, 0, 508, 505, 1, 0, 0, 0, 508, 506, 1, 0, 0, 0, 508, 507, 1, 0, 0, 0, 509, 41,
-    1, 0, 0, 0, 510, 513, 3, 58, 29, 0, 511, 513, 5, 49, 0, 0, 512, 510, 1, 0, 0, 0, 512, 511, 1, 0,
-    0, 0, 513, 514, 1, 0, 0, 0, 514, 515, 3, 300, 150, 0, 515, 518, 3, 66, 33, 0, 516, 519, 3, 86,
-    43, 0, 517, 519, 5, 207, 0, 0, 518, 516, 1, 0, 0, 0, 518, 517, 1, 0, 0, 0, 519, 43, 1, 0, 0, 0, 520,
-    521, 3, 72, 36, 0, 521, 522, 3, 66, 33, 0, 522, 523, 3, 86, 43, 0, 523, 45, 1, 0, 0, 0, 524, 525,
-    3, 58, 29, 0, 525, 526, 3, 52, 26, 0, 526, 527, 5, 207, 0, 0, 527, 47, 1, 0, 0, 0, 528, 529, 3,
-    58, 29, 0, 529, 530, 3, 300, 150, 0, 530, 534, 5, 203, 0, 0, 531, 533, 3, 138, 69, 0, 532, 531,
-    1, 0, 0, 0, 533, 536, 1, 0, 0, 0, 534, 532, 1, 0, 0, 0, 534, 535, 1, 0, 0, 0, 535, 537, 1, 0, 0, 0,
-    536, 534, 1, 0, 0, 0, 537, 538, 5, 204, 0, 0, 538, 49, 1, 0, 0, 0, 539, 541, 3, 34, 17, 0, 540,
-    539, 1, 0, 0, 0, 541, 544, 1, 0, 0, 0, 542, 540, 1, 0, 0, 0, 542, 543, 1, 0, 0, 0, 543, 547, 1, 0,
-    0, 0, 544, 542, 1, 0, 0, 0, 545, 548, 3, 58, 29, 0, 546, 548, 5, 49, 0, 0, 547, 545, 1, 0, 0, 0,
-    547, 546, 1, 0, 0, 0, 548, 549, 1, 0, 0, 0, 549, 550, 3, 300, 150, 0, 550, 551, 3, 66, 33, 0, 551,
-    552, 5, 207, 0, 0, 552, 51, 1, 0, 0, 0, 553, 558, 3, 54, 27, 0, 554, 555, 5, 208, 0, 0, 555, 557,
-    3, 54, 27, 0, 556, 554, 1, 0, 0, 0, 557, 560, 1, 0, 0, 0, 558, 556, 1, 0, 0, 0, 558, 559, 1, 0, 0,
-    0, 559, 53, 1, 0, 0, 0, 560, 558, 1, 0, 0, 0, 561, 564, 3, 300, 150, 0, 562, 563, 5, 210, 0, 0,
-    563, 565, 3, 160, 80, 0, 564, 562, 1, 0, 0, 0, 564, 565, 1, 0, 0, 0, 565, 55, 1, 0, 0, 0, 566, 578,
-    5, 203, 0, 0, 567, 572, 3, 160, 80, 0, 568, 569, 5, 208, 0, 0, 569, 571, 3, 160, 80, 0, 570, 568,
+    0, 0, 502, 509, 3, 42, 21, 0, 503, 509, 3, 24, 12, 0, 504, 509, 3, 18, 9, 0, 505, 509, 3, 20, 10,
+    0, 506, 509, 3, 48, 24, 0, 507, 509, 3, 46, 23, 0, 508, 502, 1, 0, 0, 0, 508, 503, 1, 0, 0, 0, 508,
+    504, 1, 0, 0, 0, 508, 505, 1, 0, 0, 0, 508, 506, 1, 0, 0, 0, 508, 507, 1, 0, 0, 0, 509, 41, 1, 0,
+    0, 0, 510, 513, 3, 58, 29, 0, 511, 513, 5, 49, 0, 0, 512, 510, 1, 0, 0, 0, 512, 511, 1, 0, 0, 0,
+    513, 514, 1, 0, 0, 0, 514, 515, 3, 300, 150, 0, 515, 518, 3, 66, 33, 0, 516, 519, 3, 86, 43, 0,
+    517, 519, 5, 207, 0, 0, 518, 516, 1, 0, 0, 0, 518, 517, 1, 0, 0, 0, 519, 43, 1, 0, 0, 0, 520, 521,
+    3, 72, 36, 0, 521, 522, 3, 66, 33, 0, 522, 523, 3, 86, 43, 0, 523, 45, 1, 0, 0, 0, 524, 525, 3,
+    58, 29, 0, 525, 526, 3, 52, 26, 0, 526, 527, 5, 207, 0, 0, 527, 47, 1, 0, 0, 0, 528, 529, 3, 58,
+    29, 0, 529, 530, 3, 300, 150, 0, 530, 534, 5, 203, 0, 0, 531, 533, 3, 138, 69, 0, 532, 531, 1,
+    0, 0, 0, 533, 536, 1, 0, 0, 0, 534, 532, 1, 0, 0, 0, 534, 535, 1, 0, 0, 0, 535, 537, 1, 0, 0, 0, 536,
+    534, 1, 0, 0, 0, 537, 538, 5, 204, 0, 0, 538, 49, 1, 0, 0, 0, 539, 541, 3, 34, 17, 0, 540, 539,
+    1, 0, 0, 0, 541, 544, 1, 0, 0, 0, 542, 540, 1, 0, 0, 0, 542, 543, 1, 0, 0, 0, 543, 547, 1, 0, 0, 0,
+    544, 542, 1, 0, 0, 0, 545, 548, 3, 58, 29, 0, 546, 548, 5, 49, 0, 0, 547, 545, 1, 0, 0, 0, 547,
+    546, 1, 0, 0, 0, 548, 549, 1, 0, 0, 0, 549, 550, 3, 300, 150, 0, 550, 551, 3, 66, 33, 0, 551, 552,
+    5, 207, 0, 0, 552, 51, 1, 0, 0, 0, 553, 558, 3, 54, 27, 0, 554, 555, 5, 208, 0, 0, 555, 557, 3,
+    54, 27, 0, 556, 554, 1, 0, 0, 0, 557, 560, 1, 0, 0, 0, 558, 556, 1, 0, 0, 0, 558, 559, 1, 0, 0, 0,
+    559, 53, 1, 0, 0, 0, 560, 558, 1, 0, 0, 0, 561, 564, 3, 300, 150, 0, 562, 563, 5, 210, 0, 0, 563,
+    565, 3, 160, 80, 0, 564, 562, 1, 0, 0, 0, 564, 565, 1, 0, 0, 0, 565, 55, 1, 0, 0, 0, 566, 578, 5,
+    203, 0, 0, 567, 572, 3, 160, 80, 0, 568, 569, 5, 208, 0, 0, 569, 571, 3, 160, 80, 0, 570, 568,
     1, 0, 0, 0, 571, 574, 1, 0, 0, 0, 572, 570, 1, 0, 0, 0, 572, 573, 1, 0, 0, 0, 573, 576, 1, 0, 0, 0,
     574, 572, 1, 0, 0, 0, 575, 577, 5, 208, 0, 0, 576, 575, 1, 0, 0, 0, 576, 577, 1, 0, 0, 0, 577, 579,
     1, 0, 0, 0, 578, 567, 1, 0, 0, 0, 578, 579, 1, 0, 0, 0, 579, 580, 1, 0, 0, 0, 580, 581, 5, 204, 0,
@@ -12782,9 +12782,6 @@ class MemberDeclarationContext extends antlr4_1.ParserRuleContext {
     methodDeclaration() {
         return this.getTypedRuleContext(MethodDeclarationContext, 0);
     }
-    fieldDeclaration() {
-        return this.getTypedRuleContext(FieldDeclarationContext, 0);
-    }
     constructorDeclaration() {
         return this.getTypedRuleContext(ConstructorDeclarationContext, 0);
     }
@@ -12800,6 +12797,9 @@ class MemberDeclarationContext extends antlr4_1.ParserRuleContext {
     propertyDeclaration() {
         return this.getTypedRuleContext(PropertyDeclarationContext, 0);
     }
+    fieldDeclaration() {
+        return this.getTypedRuleContext(FieldDeclarationContext, 0);
+    }
     get ruleIndex() {
         return ApexParser.RULE_memberDeclaration;
     }
@@ -12832,9 +12832,6 @@ class TriggerMemberDeclarationContext extends antlr4_1.ParserRuleContext {
     methodDeclaration() {
         return this.getTypedRuleContext(MethodDeclarationContext, 0);
     }
-    fieldDeclaration() {
-        return this.getTypedRuleContext(FieldDeclarationContext, 0);
-    }
     interfaceDeclaration() {
         return this.getTypedRuleContext(InterfaceDeclarationContext, 0);
     }
@@ -12847,6 +12844,9 @@ class TriggerMemberDeclarationContext extends antlr4_1.ParserRuleContext {
     propertyDeclaration() {
         return this.getTypedRuleContext(PropertyDeclarationContext, 0);
     }
+    fieldDeclaration() {
+        return this.getTypedRuleContext(FieldDeclarationContext, 0);
+    }
     get ruleIndex() {
         return ApexParser.RULE_triggerMemberDeclaration;
     }
@@ -12879,9 +12879,6 @@ class AnonymousMemberDeclarationContext extends antlr4_1.ParserRuleContext {
     methodDeclaration() {
         return this.getTypedRuleContext(MethodDeclarationContext, 0);
     }
-    fieldDeclaration() {
-        return this.getTypedRuleContext(FieldDeclarationContext, 0);
-    }
     interfaceDeclaration() {
         return this.getTypedRuleContext(InterfaceDeclarationContext, 0);
     }
@@ -12894,6 +12891,9 @@ class AnonymousMemberDeclarationContext extends antlr4_1.ParserRuleContext {
     propertyDeclaration() {
         return this.getTypedRuleContext(PropertyDeclarationContext, 0);
     }
+    fieldDeclaration() {
+        return this.getTypedRuleContext(FieldDeclarationContext, 0);
+    }
     get ruleIndex() {
         return ApexParser.RULE_anonymousMemberDeclaration;
     }