From 8bd48afa87a6a62af32d798e06ff1e19ee8b58e4 Mon Sep 17 00:00:00 2001 From: yuvrajangadsingh Date: Thu, 5 Mar 2026 03:17:10 +0530 Subject: [PATCH] fix: share diffHeaderRegexp between changedFilesNames and extractFileName, fix gofmt --- pkg/cmd/pr/diff/diff.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/pr/diff/diff.go b/pkg/cmd/pr/diff/diff.go index 14b1b95cc..3dea0c4bc 100644 --- a/pkg/cmd/pr/diff/diff.go +++ b/pkg/cmd/pr/diff/diff.go @@ -303,8 +303,7 @@ func changedFilesNames(w io.Writer, r io.Reader) error { // `"`` + hello-\360\237\230\200-world" // // Where I'm using the `` to indicate a string to avoid confusion with the " character. - pattern := regexp.MustCompile(`(?:^|\n)diff\s--git.*\s(["]?)b/(.*)`) - matches := pattern.FindAllStringSubmatch(string(diff), -1) + matches := diffHeaderRegexp.FindAllStringSubmatch(string(diff), -1) for _, val := range matches { name := strings.TrimSpace(val[1] + val[2]) @@ -369,7 +368,7 @@ func isPrint(r rune) bool { return r == '\n' || r == '\r' || r == '\t' || unicode.IsPrint(r) } -var diffHeaderRegexp = regexp.MustCompile(`diff\s--git.*\s(["]?)b/(.*)`) +var diffHeaderRegexp = regexp.MustCompile(`(?:^|\n)diff\s--git.*\s(["]?)b/(.*)`) // filterDiff reads a unified diff and returns a new reader with file entries // matching any of the exclude patterns removed. @@ -405,7 +404,7 @@ func splitDiffSections(diff string) []string { break } sections = append(sections, diff[:idx+1]) // include the trailing \n - diff = diff[idx+1:] // next section starts at "diff --git" + diff = diff[idx+1:] // next section starts at "diff --git" } return sections }