format with gofumpt (#18184)

* gofumpt -w -l .

* gofumpt -w -l -extra .

* Add linter

* manual fix

* change make fmt

4 files changed, 12 insertions, 14 deletions

diff --git a/modules/templates/base.go b/modules/templates/base.go
index f3052770ea..282019f826 100644
--- a/modules/templates/base.go
+++ b/modules/templates/base.go
@@ -29,7 +29,7 @@ func (vars Vars) Merge(another map[string]interface{}) Vars {
 
 // BaseVars returns all basic vars
 func BaseVars() Vars {
-	var startTime = time.Now()
+	startTime := time.Now()
 	return map[string]interface{}{
 		"IsLandingPageHome":          setting.LandingPageURL == setting.LandingPageHome,
 		"IsLandingPageExplore":       setting.LandingPageURL == setting.LandingPageExplore,
diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go
index fde58a4a70..c6c47a6c88 100644
--- a/modules/templates/dynamic.go
+++ b/modules/templates/dynamic.go
@@ -71,7 +71,6 @@ func Mailer() (*texttmpl.Template, *template.Template) {
 				}
 
 				content, err := os.ReadFile(path.Join(staticDir, filePath))
-
 				if err != nil {
 					log.Warn("Failed to read static %s template. %v", filePath, err)
 					continue
@@ -100,7 +99,6 @@ func Mailer() (*texttmpl.Template, *template.Template) {
 				}
 
 				content, err := os.ReadFile(path.Join(customDir, filePath))
-
 				if err != nil {
 					log.Warn("Failed to read custom %s template. %v", filePath, err)
 					continue
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 833b582073..255866e2ed 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -213,7 +213,7 @@ func NewFuncMap() []template.FuncMap {
 			}
 			return path
 		},
-		"DiffStatsWidth": func(adds int, dels int) string {
+		"DiffStatsWidth": func(adds, dels int) string {
 			return fmt.Sprintf("%f", float64(adds)/(float64(adds)+float64(dels))*100)
 		},
 		"Json": func(in interface{}) string {
@@ -286,7 +286,7 @@ func NewFuncMap() []template.FuncMap {
 			return util.MergeInto(dict, values...)
 		},
 		"percentage": func(n int, values ...int) float32 {
-			var sum = 0
+			sum := 0
 			for i := 0; i < len(values); i++ {
 				sum += values[i]
 			}
@@ -302,7 +302,7 @@ func NewFuncMap() []template.FuncMap {
 				"EventSourceUpdateTime": int(setting.UI.Notification.EventSourceUpdateTime / time.Millisecond),
 			}
 		},
-		"containGeneric": func(arr interface{}, v interface{}) bool {
+		"containGeneric": func(arr, v interface{}) bool {
 			arrV := reflect.ValueOf(arr)
 			if arrV.Kind() == reflect.String && reflect.ValueOf(v).Kind() == reflect.String {
 				return strings.Contains(arr.(string), v.(string))
@@ -478,7 +478,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {
 			return dict, nil
 		},
 		"percentage": func(n int, values ...int) float32 {
-			var sum = 0
+			sum := 0
 			for i := 0; i < len(values); i++ {
 				sum += values[i]
 			}
@@ -502,8 +502,10 @@ func NewTextFuncMap() []texttmpl.FuncMap {
 	}}
 }
 
-var widthRe = regexp.MustCompile(`width="[0-9]+?"`)
-var heightRe = regexp.MustCompile(`height="[0-9]+?"`)
+var (
+	widthRe  = regexp.MustCompile(`width="[0-9]+?"`)
+	heightRe = regexp.MustCompile(`height="[0-9]+?"`)
+)
 
 func parseOthers(defaultSize int, defaultClass string, others ...interface{}) (int, string) {
 	size := defaultSize
@@ -741,7 +743,7 @@ func RenderEmoji(text string) template.HTML {
 	return template.HTML(renderedText)
 }
 
-//ReactionToEmoji renders emoji for use in reactions
+// ReactionToEmoji renders emoji for use in reactions
 func ReactionToEmoji(reaction string) template.HTML {
 	val := emoji.FromCode(reaction)
 	if val != nil {
diff --git a/modules/templates/static.go b/modules/templates/static.go
index 5b06aaad8f..cb2978c2ef 100644
--- a/modules/templates/static.go
+++ b/modules/templates/static.go
@@ -47,7 +47,7 @@ func GetAsset(name string) ([]byte, error) {
 // GetAssetNames only for chi
 func GetAssetNames() []string {
 	realFS := Assets.(vfsgen۰FS)
-	var tmpls = make([]string, 0, len(realFS))
+	tmpls := make([]string, 0, len(realFS))
 	for k := range realFS {
 		tmpls = append(tmpls, "templates/"+k[1:])
 	}
@@ -76,7 +76,6 @@ func Mailer() (*texttmpl.Template, *template.Template) {
 		}
 
 		content, err := Asset(assetPath)
-
 		if err != nil {
 			log.Warn("Failed to read embedded %s template. %v", assetPath, err)
 			continue
@@ -111,7 +110,6 @@ func Mailer() (*texttmpl.Template, *template.Template) {
 				}
 
 				content, err := os.ReadFile(path.Join(customDir, filePath))
-
 				if err != nil {
 					log.Warn("Failed to read custom %s template. %v", filePath, err)
 					continue
@@ -142,7 +140,7 @@ func Asset(name string) ([]byte, error) {
 
 func AssetNames() []string {
 	realFS := Assets.(vfsgen۰FS)
-	var results = make([]string, 0, len(realFS))
+	results := make([]string, 0, len(realFS))
 	for k := range realFS {
 		results = append(results, k[1:])
 	}