From 15ff7ba465d08caabf8ed37530fed4fa1114014e Mon Sep 17 00:00:00 2001 From: Andy Feller Date: Tue, 15 Apr 2025 08:00:47 -0400 Subject: [PATCH] Restore result.Total logic, fix formatting This change restores the original logic of passing the search total count logic as is to the result. Additionally, this undoes some of the contributor's formatting changes that increase the changed lines to review. --- pkg/search/searcher.go | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkg/search/searcher.go b/pkg/search/searcher.go index 155484ac9..6859c2149 100644 --- a/pkg/search/searcher.go +++ b/pkg/search/searcher.go @@ -87,13 +87,11 @@ func (s searcher) Code(query Query) (CodeResult, error) { return result, err } - result.IncompleteResults = page.IncompleteResults - // If we're going to reach the requested limit, only add that many items, // otherwise add all the results. itemsToAdd := min(len(page.Items), toRetrieve) - - result.Total += itemsToAdd + result.IncompleteResults = page.IncompleteResults + result.Total = page.Total result.Items = append(result.Items, page.Items[:itemsToAdd]...) toRetrieve = toRetrieve - itemsToAdd } @@ -122,11 +120,9 @@ func (s searcher) Commits(query Query) (CommitsResult, error) { return result, err } - result.IncompleteResults = page.IncompleteResults - itemsToAdd := min(len(page.Items), toRetrieve) - - result.Total += itemsToAdd + result.IncompleteResults = page.IncompleteResults + result.Total = page.Total result.Items = append(result.Items, page.Items[:itemsToAdd]...) toRetrieve = toRetrieve - itemsToAdd } @@ -154,10 +150,8 @@ func (s searcher) Repositories(query Query) (RepositoriesResult, error) { return result, err } - result.IncompleteResults = page.IncompleteResults - itemsToAdd := min(len(page.Items), toRetrieve) - + result.IncompleteResults = page.IncompleteResults result.Total += itemsToAdd result.Items = append(result.Items, page.Items[:itemsToAdd]...) toRetrieve = toRetrieve - itemsToAdd @@ -186,10 +180,8 @@ func (s searcher) Issues(query Query) (IssuesResult, error) { return result, err } - result.IncompleteResults = page.IncompleteResults - itemsToAdd := min(len(page.Items), toRetrieve) - + result.IncompleteResults = page.IncompleteResults result.Total += itemsToAdd result.Items = append(result.Items, page.Items[:itemsToAdd]...) toRetrieve = toRetrieve - itemsToAdd