Fix DateTime/Currency Literals and Date Fields In SOQL

Fix lexer to make DateTime and Currency literals case-insensitive. Add formatting of date field names.
octoberswimmer · Dec 6, 2023 · 7425ead · 7425ead
1 parent 218bb18
commit 7425ead
Show file tree

Hide file tree

Showing 4 changed files with 375 additions and 368 deletions.
diff --git a/formatter/visitors.go b/formatter/visitors.go
@@ -866,6 +866,13 @@ func (v *Visitor) VisitSoqlFieldsParameter(ctx *parser.SoqlFieldsParameterContex
 	return ctx.GetText()
 }
 
+func (v *Visitor) VisitDateFieldName(ctx *parser.DateFieldNameContext) interface{} {
+	if ctx.CONVERT_TIMEZONE() != nil {
+		return fmt.Sprintf("CONVERT_TIMEZONE(%s)", v.visitRule(ctx.FieldName()))
+	}
+	return v.visitRule(ctx.FieldName())
+}
+
 func (v *Visitor) VisitNullValue(ctx *parser.NullValueContext) interface{} {
 	return "null"
 }

diff --git a/grammar/ApexLexer.g4 b/grammar/ApexLexer.g4
@@ -223,11 +223,11 @@ N_FISCAL_YEARS_AGO       : N '_' F I S C A L '_' Y E A R S '_' A G O;
 
 // SOQL Date literal
 DateLiteral: Digit Digit Digit Digit '-' Digit Digit '-' Digit Digit;
-DateTimeLiteral: DateLiteral 't' Digit Digit ':' Digit Digit ':' Digit Digit ('z' | (('+' | '-') Digit+ ( ':' Digit+)? ));
+DateTimeLiteral: DateLiteral T Digit Digit ':' Digit Digit ':' Digit Digit (Z | (('+' | '-') Digit+ ( ':' Digit+)? ));
 
 // SOQL Currency literal
 // (NOTE: this is also a valid Identifier)
-IntegralCurrencyLiteral: [a-z] [a-z] [a-z] Digit+;
+IntegralCurrencyLiteral: [a-zA-Z] [a-zA-Z] [a-zA-Z] Digit+;
 
 // SOSL Keywords
 FIND             : F I N D;

diff --git a/parser/ApexLexer.interp b/parser/ApexLexer.interp