From 2962aaafc4e2e5cac1596af80757d920c52bc389 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Jun 2025 16:48:58 +0200 Subject: [PATCH 1/6] Fix remaining issues after modernize formatting --- modules/actions/workflows.go | 4 ---- modules/setting/markup.go | 2 +- routers/install/install.go | 6 +----- routers/web/explore/code.go | 6 +----- routers/web/user/code.go | 6 +----- tests/integration/api_issue_test.go | 8 ++------ tests/integration/issue_test.go | 8 ++------ 7 files changed, 8 insertions(+), 32 deletions(-) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 5cdd45b046c22..964aaf7a7817e 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -569,8 +569,6 @@ func matchPullRequestReviewEvent(prPayload *api.PullRequestPayload, evt *jobpars for _, val := range vals { if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) { matched = true - } - if matched { break } } @@ -615,8 +613,6 @@ func matchPullRequestReviewCommentEvent(prPayload *api.PullRequestPayload, evt * for _, val := range vals { if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) { matched = true - } - if matched { break } } diff --git a/modules/setting/markup.go b/modules/setting/markup.go index afaaaa2831153..057b0650c30e3 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -149,7 +149,7 @@ func loadMarkupFrom(rootCfg ConfigProvider) { func newMarkupSanitizer(name string, sec ConfigSection) { rule, ok := createMarkupSanitizerRule(name, sec) if ok { - if after, ok0 := strings.CutPrefix(name, "sanitizer."); ok0 { + if after, found := strings.CutPrefix(name, "sanitizer."); found { names := strings.SplitN(after, ".", 2) name = names[0] } diff --git a/routers/install/install.go b/routers/install/install.go index 4b3eba78b3943..b9bc41dfcf887 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -99,11 +99,7 @@ func Install(ctx *context.Context) { form.SSLMode = setting.Database.SSLMode curDBType := setting.Database.Type.String() - var isCurDBTypeSupported bool - if slices.Contains(setting.SupportedDatabaseTypes, curDBType) { - isCurDBTypeSupported = true - } - if !isCurDBTypeSupported { + if !slices.Contains(setting.SupportedDatabaseTypes, curDBType) { curDBType = "mysql" } ctx.Data["CurDbType"] = curDBType diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 8bde983e3020c..3bb50ef39768a 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -94,11 +94,7 @@ func Code(ctx *context.Context) { loadRepoIDs := make([]int64, 0, len(searchResults)) for _, result := range searchResults { - var find bool - if slices.Contains(loadRepoIDs, result.RepoID) { - find = true - } - if !find { + if !slices.Contains(loadRepoIDs, result.RepoID) { loadRepoIDs = append(loadRepoIDs, result.RepoID) } } diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 20ab1405ddf02..11579c40a6eec 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -87,11 +87,7 @@ func CodeSearch(ctx *context.Context) { loadRepoIDs := make([]int64, 0, len(searchResults)) for _, result := range searchResults { - var find bool - if slices.Contains(loadRepoIDs, result.RepoID) { - find = true - } - if !find { + if !slices.Contains(loadRepoIDs, result.RepoID) { loadRepoIDs = append(loadRepoIDs, result.RepoID) } } diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index ce9c33c049fc3..5673ffd7f494d 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -267,9 +267,7 @@ func TestAPISearchIssues(t *testing.T) { defer tests.PrepareTestEnv(t)() // as this API was used in the frontend, it uses UI page size - expectedIssueCount := min( - // from the fixtures - 20, setting.UI.IssuePagingNum) + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures link, _ := url.Parse("/api/v1/repos/issues/search") token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue) @@ -370,9 +368,7 @@ func TestAPISearchIssuesWithLabels(t *testing.T) { defer tests.PrepareTestEnv(t)() // as this API was used in the frontend, it uses UI page size - expectedIssueCount := min( - // from the fixtures - 20, setting.UI.IssuePagingNum) + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures link, _ := url.Parse("/api/v1/repos/issues/search") token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 7b803cd54d499..622937dc050b3 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -488,9 +488,7 @@ func TestSearchIssues(t *testing.T) { session := loginUser(t, "user2") - expectedIssueCount := min( - // from the fixtures - 20, setting.UI.IssuePagingNum) + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures link, _ := url.Parse("/issues/search") req := NewRequest(t, "GET", link.String()) @@ -581,9 +579,7 @@ func TestSearchIssues(t *testing.T) { func TestSearchIssuesWithLabels(t *testing.T) { defer tests.PrepareTestEnv(t)() - expectedIssueCount := min( - // from the fixtures - 20, setting.UI.IssuePagingNum) + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures session := loginUser(t, "user1") link, _ := url.Parse("/issues/search") From 54138dcb0e2821c8a2b0069d792f8d4d87a62863 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Jun 2025 19:07:23 +0200 Subject: [PATCH 2/6] Update tests/integration/api_issue_test.go --- tests/integration/api_issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 5673ffd7f494d..a2f0980a69f40 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -267,7 +267,7 @@ func TestAPISearchIssues(t *testing.T) { defer tests.PrepareTestEnv(t)() // as this API was used in the frontend, it uses UI page size - expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // 20 is from the fixtures link, _ := url.Parse("/api/v1/repos/issues/search") token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue) From a03f5a4d2ec6087d56350f22869602e7dd0d8568 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Jun 2025 19:07:30 +0200 Subject: [PATCH 3/6] Update tests/integration/api_issue_test.go --- tests/integration/api_issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index a2f0980a69f40..370c90a10032a 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -368,7 +368,7 @@ func TestAPISearchIssuesWithLabels(t *testing.T) { defer tests.PrepareTestEnv(t)() // as this API was used in the frontend, it uses UI page size - expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // 20 is from the fixtures link, _ := url.Parse("/api/v1/repos/issues/search") token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue) From 4751699d5be5d1686a95c0f6e52ee187cbea1bc5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Jun 2025 19:07:37 +0200 Subject: [PATCH 4/6] Update tests/integration/issue_test.go --- tests/integration/issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 622937dc050b3..f2fa39181ec2c 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -579,7 +579,7 @@ func TestSearchIssues(t *testing.T) { func TestSearchIssuesWithLabels(t *testing.T) { defer tests.PrepareTestEnv(t)() - expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // 20 is from the fixtures session := loginUser(t, "user1") link, _ := url.Parse("/issues/search") From 3eea0c06c79d10dd82329bdb214517f061e89fae Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Jun 2025 19:07:44 +0200 Subject: [PATCH 5/6] Update tests/integration/issue_test.go --- tests/integration/issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index f2fa39181ec2c..aff8aeda836e1 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -488,7 +488,7 @@ func TestSearchIssues(t *testing.T) { session := loginUser(t, "user2") - expectedIssueCount := min(20, setting.UI.IssuePagingNum) // from the fixtures + expectedIssueCount := min(20, setting.UI.IssuePagingNum) // 20 is from the fixtures link, _ := url.Parse("/issues/search") req := NewRequest(t, "GET", link.String()) From 8fff80456733445c679bfdfd19551b5e06496631 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 18 Jun 2025 10:56:40 -0700 Subject: [PATCH 6/6] improvements --- modules/actions/workflows.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 964aaf7a7817e..e7677edc59e5b 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -565,16 +565,12 @@ func matchPullRequestReviewEvent(prPayload *api.PullRequestPayload, evt *jobpars actions = append(actions, "submitted", "edited") } - matched := false for _, val := range vals { if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) { - matched = true + matchTimes++ break } } - if matched { - matchTimes++ - } default: log.Warn("pull request review event unsupported condition %q", cond) } @@ -609,16 +605,12 @@ func matchPullRequestReviewCommentEvent(prPayload *api.PullRequestPayload, evt * actions = append(actions, "created", "edited") } - matched := false for _, val := range vals { if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) { - matched = true + matchTimes++ break } } - if matched { - matchTimes++ - } default: log.Warn("pull request review comment event unsupported condition %q", cond) }