fix

Author: wxiaoguang

models/repo/repo.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"html/template"
+	"maps"
 	"net"
 	"net/url"
 	"path/filepath"
@@ -479,6 +480,8 @@ func (repo *Repository) ComposeMetas(ctx context.Context) map[string]string {
 		metas := map[string]string{
 			"user": repo.OwnerName,
 			"repo": repo.Name,
+
+			"markdownLineBreakStyle": "comment",
 		}
 
 		unit, err := repo.GetUnit(ctx, unit.TypeExternalTracker)
@@ -516,11 +519,8 @@ func (repo *Repository) ComposeMetas(ctx context.Context) map[string]string {
 // ComposeDocumentMetas composes a map of metas for properly rendering documents
 func (repo *Repository) ComposeDocumentMetas(ctx context.Context) map[string]string {
 	if len(repo.DocumentRenderingMetas) == 0 {
-		metas := map[string]string{}
-		for k, v := range repo.ComposeMetas(ctx) {
-			metas[k] = v
-		}
-		repo.DocumentRenderingMetas = metas
+		repo.DocumentRenderingMetas = maps.Clone(repo.ComposeMetas(ctx))
+		repo.DocumentRenderingMetas["markdownLineBreakStyle"] = "document"
 	}
 	return repo.DocumentRenderingMetas
 }

modules/markup/html_internal_test.go

@@ -124,9 +124,8 @@ func TestRender_IssueIndexPattern2(t *testing.T) {
 		}
 		expectedNil := fmt.Sprintf(expectedFmt, links...)
 		testRenderIssueIndexPattern(t, s, expectedNil, &RenderContext{
-			Ctx:         git.DefaultContext,
-			Metas:       localMetas,
-			ContentMode: RenderContentAsComment,
+			Ctx:   git.DefaultContext,
+			Metas: localMetas,
 		})
 
 		class := "ref-issue"
@@ -139,9 +138,8 @@ func TestRender_IssueIndexPattern2(t *testing.T) {
 		}
 		expectedNum := fmt.Sprintf(expectedFmt, links...)
 		testRenderIssueIndexPattern(t, s, expectedNum, &RenderContext{
-			Ctx:         git.DefaultContext,
-			Metas:       numericMetas,
-			ContentMode: RenderContentAsComment,
+			Ctx:   git.DefaultContext,
+			Metas: numericMetas,
 		})
 	}
 

modules/markup/html_issue.go

@@ -67,8 +67,9 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
 		return
 	}
 
-	// crossLinkOnly if not comment and not wiki
-	crossLinkOnly := ctx.ContentMode != RenderContentAsTitle && ctx.ContentMode != RenderContentAsComment && ctx.ContentMode != RenderContentAsWiki
+	// crossLinkOnly: do not parse "#123", only parse "owner/repo#123"
+	// if there is no repo in the context, then the "#123" format can't be parsed
+	crossLinkOnly := ctx.Metas["repo"] == ""
 
 	var (
 		found bool

modules/markup/html_test.go

@@ -529,7 +529,7 @@ func TestRender_RelativeMedias(t *testing.T) {
 			Ctx:         git.DefaultContext,
 			Links:       links,
 			Metas:       localMetas,
-			ContentMode: util.Iif(isWiki, markup.RenderContentAsWiki, markup.RenderContentAsComment),
+			ContentMode: util.Iif(isWiki, markup.RenderContentAsWiki, ""),
 		}, input)
 		assert.NoError(t, err)
 		return strings.TrimSpace(string(buffer))

modules/markup/markdown/goldmark.go

@@ -75,11 +75,12 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa
 				// TODO: this was a quite unclear part, old code: `if metas["mode"] != "document" { use comment link break setting }`
 				// many places render non-comment contents with no mode=document, then these contents also use comment's hard line break setting
 				// especially in many tests.
+				markdownLineBreakStyle := ctx.Metas["markdownLineBreakStyle"]
 				if markup.RenderBehaviorForTesting.ForceHardLineBreak {
 					v.SetHardLineBreak(true)
-				} else if ctx.ContentMode == markup.RenderContentAsComment {
+				} else if markdownLineBreakStyle == "comment" {
 					v.SetHardLineBreak(setting.Markdown.EnableHardLineBreakInComments)
-				} else {
+				} else if markdownLineBreakStyle == "document" {
 					v.SetHardLineBreak(setting.Markdown.EnableHardLineBreakInDocuments)
 				}
 			}

modules/markup/markdown/markdown_test.go

