Unwrap Short Logical AND/OR Expressions

octoberswimmer · Dec 12, 2024 · 4a40187 · 4a40187
1 parent fb456b2
commit 4a40187
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/formatter/format_test.go b/formatter/format_test.go
@@ -115,6 +115,18 @@ func TestStatement(t *testing.T) {
 	);
 }`},
 
+			{
+				`if ((accountIds == null ||
+   accountIds.isEmpty()) &&
+   (contactIds == null ||
+      contactIds.isEmpty())) {
+   return null;
+}`,
+				`if ((accountIds == null || accountIds.isEmpty()) &&
+	(contactIds == null || contactIds.isEmpty())) {
+	return null;
+}`},
+
 			{
 				`return new List<CountryZip>{
    new CountryZip( new Territory_Zip_Lookup__c( Id = zip.Id, Name = zip.Name, City__c = zip.City__c, State_2_Letter_Code__c = zip.State_2_Letter_Code__c, Country__c = zip.Country__c))

diff --git a/formatter/visitors.go b/formatter/visitors.go
@@ -445,7 +445,9 @@ func (v *FormatVisitor) VisitCondExpression(ctx *parser.CondExpressionContext) i
 
 func (v *FormatVisitor) VisitLogAndExpression(ctx *parser.LogAndExpressionContext) interface{} {
 	i := NewChainVisitor()
-	if i.visitRule(ctx.Expression(0)).(int)+i.visitRule(ctx.Expression(1)).(int) > 2 {
+	if len(ctx.GetText()) < 40 {
+		defer restoreWrap(unwrap(v))
+	} else if i.visitRule(ctx.Expression(0)).(int)+i.visitRule(ctx.Expression(1)).(int) > 2 {
 		defer restoreWrap(wrap(v))
 	}
 	if v.wrap {
@@ -456,7 +458,9 @@ func (v *FormatVisitor) VisitLogAndExpression(ctx *parser.LogAndExpressionContex
 
 func (v *FormatVisitor) VisitLogOrExpression(ctx *parser.LogOrExpressionContext) interface{} {
 	i := NewChainVisitor()
-	if i.visitRule(ctx.Expression(0)).(int)+i.visitRule(ctx.Expression(1)).(int) > 2 {
+	if len(ctx.GetText()) < 40 {
+		defer restoreWrap(unwrap(v))
+	} else if i.visitRule(ctx.Expression(0)).(int)+i.visitRule(ctx.Expression(1)).(int) > 2 {
 		defer restoreWrap(wrap(v))
 	}
 	if v.wrap {