Skip to content

Commit 2bc9893

Browse files
authored
Fix detailed reviewers formatting (#53)
1 parent d1d11c7 commit 2bc9893

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

internal/app/app.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,7 @@ func (a *App) addReviewStatusComment(allRequiredOwners codeowners.ReviewerGroups
315315
}
316316

317317
if a.Conf.DetailedReviewers {
318-
comment += "\n\n<details><summary>Show detailed file reviewers</summary>\n"
319-
comment += a.getFileOwnersMapToString(a.codeowners.FileRequired())
320-
comment += "</details>"
318+
comment += fmt.Sprintf("\n\n<details><summary>Show detailed file reviewers</summary>\n\n%s\n</details>", a.getFileOwnersMapToString(a.codeowners.FileRequired()))
321319
}
322320

323321
fiveDaysAgo := time.Now().AddDate(0, 0, -5)
@@ -461,7 +459,15 @@ func (a *App) printFileOwners(codeOwners codeowners.CodeOwners) {
461459

462460
func (a *App) getFileOwnersMapToString(fileReviewers map[string]codeowners.ReviewerGroups) string {
463461
builder := strings.Builder{}
464-
for file, reviewers := range fileReviewers {
462+
463+
files := make([]string, 0, len(fileReviewers))
464+
for file := range fileReviewers {
465+
files = append(files, file)
466+
}
467+
slices.Sort(files)
468+
469+
for _, file := range files {
470+
reviewers := fileReviewers[file]
465471
// builder.WriteString error return is always nil
466472
_, _ = fmt.Fprintf(&builder, "- %s: %+v\n", file, reviewers.Flatten())
467473
}

internal/app/app_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,13 +1228,14 @@ func TestCommentDetailedReviewers(t *testing.T) {
12281228
t.Errorf("unexpected error: %v", err)
12291229
}
12301230

1231-
DetailedReviewersSnippet := "\n\n<details><summary>Show detailed file reviewers</summary>\n" +
1231+
DetailedReviewersSnippet := "\n\n<details><summary>Show detailed file reviewers</summary>\n\n" +
12321232
"- file1.go: [@user1 @user2]\n" +
1233-
"- file2.go: [@user1]\n"
1233+
"- file2.go: [@user1]\n\n"
12341234

12351235
containsDetailedReviewersSnippet := strings.Contains(mockGH.AddCommentInput, DetailedReviewersSnippet)
12361236

12371237
if tc.detailedReviewers != containsDetailedReviewersSnippet {
1238+
t.Logf("AddCommentInput: %s", mockGH.AddCommentInput)
12381239
t.Errorf("expected comment to include detailed owners to be %t, got %t ",
12391240
tc.detailedReviewers, containsDetailedReviewersSnippet)
12401241
}

0 commit comments

Comments
 (0)