mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-11-04 00:11:04 +00:00 
			
		
		
		
	- When you use a link in a heading such as `# [Text](link)` (instead of the conventional `# Text`) the TOC should only show `Text` and not `[Text](link)`.
- Use the `mdutil.Text` to only get the text from actual text nodes and not the text that was provided in the markdown input.
- Regression of e2fddcf681
- Resolves forgejo/forgejo#6847
- Added integration test.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6853
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
		
	
			
		
			
				
	
	
		
			33 lines
		
	
	
	
		
			907 B
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
	
		
			907 B
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2024 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package markdown
 | 
						|
 | 
						|
import (
 | 
						|
	"fmt"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/modules/markup"
 | 
						|
	mdutil "code.gitea.io/gitea/modules/markup/markdown/util"
 | 
						|
	"code.gitea.io/gitea/modules/util"
 | 
						|
 | 
						|
	"github.com/yuin/goldmark/ast"
 | 
						|
	"github.com/yuin/goldmark/text"
 | 
						|
)
 | 
						|
 | 
						|
func (g *ASTTransformer) transformHeading(_ *markup.RenderContext, v *ast.Heading, reader text.Reader, tocList *[]markup.Header) {
 | 
						|
	for _, attr := range v.Attributes() {
 | 
						|
		if _, ok := attr.Value.([]byte); !ok {
 | 
						|
			v.SetAttribute(attr.Name, []byte(fmt.Sprintf("%v", attr.Value)))
 | 
						|
		}
 | 
						|
	}
 | 
						|
	txt := mdutil.Text(v, reader.Source())
 | 
						|
	header := markup.Header{
 | 
						|
		Text:  util.UnsafeBytesToString(txt),
 | 
						|
		Level: v.Level,
 | 
						|
	}
 | 
						|
	if id, found := v.AttributeString("id"); found {
 | 
						|
		header.ID = util.UnsafeBytesToString(id.([]byte))
 | 
						|
	}
 | 
						|
	*tocList = append(*tocList, header)
 | 
						|
	g.applyElementDir(v)
 | 
						|
}
 |