Indent Conditional SOQL Expressions in Parentheses

Author: cwarden

formatter/format_test.go

@@ -313,6 +313,43 @@ func TestSOQL(t *testing.T) {
 				Start__c = YESTERDAY
 		)
 ]`},
+
+			{
+				`[
+	SELECT
+		Name
+	FROM
+		My_Object__c
+	WHERE
+		Type__c = 'Virtual' AND
+		(
+			Start__c = TODAY OR
+			Start__c = N_DAYS_AGO:7 OR
+			Start__c = N_DAYS_AGO:14 OR
+			Start__c = N_DAYS_AGO:21 OR
+			Start__c <= N_DAYS_AGO:28
+		) AND
+		Status__c = 'Confirmed'
+	ORDER BY
+		Start__c
+];`, `[
+	SELECT
+		Name
+	FROM
+		My_Object__c
+	WHERE
+		Type__c = 'Virtual' AND
+		(
+			Start__c = TODAY OR
+			Start__c = N_DAYS_AGO:7 OR
+			Start__c = N_DAYS_AGO:14 OR
+			Start__c = N_DAYS_AGO:21 OR
+			Start__c <= N_DAYS_AGO:28
+		) AND
+		Status__c = 'Confirmed'
+	ORDER BY
+		Start__c
+]`},
 		}
 	for _, tt := range tests {
 		input := antlr.NewInputStream(tt.input)

formatter/visitors.go

@@ -947,7 +947,7 @@ func (v *FormatVisitor) VisitLogicalExpression(ctx *parser.LogicalExpressionCont
 func (v *FormatVisitor) VisitConditionalExpression(ctx *parser.ConditionalExpressionContext) interface{} {
 	switch {
 	case ctx.LogicalExpression() != nil:
-		return fmt.Sprintf("(%s)", v.visitRule(ctx.LogicalExpression()))
+		return fmt.Sprintf("(\n%s\n)", v.indent(v.visitRule(ctx.LogicalExpression()).(string)))
 	case ctx.FieldExpression() != nil:
 		return v.visitRule(ctx.FieldExpression())
 	}