Skip to content

Commit fbe555d

Browse files
Merge pull request #72 from mshanemc/main
fix: reorder memberDeclaration alternatives to prioritize class over field
2 parents e922c0d + 0cc0e2f commit fbe555d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

antlr/BaseApexParser.g4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,30 +144,30 @@ modifier
144144

145145
memberDeclaration
146146
: methodDeclaration
147-
| fieldDeclaration
148147
| constructorDeclaration
149148
| interfaceDeclaration
150149
| classDeclaration
151150
| enumDeclaration
152151
| propertyDeclaration
152+
| fieldDeclaration
153153
;
154154

155155
triggerMemberDeclaration
156156
: methodDeclaration
157-
| fieldDeclaration
158157
| interfaceDeclaration
159158
| classDeclaration
160159
| enumDeclaration
161160
| propertyDeclaration
161+
| fieldDeclaration
162162
;
163163

164164
anonymousMemberDeclaration
165165
: methodDeclaration
166-
| fieldDeclaration
167166
| interfaceDeclaration
168167
| classDeclaration
169168
| enumDeclaration
170169
| propertyDeclaration
170+
| fieldDeclaration
171171
;
172172

173173
/* We use rule this even for void methods which cannot have [] after parameters.

0 commit comments

Comments
 (0)