From cb50375e2b6abf0c79d4891e5e1ea775b9759cd2 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Mon, 20 Jun 2022 12:02:49 +0200
Subject: Add more linters to improve code readability (#19989)

Add nakedret, unconvert, wastedassign, stylecheck and nolintlint linters to improve code readability

- nakedret - https://github.com/alexkohler/nakedret - nakedret is a Go static analysis tool to find naked returns in functions greater than a specified function length.
- unconvert - https://github.com/mdempsky/unconvert - Remove unnecessary type conversions
- wastedassign - https://github.com/sanposhiho/wastedassign -  wastedassign finds wasted assignment statements.
- notlintlint -  Reports ill-formed or insufficient nolint directives
- stylecheck - https://staticcheck.io/docs/checks/#ST - keep style consistent
  - excluded: [ST1003 - Poorly chosen identifier](https://staticcheck.io/docs/checks/#ST1003) and [ST1005 - Incorrectly formatted error string](https://staticcheck.io/docs/checks/#ST1005)
---
 modules/markup/common/footnote.go   | 3 +--
 modules/markup/markdown/markdown.go | 4 ++--
 modules/markup/orgmode/orgmode.go   | 4 ++--
 modules/markup/sanitizer_test.go    | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'modules/markup')

diff --git a/modules/markup/common/footnote.go b/modules/markup/common/footnote.go
index 821b3e6387..d07f5e6090 100644
--- a/modules/markup/common/footnote.go
+++ b/modules/markup/common/footnote.go
@@ -203,9 +203,8 @@ func (b *footnoteBlockParser) Open(parent ast.Node, reader text.Reader, pc parse
 		return nil, parser.NoChildren
 	}
 	open := pos + 1
-	closes := 0
 	closure := util.FindClosure(line[pos+1:], '[', ']', false, false) //nolint
-	closes = pos + 1 + closure
+	closes := pos + 1 + closure
 	next := closes + 1
 	if closure > -1 {
 		if next >= len(line) || line[next] != ':' {
diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go
index 37e11e606f..4ce85dfc31 100644
--- a/modules/markup/markdown/markdown.go
+++ b/modules/markup/markdown/markdown.go
@@ -156,7 +156,7 @@ func actualRender(ctx *markup.RenderContext, input io.Reader, output io.Writer)
 
 		log.Warn("Unable to render markdown due to panic in goldmark: %v", err)
 		if log.IsDebug() {
-			log.Debug("Panic in markdown: %v\n%s", err, string(log.Stack(2)))
+			log.Debug("Panic in markdown: %v\n%s", err, log.Stack(2))
 		}
 	}()
 
@@ -185,7 +185,7 @@ func render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
 
 		log.Warn("Unable to render markdown due to panic in goldmark - will return raw bytes")
 		if log.IsDebug() {
-			log.Debug("Panic in markdown: %v\n%s", err, string(log.Stack(2)))
+			log.Debug("Panic in markdown: %v\n%s", err, log.Stack(2))
 		}
 		_, err = io.Copy(output, input)
 		if err != nil {
diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go
index 8c9f3b3da7..a78531720d 100644
--- a/modules/markup/orgmode/orgmode.go
+++ b/modules/markup/orgmode/orgmode.go
@@ -75,7 +75,7 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
 
 		if lexer == nil {
 			// include language-x class as part of commonmark spec
-			if _, err := w.WriteString(`<code class="chroma language-` + string(lang) + `">`); err != nil {
+			if _, err := w.WriteString(`<code class="chroma language-` + lang + `">`); err != nil {
 				return ""
 			}
 			if _, err := w.WriteString(html.EscapeString(source)); err != nil {
@@ -83,7 +83,7 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
 			}
 		} else {
 			// include language-x class as part of commonmark spec
-			if _, err := w.WriteString(`<code class="chroma language-` + string(lang) + `">`); err != nil {
+			if _, err := w.WriteString(`<code class="chroma language-` + lang + `">`); err != nil {
 				return ""
 			}
 			lexer = chroma.Coalesce(lexer)
diff --git a/modules/markup/sanitizer_test.go b/modules/markup/sanitizer_test.go
index a0753c4a56..7dfca7a468 100644
--- a/modules/markup/sanitizer_test.go
+++ b/modules/markup/sanitizer_test.go
@@ -55,7 +55,7 @@ func Test_Sanitizer(t *testing.T) {
 func TestSanitizeNonEscape(t *testing.T) {
 	descStr := "<scrİpt>&lt;script&gt;alert(document.domain)&lt;/script&gt;</scrİpt>"
 
-	output := template.HTML(Sanitize(string(descStr)))
+	output := template.HTML(Sanitize(descStr))
 	if strings.Contains(string(output), "<script>") {
 		t.Errorf("un-escaped <script> in output: %q", output)
 	}
-- 
cgit v1.2.3