Support Type Ref In Switch Statements

See apex-dev-tools/apex-parser#56 (apexfmt already supported the other change in there, case-insensitive hex characters)
octoberswimmer · Nov 14, 2024 · 884c4dd · 884c4dd
1 parent 106241c
commit 884c4dd
Show file tree

Hide file tree

Showing 5 changed files with 1,856 additions and 1,812 deletions.
diff --git a/formatter/format_test.go b/formatter/format_test.go
@@ -296,6 +296,18 @@ OneDayDischargeFollowUp.twoHoursDelay,
 				`inquiry.Admitted_Day__c = ('0' + dayOfWeek) + '-' + dayAbbreviation;`,
 				`inquiry.Admitted_Day__c = ('0' + dayOfWeek) + '-' + dayAbbreviation;`,
 			},
+			{
+				`String a = 'Fran\u00E7ois';`,
+				`String a = 'Fran\u00E7ois';`,
+			},
+			{
+				`switch on Schema.Account.getSobjectType().newSObject() { when Schema.Account a { system.debug('doot'); } }`,
+				`switch on Schema.Account.getSobjectType().newSObject() {
+	when Schema.Account a {
+		system.debug('doot');
+	}
+}`,
+			},
 		}
 	for _, tt := range tests {
 		input := antlr.NewInputStream(tt.input)

diff --git a/formatter/visitors.go b/formatter/visitors.go
@@ -273,6 +273,8 @@ func (v *FormatVisitor) VisitWhenValue(ctx *parser.WhenValueContext) interface{}
 	switch {
 	case ctx.ELSE() != nil:
 		return "else"
+	case ctx.TypeRef() != nil:
+		return fmt.Sprintf("%s %s", v.visitRule(ctx.TypeRef()), v.visitRule(ctx.Id(0)))
 	case len(ctx.AllId()) == 2:
 		return fmt.Sprintf("%s %s", v.visitRule(ctx.Id(0)), v.visitRule(ctx.Id(1)))
 	default:

diff --git a/grammar/ApexParser.g4 b/grammar/ApexParser.g4
@@ -312,6 +312,7 @@ whenValue
     : ELSE
     | whenLiteral (COMMA whenLiteral)*
     | id id
+    | typeRef id
     ;
 
 whenLiteral

diff --git a/parser/ApexParser.interp b/parser/ApexParser.interp
-Original file line number
+Diff line change
@@ Expand Up / @@ -312,6 +312,7 @@ whenValue @@
         : ELSE
         | whenLiteral (COMMA whenLiteral)*
         | id id
+        | typeRef id
         ;
     whenLiteral
@@ Expand Down @@