fix lint

Author: wxiaoguang

routers/api/v1/misc/markup_test.go

@@ -22,7 +22,6 @@ import (
 const AppURL = "http://localhost:3000/"
 
 func testRenderMarkup(t *testing.T, mode string, wiki bool, filePath, text, expectedBody string, expectedCode int) {
-	t.Helper()
 	setting.AppURL = AppURL
 	context := "/gogits/gogs"
 	if !wiki {
@@ -44,7 +43,6 @@ func testRenderMarkup(t *testing.T, mode string, wiki bool, filePath, text, expe
 }
 
 func testRenderMarkdown(t *testing.T, mode string, wiki bool, text, responseBody string, responseCode int) {
-	t.Helper()
 	setting.AppURL = AppURL
 	context := "/gogits/gogs"
 	if !wiki {

routers/common/markup.go

@@ -5,7 +5,6 @@
 package common
 
 import (
-	"code.gitea.io/gitea/modules/setting"
 	"fmt"
 	"net/http"
 	"strings"
@@ -14,23 +13,24 @@ import (
 	"code.gitea.io/gitea/modules/httplib"
 	"code.gitea.io/gitea/modules/markup"
 	"code.gitea.io/gitea/modules/markup/markdown"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/services/context"
 )
 
 // RenderMarkup renders markup text for the /markup and /markdown endpoints
-func RenderMarkup(ctx *context.Base, repo *context.Repository, mode, text, pathContext, filePath string, wiki bool) {
-	// pathContext format is /subpath/{user}/{repo}/src/{branch, commit, tag}/{identifier/path}
+func RenderMarkup(ctx *context.Base, repo *context.Repository, mode, text, urlPathContext, filePath string, wiki bool) {
+	// urlPathContext format is /subpath/{user}/{repo}/src/{branch, commit, tag}/{identifier/path}
 	// for example: "/gitea/owner/repo/src/branch/features/feat-123"
 
 	// filePath is the path of the file to render if the end user is trying to preview a repo file (mode == "file")
 	// for example, when previewing file ""/gitea/owner/repo/src/branch/features/feat-123/doc/CHANGE.md", then filePath is "doc/CHANGE.md"
 	// and filePath will be used as RenderContext.RelativePath
 
-	markupType := ""
-	relativePath := ""
+	var markupType, relativePath string
+
 	links := markup.Links{AbsolutePrefix: true}
-	if pathContext != "" {
-		links.Base = fmt.Sprintf("%s%s", httplib.GuessCurrentHostURL(ctx), pathContext)
+	if urlPathContext != "" {
+		links.Base = fmt.Sprintf("%s%s", httplib.GuessCurrentHostURL(ctx), urlPathContext)
 	}
 
 	switch mode {
@@ -57,13 +57,12 @@ func RenderMarkup(ctx *context.Base, repo *context.Repository, mode, text, pathC
 		return
 	}
 
-	fields := strings.SplitN(strings.TrimPrefix(pathContext, setting.AppSubURL+"/"), "/", 5)
+	fields := strings.SplitN(strings.TrimPrefix(urlPathContext, setting.AppSubURL+"/"), "/", 5)
 	if len(fields) == 5 && fields[2] == "src" && fields[3] == "branch" {
-		links = markup.Links{
-			AbsolutePrefix: true,
-			Base:           fmt.Sprintf("%s%s/%s", httplib.GuessCurrentAppURL(ctx), fields[0], fields[1]), // provides "https://host/subpath/{user}/{repo}"
-			BranchPath:     strings.Join(fields[3:], "/"),
-		}
+		// they provide "https://host/subpath/{user}/{repo}" and "branch/features/feat-12" for links
+		absoluteBasePrefix := fmt.Sprintf("%s%s/%s", httplib.GuessCurrentAppURL(ctx), fields[0], fields[1])
+		refPath := strings.Join(fields[3:], "/")
+		links = markup.Links{AbsolutePrefix: true, Base: absoluteBasePrefix, BranchPath: refPath}
 	}
 
 	meta := map[string]string{}