@@ -1001,7 +1001,7 @@ space</p>
 		result, err := markdown.RenderString(&markup.RenderContext{
 			Ctx:         context.Background(),
 			Links:       c.Links,
-			ContentMode: util.Iif(c.IsWiki, markup.RenderContentAsWiki, markup.RenderContentAsDefault),
+			ContentMode: util.Iif(c.IsWiki, markup.RenderContentAsWiki, ""),
 		}, input)
 		assert.NoError(t, err, "Unexpected error in testcase: %v", i)
 		assert.Equal(t, c.Expected, string(result), "Unexpected result in testcase %v", i)

modules/markup/orgmode/orgmode_test.go

@@ -27,7 +27,7 @@ func TestRender_StandardLinks(t *testing.T) {
 				Base:       "/relative-path",
 				BranchPath: "branch/main",
 			},
-			ContentMode: util.Iif(isWiki, markup.RenderContentAsWiki, markup.RenderContentAsDefault),
+			ContentMode: util.Iif(isWiki, markup.RenderContentAsWiki, ""),
 		}, input)
 		assert.NoError(t, err)
 		assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))

modules/markup/render.go

@@ -29,12 +29,7 @@ const (
 
 type RenderContentMode string
 
-const (
-	RenderContentAsDefault RenderContentMode = "" // empty means "default", no special handling, maybe just a simple "document"
-	RenderContentAsComment RenderContentMode = "comment"
-	RenderContentAsTitle   RenderContentMode = "title"
-	RenderContentAsWiki    RenderContentMode = "wiki"
-)
+const RenderContentAsWiki RenderContentMode = "wiki"
 
 var RenderBehaviorForTesting struct {
 	// Markdown line break rendering has 2 default behaviors:
@@ -59,12 +54,16 @@ type RenderContext struct {
 	// for file mode, it could be left as empty, and will be detected by file extension in RelativePath
 	MarkupType string
 
-	// what the content will be used for: eg: for comment or for wiki? or just render a file?
+	// what the content will be used for: eg: for wiki?
 	ContentMode RenderContentMode
 
-	Links            Links             // special link references for rendering, especially when there is a branch/tree path
-	Metas            map[string]string // user&repo, format&style&regexp (for external issue pattern), teams&org (for mention), BranchNameSubURL(for iframe&asciicast)
-	DefaultLink      string            // TODO: need to figure out
+	Links Links // special link references for rendering, especially when there is a branch/tree path
+
+	// user&repo, format&style&regexp (for external issue pattern), teams&org (for mention), BranchNameSubURL(for iframe&asciicast)
+	// markdownLineBreakStyle(comment or document)
+	Metas map[string]string
+
+	DefaultLink      string // TODO: need to figure out
 	GitRepo          *git.Repository
 	Repo             gitrepo.Repository
 	ShaExistCache    map[string]bool

modules/markup/render_links.go

@@ -10,7 +10,7 @@ import (
 
 type Links struct {
 	AbsolutePrefix bool   // add absolute URL prefix to auto-resolved links like "#issue", but not for pre-provided links and medias
-	Base           string // base prefix for pre-provided links and medias (images, videos)
+	Base           string // base prefix for pre-provided links and medias (images, videos), usually it is the path to the repo
 	BranchPath     string // actually it is the ref path, eg: "branch/features/feat-12", "tag/v1.0"
 	TreePath       string // the dir of the file, eg: "doc" if the file "doc/CHANGE.md" is being rendered
 }

modules/templates/util_render.go

@@ -94,9 +94,8 @@ func (ut *RenderUtils) RenderCommitBody(msg string, metas map[string]string) tem
 	}
 
 	renderedMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
-		Ctx:         ut.ctx,
-		Metas:       metas,
-		ContentMode: markup.RenderContentAsComment,
+		Ctx:   ut.ctx,
+		Metas: metas,
 	}, template.HTMLEscapeString(msgLine))
 	if err != nil {
 		log.Error("RenderCommitMessage: %v", err)
@@ -117,9 +116,8 @@ func renderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML {
 // RenderIssueTitle renders issue/pull title with defined post processors
 func (ut *RenderUtils) RenderIssueTitle(text string, metas map[string]string) template.HTML {
 	renderedText, err := markup.RenderIssueTitle(&markup.RenderContext{
-		Ctx:         ut.ctx,
-		ContentMode: markup.RenderContentAsTitle,
-		Metas:       metas,
+		Ctx:   ut.ctx,
+		Metas: metas,
 	}, template.HTMLEscapeString(text))
 	if err != nil {
 		log.Error("RenderIssueTitle: %v", err)