oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-01 17:38:33 +00:00
Code Wiki Activity

Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo) (#7367)

Browse source 
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
This commit is contained in:
Renovate Bot 2025-03-28 22:22:21 +00:00 • committed by forgejo-renovate-action
parent 51ff4970ec
commit fed2d81c44
427 changed files with 2043 additions and 2046 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/templates/htmlrenderer_test.go
View file

@ -66,7 +66,7 @@ func TestHandleError(t *testing.T) {
_, err = tmpl.Parse(s)
require.Error(t, err)
msg := h(err)
assert.EqualValues(t, strings.TrimSpace(expect), strings.TrimSpace(msg))
assert.Equal(t, strings.TrimSpace(expect), strings.TrimSpace(msg))
}
test("{{", p.handleGenericTemplateError, `
@ -103,5 +103,5 @@ god knows XXX
----------------------------------------------------------------------
`
actualMsg := p.handleExpectedEndError(errors.New("template: test:1: expected end; found XXX"))
assert.EqualValues(t, strings.TrimSpace(expectedMsg), strings.TrimSpace(actualMsg))
assert.Equal(t, strings.TrimSpace(expectedMsg), strings.TrimSpace(actualMsg))
}

18
modules/templates/scopedtmpl/scopedtmpl.go
View file

@ -192,21 +192,21 @@ func newScopedTemplateSet(all *template.Template, name string) (*scopedTemplateS
collectTemplates(nodeList.Nodes)
} else if node.Type() == parse.NodeIf {
nodeIf := node.(*parse.IfNode)
collectTemplates(nodeIf.BranchNode.List.Nodes)
if nodeIf.BranchNode.ElseList != nil {
collectTemplates(nodeIf.BranchNode.ElseList.Nodes)
collectTemplates(nodeIf.List.Nodes)
if nodeIf.ElseList != nil {
collectTemplates(nodeIf.ElseList.Nodes)
}
} else if node.Type() == parse.NodeRange {
nodeRange := node.(*parse.RangeNode)
collectTemplates(nodeRange.BranchNode.List.Nodes)
if nodeRange.BranchNode.ElseList != nil {
collectTemplates(nodeRange.BranchNode.ElseList.Nodes)
collectTemplates(nodeRange.List.Nodes)
if nodeRange.ElseList != nil {
collectTemplates(nodeRange.ElseList.Nodes)
}
} else if node.Type() == parse.NodeWith {
nodeWith := node.(*parse.WithNode)
collectTemplates(nodeWith.BranchNode.List.Nodes)
if nodeWith.BranchNode.ElseList != nil {
collectTemplates(nodeWith.BranchNode.ElseList.Nodes)
collectTemplates(nodeWith.List.Nodes)
if nodeWith.ElseList != nil {
collectTemplates(nodeWith.ElseList.Nodes)
}
}
}

5
modules/templates/util_misc.go
View file

@ -38,10 +38,11 @@ func SortArrow(normSort, revSort, urlSort string, isDefault bool) template.HTML
} else {
// if sort arg is in url test if it correlates with column header sort arguments
// the direction of the arrow should indicate the "current sort order", up means ASC(normal), down means DESC(rev)
if urlSort == normSort {
switch urlSort {
case normSort:
// the table is sorted with this header normal
return svg.RenderHTML("octicon-triangle-up", 16)
} else if urlSort == revSort {
case revSort:
// the table is sorted with this header reverse
return svg.RenderHTML("octicon-triangle-down", 16)
}

4
modules/templates/util_render_test.go
View file

@ -47,12 +47,12 @@ var testMetas = map[string]string{
func TestApostrophesInMentions(t *testing.T) {
rendered := RenderMarkdownToHtml(t.Context(), "@mention-user's comment")
assert.EqualValues(t, template.HTML("<p><a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a>&#39;s comment</p>\n"), rendered)
assert.Equal(t, template.HTML("<p><a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a>&#39;s comment</p>\n"), rendered)
}
func TestNonExistantUserMention(t *testing.T) {
rendered := RenderMarkdownToHtml(t.Context(), "@ThisUserDoesNotExist @mention-user")
assert.EqualValues(t, template.HTML("<p>@ThisUserDoesNotExist <a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a></p>\n"), rendered)
assert.Equal(t, template.HTML("<p>@ThisUserDoesNotExist <a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a></p>\n"), rendered)
}
func TestRenderCommitBody(t *testing.T) {

2
modules/templates/util_test.go
View file

@ -29,7 +29,7 @@ func TestDict(t *testing.T) {
for _, c := range cases {
got, err := dict(c.args...)
require.NoError(t, err)
assert.EqualValues(t, c.want, got)
assert.Equal(t, c.want, got)
}
bads := []struct {

2
modules/templates/vars/vars_test.go
View file

@ -61,7 +61,7 @@ func TestExpandVars(t *testing.T) {
for _, kase := range kases {
t.Run(kase.tmpl, func(t *testing.T) {
res, err := Expand(kase.tmpl, kase.data)
assert.EqualValues(t, kase.out, res)
assert.Equal(t, kase.out, res)
if kase.error {
require.Error(t, err)
} else {