Run `gopls modernize` on codebase by silverwind · Pull Request #34751 · go-gitea/gitea ·

Continue #33739. I ran modernize 3 times until it had nothing to fix, followed by fmt and fixed one lint issue. 🙏 that CI passes.

Recent modernize fixes: https://.com/golang/tools/commits/master/gopls/internal/analysis/modernize

Test failure TestChangeRepoFilesForUpdateWithFileRename is unrelated.

lunny · 2025-06-17T18:11:27Z

modules/actions/workflows.go

-break
-}
+if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) {
+matched = true


It can be break directly here.

lunny · 2025-06-17T18:11:41Z

modules/actions/workflows.go

-break
-}
+if slices.ContainsFunc(actions, glob.MustCompile(val, '/').Match) {
+matched = true


The same as above

BTW feel free to push any changes directly to this branch.

lunny · 2025-06-17T18:18:33Z

routers/install/install.go

-isCurDBTypeSupported = true
-break
-}
+if slices.Contains(setting.SupportedDatabaseTypes, curDBType) {


The 4 lines could be merged.

lunny · 2025-06-17T18:20:42Z

routers/web/user/code.go

-find = true
-break
-}
+if slices.Contains(loadRepoIDs, result.RepoID) {


merge the 4 lines

silverwind · 2025-06-17T18:21:15Z

tests/integration/issue_test.go

-}
+expectedIssueCount := min(
+// from the fixtures
+20, setting.UI.IssuePagingNum)


This formatting is not ideal, I will fix.

services/gitdiff/submodule_test.go

@lunny

I agree with @lunny, otherwise LGTM

Please wait for Refactor some file edit related code #34744 , otherwise there will be huge conflicts which are difficult to resolve.

It's large enough, and the auto-fixed code is good enough.

Let's leave the manual fixes to the future, to avoid introducing regressions.

wxiaoguang · 2025-06-18T01:35:48Z

tests/integration/issue_test.go

-}
+expectedIssueCount := min(
+// from the fixtures
+20, setting.UI.IssuePagingNum)


Mark another manual fix (let's do in the following up PRs)

wxiaoguang · 2025-06-18T01:36:04Z

tests/integration/api_issue_test.go

-}
+expectedIssueCount := min(
+// from the fixtures
+20, setting.UI.IssuePagingNum)


wxiaoguang · 2025-06-18T01:36:07Z

tests/integration/api_issue_test.go

-}
+expectedIssueCount := min(
+// from the fixtures
+20, setting.UI.IssuePagingNum)


wxiaoguang · 2025-06-18T01:37:28Z

routers/web/explore/code.go

