From 8218e80bfc3a1f9ba02ce60f1acafdc0e57c5ae0 Mon Sep 17 00:00:00 2001
From: Mai-Lapyst
Date: Sat, 16 Mar 2024 08:18:47 +0100
Subject: [PATCH] Fix linting issues
---
modules/markup/file_preview.go | 22 ++++++++++++----------
modules/markup/html.go | 4 ++--
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go
index 646bf83630..be788aae4b 100644
--- a/modules/markup/file_preview.go
+++ b/modules/markup/file_preview.go
@@ -9,16 +9,15 @@ import (
"strings"
"code.gitea.io/gitea/modules/charset"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/translation"
"golang.org/x/net/html"
"golang.org/x/net/html/atom"
)
-var (
- // filePreviewPattern matches "http://domain/org/repo/src/commit/COMMIT/filepath#L1-L2"
- filePreviewPattern = regexp.MustCompile(`https?://((?:\S+/){3})src/commit/([0-9a-f]{4,64})/(\S+)#(L\d+(?:-L\d+)?)`)
-)
+// filePreviewPattern matches "http://domain/org/repo/src/commit/COMMIT/filepath#L1-L2"
+var filePreviewPattern = regexp.MustCompile(`https?://((?:\S+/){3})src/commit/([0-9a-f]{4,64})/(\S+)#(L\d+(?:-L\d+)?)`)
type FilePreview struct {
fileContent []template.HTML
@@ -82,7 +81,10 @@ func NewFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
lineCount := len(fileContent)
commitLinkBuffer := new(bytes.Buffer)
- html.Render(commitLinkBuffer, createLink(node.Data[m[0]:m[5]], commitSha[0:7], "text black"))
+ err = html.Render(commitLinkBuffer, createLink(node.Data[m[0]:m[5]], commitSha[0:7], "text black"))
+ if err != nil {
+ log.Error("failed to render commitLink: %v", err)
+ }
if len(lineSpecs) == 1 {
line, _ := strconv.Atoi(strings.TrimPrefix(lineSpecs[0], "L"))
@@ -117,7 +119,7 @@ func NewFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
return preview
}
-func (p *FilePreview) CreateHtml(locale translation.Locale) *html.Node {
+func (p *FilePreview) CreateHTML(locale translation.Locale) *html.Node {
table := &html.Node{
Type: html.ElementNode,
Data: atom.Table.String(),
@@ -257,13 +259,13 @@ func (p *FilePreview) CreateHtml(locale translation.Locale) *html.Node {
})
header.AppendChild(psubtitle)
- preview_node := &html.Node{
+ node := &html.Node{
Type: html.ElementNode,
Data: atom.Div.String(),
Attr: []html.Attribute{{Key: "class", Val: "file-preview-box"}},
}
- preview_node.AppendChild(header)
- preview_node.AppendChild(twrapper)
+ node.AppendChild(header)
+ node.AppendChild(twrapper)
- return preview_node
+ return node
}
diff --git a/modules/markup/html.go b/modules/markup/html.go
index 2e38c05f58..9a04e02fb8 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -1075,7 +1075,7 @@ func filePreviewPatternProcessor(ctx *RenderContext, node *html.Node) {
return
}
- preview_node := preview.CreateHtml(locale)
+ previewNode := preview.CreateHTML(locale)
// Specialized version of replaceContent, so the parent paragraph element is not destroyed from our div
before := node.Data[:preview.start]
@@ -1086,7 +1086,7 @@ func filePreviewPatternProcessor(ctx *RenderContext, node *html.Node) {
Type: html.RawNode,
Data: "
",
}, nextSibling)
- node.Parent.InsertBefore(preview_node, nextSibling)
+ node.Parent.InsertBefore(previewNode, nextSibling)
node.Parent.InsertBefore(&html.Node{
Type: html.RawNode,
Data: "" + after,