Update go tool dependencies (#32916) (#33355)

silverwind · web-flow · commit 987d0144684e · 2025-01-22T11:37:47.000-05:00
Clean cherry-pick of #32916. Update all go tool dependencies to latest version.
diff --git a/Makefile b/Makefile
@@ -26,17 +26,17 @@ COMMA := ,
 XGO_VERSION := go-1.23.x
 
 AIR_PACKAGE ?= github.com/air-verse/air@v1
-EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0
+EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.0.3
 GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0
 GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
-GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11
-MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.5.1
+GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.12
+MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
 GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
 ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1
-GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.15.3
+GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.17.0
 
 DOCKER_IMAGE ?= gitea/gitea
 DOCKER_TAG ?= latest
diff --git a/modules/markup/common/linkify.go b/modules/markup/common/linkify.go
@@ -24,7 +24,7 @@ type GlobalVarsType struct {
 	LinkRegex   *regexp.Regexp // fast matching a URL link, no any extra validation.
 }
 
-var GlobalVars = sync.OnceValue[*GlobalVarsType](func() *GlobalVarsType {
+var GlobalVars = sync.OnceValue(func() *GlobalVarsType {
 	v := &GlobalVarsType{}
 	v.wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`)
 	v.LinkRegex, _ = xurls.StrictMatchingScheme("https?://")
diff --git a/modules/markup/html.go b/modules/markup/html.go
@@ -42,7 +42,7 @@ type globalVarsType struct {
 	nulCleaner *strings.Replacer
 }
 
-var globalVars = sync.OnceValue[*globalVarsType](func() *globalVarsType {
+var globalVars = sync.OnceValue(func() *globalVarsType {
 	v := &globalVarsType{}
 	// NOTE: All below regex matching do not perform any extra validation.
 	// Thus a link is produced even if the linked entity does not exist.
diff --git a/modules/markup/internal/renderinternal.go b/modules/markup/internal/renderinternal.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/net/html"
 )
 
-var reAttrClass = sync.OnceValue[*regexp.Regexp](func() *regexp.Regexp {
+var reAttrClass = sync.OnceValue(func() *regexp.Regexp {
 	// TODO: it isn't a problem at the moment because our HTML contents are always well constructed
 	return regexp.MustCompile(`(<[^>]+)\s+class="([^"]+)"([^>]*>)`)
 })
diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go
@@ -112,7 +112,7 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa
 }
 
 // it is copied from old code, which is quite doubtful whether it is correct
-var reValidIconName = sync.OnceValue[*regexp.Regexp](func() *regexp.Regexp {
+var reValidIconName = sync.OnceValue(func() *regexp.Regexp {
 	return regexp.MustCompile(`^[-\w]+$`) // old: regexp.MustCompile("^[a-z ]+$")
 })
 
diff --git a/modules/util/time_str.go b/modules/util/time_str.go
@@ -25,7 +25,7 @@ type timeStrGlobalVarsType struct {
 // In the future, it could be some configurable options to help users
 // to convert the working time to different units.
 
-var timeStrGlobalVars = sync.OnceValue[*timeStrGlobalVarsType](func() *timeStrGlobalVarsType {
+var timeStrGlobalVars = sync.OnceValue(func() *timeStrGlobalVarsType {
 	v := &timeStrGlobalVarsType{}
 	v.re = regexp.MustCompile(`(?i)(\d+)\s*([hms])`)
 	v.units = []struct {
diff --git a/modules/util/util_test.go b/modules/util/util_test.go
@@ -242,10 +242,10 @@ func TestReserveLineBreakForTextarea(t *testing.T) {
 }
 
 func TestOptionalArg(t *testing.T) {
-	foo := func(other any, optArg ...int) int {
+	foo := func(_ any, optArg ...int) int {
 		return OptionalArg(optArg)
 	}
-	bar := func(other any, optArg ...int) int {
+	bar := func(_ any, optArg ...int) int {
 		return OptionalArg(optArg, 42)
 	}
 	assert.Equal(t, 0, foo(nil))
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -701,9 +701,6 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 
 	if ctx.Written() {
 		return
-	} else if prInfo == nil {
-		ctx.NotFound("ViewPullFiles", nil)
-		return
 	}
 
 	headCommitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type GlobalVarsType struct {`
`24`	`24`	`LinkRegex *regexp.Regexp // fast matching a URL link, no any extra validation.`
`25`	`25`	`}`
`26`	`26`
`27`		`-var GlobalVars = sync.OnceValue[GlobalVarsType](func() GlobalVarsType {`
	`27`	`+var GlobalVars = sync.OnceValue(func() *GlobalVarsType {`
`28`	`28`	`v := &GlobalVarsType{}`
`29`	`29`	v.wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/\|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`)
`30`	`30`	`v.LinkRegex, _ = xurls.StrictMatchingScheme("https?://")`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type globalVarsType struct {`
`42`	`42`	`nulCleaner *strings.Replacer`
`43`	`43`	`}`
`44`	`44`
`45`		`-var globalVars = sync.OnceValue[globalVarsType](func() globalVarsType {`
	`45`	`+var globalVars = sync.OnceValue(func() *globalVarsType {`
`46`	`46`	`v := &globalVarsType{}`
`47`	`47`	`// NOTE: All below regex matching do not perform any extra validation.`
`48`	`48`	`// Thus a link is produced even if the linked entity does not exist.`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"golang.org/x/net/html"`
`18`	`18`	`)`
`19`	`19`
`20`		`-var reAttrClass = sync.OnceValue[regexp.Regexp](func() regexp.Regexp {`
	`20`	`+var reAttrClass = sync.OnceValue(func() *regexp.Regexp {`
`21`	`21`	`// TODO: it isn't a problem at the moment because our HTML contents are always well constructed`
`22`	`22`	return regexp.MustCompile(`(<[^>]+)\s+class="([^"]+)"([^>]*>)`)
`23`	`23`	`})`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (g ASTTransformer) Transform(node ast.Document, reader text.Reader, pc pa`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// it is copied from old code, which is quite doubtful whether it is correct`
`115`		`-var reValidIconName = sync.OnceValue[regexp.Regexp](func() regexp.Regexp {`
	`115`	`+var reValidIconName = sync.OnceValue(func() *regexp.Regexp {`
`116`	`116`	return regexp.MustCompile(`^[-\w]+$`) // old: regexp.MustCompile("^[a-z ]+$")
`117`	`117`	`})`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -242,10 +242,10 @@ func TestReserveLineBreakForTextarea(t *testing.T) {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`func TestOptionalArg(t *testing.T) {`
`245`		`- foo := func(other any, optArg ...int) int {`
	`245`	`+ foo := func(_ any, optArg ...int) int {`
`246`	`246`	`return OptionalArg(optArg)`
`247`	`247`	`}`
`248`		`- bar := func(other any, optArg ...int) int {`
	`248`	`+ bar := func(_ any, optArg ...int) int {`
`249`	`249`	`return OptionalArg(optArg, 42)`
`250`	`250`	`}`
`251`	`251`	`assert.Equal(t, 0, foo(nil))`
Original file line number	Diff line number	Diff line change
`@@ -701,9 +701,6 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi`
`701`	`701`
`702`	`702`	`if ctx.Written() {`
`703`	`703`	`return`
`704`		`- } else if prInfo == nil {`
`705`		`- ctx.NotFound("ViewPullFiles", nil)`
`706`		`- return`
`707`	`704`	`}`
`708`	`705`
`709`	`706`	`headCommitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())`