From 11d239f9f8bea761cb800a3d1a91c97a4e3bfc5b Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Wed, 13 Dec 2023 15:43:39 -0600 Subject: [PATCH] Wrap List/Set Creator Expressions More Aggressively --- formatter/format_test.go | 7 +++++++ formatter/visitors.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/formatter/format_test.go b/formatter/format_test.go index 2e6f1db..1128ab8 100644 --- a/formatter/format_test.go +++ b/formatter/format_test.go @@ -200,6 +200,13 @@ func TestStatement(t *testing.T) { `List originalGroups = Database.query('SELECT ' + String.join(new List(qlgfields.keySet()), ',') + ' FROM SBQQ__QuoteLineGroup__c WHERE Id IN :originalGroupIds');`}, + + { + `public static final List MY_IMPORTANT_FIELDS = new List{ My_Object__c.The_Field__c, My_Object__c.The_Better_Field__c };`, + `public static final List MY_IMPORTANT_FIELDS = new List{ + My_Object__c.The_Field__c, + My_Object__c.The_Better_Field__c +};`}, } for _, tt := range tests { input := antlr.NewInputStream(tt.input) diff --git a/formatter/visitors.go b/formatter/visitors.go index ab83d36..e8cdcfe 100644 --- a/formatter/visitors.go +++ b/formatter/visitors.go @@ -1199,7 +1199,7 @@ func (v *FormatVisitor) VisitSetCreatorRest(ctx *parser.SetCreatorRestContext) i for _, i := range ctx.AllExpression() { expressions = append(expressions, v.visitRule(i).(string)) } - if len(ctx.GetText()) > 80 { + if len(ctx.GetText()) > 50 { return fmt.Sprintf("{\n%s\n}", v.indent(strings.Join(expressions, ",\n"))) } return fmt.Sprintf("{ %s }", strings.Join(expressions, ", "))