Fix Wrapping After Identifier Where Not Allowed

If we have an inner class, we can't wrap before calling a method on the class (or we would have to move the dot operator to the end of the line).
octoberswimmer · Dec 8, 2023 · 2998c4e · 2998c4e
1 parent 0fd753b
commit 2998c4e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/formatter/chain_test.go b/formatter/chain_test.go
@@ -21,6 +21,7 @@ func TestChain(t *testing.T) {
 		}{
 			{`Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('Business').getRecordTypeId()`, 3},
 			{`Fixtures.Contact(account).put(Contact.RecordTypeId, Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Person').getRecordTypeId()).put(Contact.My_Lookup__c, newRecord[0].Id).save()`, 4},
+			{`Fixtures.InquiryFactory.inquiry(program1).standardInquiry().patient(patient1).save()`, 4},
 		}
 
 	for _, tt := range tests {

diff --git a/formatter/format_test.go b/formatter/format_test.go
@@ -124,8 +124,7 @@ func TestStatement(t *testing.T) {
 			{
 				`Psychological__c psyc = Fixtures.psychological(inq).put(Psychological__c.RecordTypeId, Schema.SObjectType.Psychological__c.getRecordTypeInfosByDeveloperName().get('ICD_10').getRecordTypeId()).put(Psychological__c.Diagnosis_Lookup__c, newDiagnosis[0].Id).save();`,
 				`Psychological__c psyc = Fixtures.psychological(inq)
-	.put(Psychological__c.RecordTypeId, Schema.SObjectType.Psychological__c
-		.getRecordTypeInfosByDeveloperName()
+	.put(Psychological__c.RecordTypeId, Schema.SObjectType.Psychological__c.getRecordTypeInfosByDeveloperName()
 		.get('ICD_10')
 		.getRecordTypeId())
 	.put(Psychological__c.Diagnosis_Lookup__c, newDiagnosis[0].Id)
@@ -149,6 +148,13 @@ func TestStatement(t *testing.T) {
 	cl_record.Last_Placement__c != Trigger.OldMap.get(cl_record.Id).Last_Placement__c))) {
 	x = 1;
 }`},
+			{
+				// Don't wrap at what might be an inner class
+				`CRC_Inquiry__c inquiry1 = Fixtures.InquiryFactory.inquiry(program1).standardInquiry().patient(patient1).save();`,
+				`CRC_Inquiry__c inquiry1 = Fixtures.InquiryFactory.inquiry(program1)
+	.standardInquiry()
+	.patient(patient1)
+	.save();`},
 		}
 	for _, tt := range tests {
 		input := antlr.NewInputStream(tt.input)
@@ -164,7 +170,7 @@ func TestStatement(t *testing.T) {
 			t.Errorf("Unexpected result parsing apex")
 		}
 		if out != tt.output {
-			t.Errorf("unexpected format.  expected:\n%s;\ngot:\n%s\n", tt.output, out)
+			t.Errorf("unexpected format.  expected:\n%s\ngot:\n%s\n", tt.output, out)
 		}
 	}
 
@@ -198,7 +204,7 @@ func TestCompilationUnit(t *testing.T) {
 			t.Errorf("Unexpected result parsing apex")
 		}
 		if out != tt.output {
-			t.Errorf("unexpected format.  expected:\n%s;\ngot:\n%s\n", tt.output, out)
+			t.Errorf("unexpected format.  expected:\n%s\ngot:\n%s\n", tt.output, out)
 		}
 	}
 }
@@ -240,7 +246,7 @@ func TestSOQL(t *testing.T) {
 			t.Errorf("Unexpected result parsing apex")
 		}
 		if out != tt.output {
-			t.Errorf("unexpected format.  expected:\n%s;\ngot:\n%s\n", tt.output, out)
+			t.Errorf("unexpected format.  expected:\n%s\ngot:\n%s\n", tt.output, out)
 		}
 	}
 }
diff --git a/formatter/visitors.go b/formatter/visitors.go
@@ -531,9 +531,14 @@ func (v *FormatVisitor) VisitDotExpression(ctx *parser.DotExpressionContext) int
 			if depth == 0 {
 				depth = 1
 			}
-			switch ctx.Expression().(type) {
+			switch left := ctx.Expression().(type) {
 			case *parser.PrimaryExpressionContext:
 				log.Debug(fmt.Sprintf("NOT wrapping after between %q (%T)", expr, ctx.Expression()))
+			case *parser.DotExpressionContext:
+				if left.DotMethodCall() != nil {
+					log.Debug(fmt.Sprintf("%q is method call; safe to wrap before %q", expr, ctx.DotMethodCall().GetText()))
+					return expr.(string) + "\n" + v.indentTo(fmt.Sprintf("%s%s", dot, v.visitRule(ctx.DotMethodCall())), depth)
+				}
 			default:
 				log.Debug(fmt.Sprintf("Wrapping in between %q (%T) and %q", expr, ctx.Expression(), ctx.DotMethodCall().GetText()))
 				return expr.(string) + "\n" + v.indentTo(fmt.Sprintf("%s%s", dot, v.visitRule(ctx.DotMethodCall())), depth)