aboutsummaryrefslogtreecommitdiffstats
path: root/models/issues
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2024-11-24 16:18:57 +0800
committerGitHub <noreply@github.com>2024-11-24 16:18:57 +0800
commit633785a5f3fe00789a6cba7cc0db1333de1e9c52 (patch)
tree2a2703ee9ed41c9caa508bd72c3fb5b52716af16 /models/issues
parentfa175c16949f09757ae85db6697cec327c44cba9 (diff)
downloadgitea-633785a5f3fe00789a6cba7cc0db1333de1e9c52.tar.gz
gitea-633785a5f3fe00789a6cba7cc0db1333de1e9c52.zip
Refactor markup render system (#32612)
This PR removes (almost) all path tricks, and introduces "renderhelper" package. Now we can clearly see the rendering behaviors for comment/file/wiki, more details are in "renderhelper" tests. Fix #31411 , fix #18592, fix #25632 and maybe more problems. (ps: fix #32608 by the way)
Diffstat (limited to 'models/issues')
-rw-r--r--models/issues/comment_code.go10
1 files changed, 3 insertions, 7 deletions
diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go
index 751550f37a..67a77ceb13 100644
--- a/models/issues/comment_code.go
+++ b/models/issues/comment_code.go
@@ -7,8 +7,8 @@ import (
"context"
"code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/renderhelper"
user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"xorm.io/builder"
@@ -112,12 +112,8 @@ func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issu
}
var err error
- rctx := markup.NewRenderContext(ctx).
- WithRepoFacade(issue.Repo).
- WithLinks(markup.Links{Base: issue.Repo.Link()}).
- WithMetas(issue.Repo.ComposeMetas(ctx))
- if comment.RenderedContent, err = markdown.RenderString(rctx,
- comment.Content); err != nil {
+ rctx := renderhelper.NewRenderContextRepoComment(ctx, issue.Repo)
+ if comment.RenderedContent, err = markdown.RenderString(rctx, comment.Content); err != nil {
return nil, err
}
}