-break
-}
+if slices.Contains(loadRepoIDs, result.RepoID) {
+find = true


wxiaoguang · 2025-06-18T01:38:27Z

modules/setting/markup.go

@@ -149,8 +149,8 @@ func loadMarkupFrom(rootCfg ConfigProvider) {
 func newMarkupSanitizer(name string, sec ConfigSection) {
 rule, ok := createMarkupSanitizerRule(name, sec)
 if ok {
-if strings.HasPrefix(name, "sanitizer.") {
-names := strings.SplitN(strings.TrimPrefix(name, "sanitizer."), ".", 2)
+if after, ok0 := strings.CutPrefix(name, "sanitizer."); ok0 {


maybe we can use this tool in ci steps?

maybe we can use this tool in ci steps?

gopls is slow enough.

* giteaofficial/main: Remove unused param `doer` (go-gitea#34545) Improve alignment of commit status icon on commit page (go-gitea#34750) Run `gopls modernize` on codebase (go-gitea#34751) Refactor some file edit related code (go-gitea#34744) [skip ci] Updated translations via Crowdin Fix ghost user in feeds when pushing in an actions, it should be gitea-actions (go-gitea#34703) upgrade orgmode to v1.8.0 (go-gitea#34721) Support title and body query parameters for new PRs (go-gitea#34537) Improve nuget/rubygems package registries (go-gitea#34741) Replace update repository function in some places (go-gitea#34566) remove unnecessary duplicate code (go-gitea#34733) fix: prevent double markdown link brackets when pasting URL (go-gitea#34745) Fix JS error for "select" dropdown (go-gitea#34743) [skip ci] Updated translations via Crowdin Allow renaming/moving binary/LFS files in the UI (go-gitea#34350) Clean bindata (go-gitea#34728) Refactor container and UI (go-gitea#34736) Prevent duplicate form submissions when creating forks (go-gitea#34714)

maybe we can use this tool in ci steps?

Yes that is the plan, at least as a initial lint-only step. Once we upgrade gopls, the gopls check command will enforce these fixes. Maybe later, they could be rolled into make fmt.

gopls is slow enough.

Yes, gopls check is slow, but I guess these additional checks won't slow it down much more. Ideally such checks would execute as part of golangci-lint, but first those two projects need to sort out their issues, see golangci/golangci-lint#686 (comment).

Followup #34751, fix all remaining marked issues. --------- Co-authored-by: Lunny Xiao <[email protected]>

Run gopls modernize on codebase

29823e0

GiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging.label Jun 17, 2025

-actions bot added modifies/apiThis PR adds API routes or modifies themmodifies/goPull requests that update Go codemodifies/cliPR changes something on the CLI, i.e. gitea doctor or gitea adminmodifies/migrations modifies/internal labels Jun 17, 2025

lunny reviewed Jun 17, 2025
View reviewed changes

silverwind commented Jun 17, 2025
View reviewed changes

lunny reviewed Jun 17, 2025
View reviewed changes

services/gitdiff/submodule_test.go Show resolved Hide resolved

delvh approved these changes Jun 17, 2025
View reviewed changes

GiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged.and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging.labels Jun 17, 2025

Merge branch 'main' into modernize2

341c5e6

Merge branch 'main' into modernize2

57f4e48

wxiaoguang approved these changes Jun 18, 2025
View reviewed changes

GiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged.labels Jun 18, 2025

wxiaoguang enabled auto-merge (squash) June 18, 2025 01:33

wxiaoguang reviewed Jun 18, 2025
View reviewed changes

tests/integration/api_issue_test.go
}
expectedIssueCount := min(
// from the fixtures
20, setting.UI.IssuePagingNum)
Copy link
Contributor
wxiaoguang Jun 18, 2025
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.

mark

wxiaoguang reviewed Jun 18, 2025
View reviewed changes

tests/integration/api_issue_test.go
}
expectedIssueCount := min(
// from the fixtures
20, setting.UI.IssuePagingNum)
Copy link
Contributor
wxiaoguang Jun 18, 2025
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.

mark

wxiaoguang reviewed Jun 18, 2025
View reviewed changes

routers/web/explore/code.go
break
}
if slices.Contains(loadRepoIDs, result.RepoID) {
find = true
Copy link
Contributor
wxiaoguang Jun 18, 2025
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.

mark

wxiaoguang reviewed Jun 18, 2025
View reviewed changes

wxiaoguang merged commit 1f35435 into go-gitea:main Jun 18, 2025
26 checks passed

GiteaBot added this to the 1.25.0 milestone Jun 18, 2025

wxiaoguang deleted the modernize2 branch June 18, 2025 02:35

silverwind mentioned this pull request Jun 18, 2025
Fix remaining issues after gopls modernize formatting #34771
Merged

silverwind added the type/refactoringExisting code has been cleaned up. There should be no new functionality.label Jun 18, 2025

lunny added a commit that referenced this pull request Jun 18, 2025

Fix remaining issues after gopls modernize formatting (#34771)

46a1d52
Followup #34751, fix all remaining marked issues. --------- Co-authored-by: Lunny Xiao <[email protected]>

Uh oh!

Uh oh!

Uh oh!

lunny Jun 17, 2025

Uh oh!

lunny Jun 17, 2025

Uh oh!

Uh oh!

lunny Jun 17, 2025

Uh oh!

lunny Jun 17, 2025

Uh oh!

silverwind Jun 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wxiaoguang Jun 18, 2025

Uh oh!

wxiaoguang Jun 18, 2025

Uh oh!

wxiaoguang Jun 18, 2025

Uh oh!

wxiaoguang Jun 18, 2025

Uh oh!

wxiaoguang Jun 18, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Conversation

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!