mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 23:42:25 -05:00 
			
		
		
		
	[chore]: Bump github.com/yuin/goldmark from 1.7.3 to 1.7.4 (#3059)
Bumps [github.com/yuin/goldmark](https://github.com/yuin/goldmark) from 1.7.3 to 1.7.4. - [Release notes](https://github.com/yuin/goldmark/releases) - [Commits](https://github.com/yuin/goldmark/compare/v1.7.3...v1.7.4) --- updated-dependencies: - dependency-name: github.com/yuin/goldmark dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								235bea04fd
							
						
					
				
			
			
				commit
				
					
						9c44d6aa47
					
				
			
		
					 6 changed files with 53 additions and 13 deletions
				
			
		
							
								
								
									
										3
									
								
								vendor/github.com/yuin/goldmark/markdown.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/yuin/goldmark/markdown.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -2,12 +2,13 @@ | |||
| package goldmark | ||||
| 
 | ||||
| import ( | ||||
| 	"io" | ||||
| 
 | ||||
| 	"github.com/yuin/goldmark/parser" | ||||
| 	"github.com/yuin/goldmark/renderer" | ||||
| 	"github.com/yuin/goldmark/renderer/html" | ||||
| 	"github.com/yuin/goldmark/text" | ||||
| 	"github.com/yuin/goldmark/util" | ||||
| 	"io" | ||||
| ) | ||||
| 
 | ||||
| // DefaultParser returns a new Parser that is configured by default values. | ||||
|  |  | |||
							
								
								
									
										53
									
								
								vendor/github.com/yuin/goldmark/parser/link.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										53
									
								
								vendor/github.com/yuin/goldmark/parser/link.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -126,13 +126,13 @@ func (s *linkParser) Parse(parent ast.Node, block text.Reader, pc Context) ast.N | |||
| 	if line[0] == '!' { | ||||
| 		if len(line) > 1 && line[1] == '[' { | ||||
| 			block.Advance(1) | ||||
| 			pc.Set(linkBottom, pc.LastDelimiter()) | ||||
| 			pushLinkBottom(pc) | ||||
| 			return processLinkLabelOpen(block, segment.Start+1, true, pc) | ||||
| 		} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if line[0] == '[' { | ||||
| 		pc.Set(linkBottom, pc.LastDelimiter()) | ||||
| 		pushLinkBottom(pc) | ||||
| 		return processLinkLabelOpen(block, segment.Start, false, pc) | ||||
| 	} | ||||
| 
 | ||||
|  | @ -143,6 +143,7 @@ func (s *linkParser) Parse(parent ast.Node, block text.Reader, pc Context) ast.N | |||
| 	} | ||||
| 	last := tlist.(*linkLabelState).Last | ||||
| 	if last == nil { | ||||
| 		_ = popLinkBottom(pc) | ||||
| 		return nil | ||||
| 	} | ||||
| 	block.Advance(1) | ||||
|  | @ -151,11 +152,13 @@ func (s *linkParser) Parse(parent ast.Node, block text.Reader, pc Context) ast.N | |||
| 	//  > A link label can have at most 999 characters inside the square brackets. | ||||
| 	if linkLabelStateLength(tlist.(*linkLabelState)) > 998 { | ||||
| 		ast.MergeOrReplaceTextSegment(last.Parent(), last, last.Segment) | ||||
| 		_ = popLinkBottom(pc) | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	if !last.IsImage && s.containsLink(last) { // a link in a link text is not allowed | ||||
| 		ast.MergeOrReplaceTextSegment(last.Parent(), last, last.Segment) | ||||
| 		_ = popLinkBottom(pc) | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
|  | @ -169,6 +172,7 @@ func (s *linkParser) Parse(parent ast.Node, block text.Reader, pc Context) ast.N | |||
| 		link, hasValue = s.parseReferenceLink(parent, last, block, pc) | ||||
| 		if link == nil && hasValue { | ||||
| 			ast.MergeOrReplaceTextSegment(last.Parent(), last, last.Segment) | ||||
| 			_ = popLinkBottom(pc) | ||||
| 			return nil | ||||
| 		} | ||||
| 	} | ||||
|  | @ -182,12 +186,14 @@ func (s *linkParser) Parse(parent ast.Node, block text.Reader, pc Context) ast.N | |||
| 		//  > A link label can have at most 999 characters inside the square brackets. | ||||
| 		if len(maybeReference) > 999 { | ||||
| 			ast.MergeOrReplaceTextSegment(last.Parent(), last, last.Segment) | ||||
| 			_ = popLinkBottom(pc) | ||||
| 			return nil | ||||
| 		} | ||||
| 
 | ||||
| 		ref, ok := pc.Reference(util.ToLinkReference(maybeReference)) | ||||
| 		if !ok { | ||||
| 			ast.MergeOrReplaceTextSegment(last.Parent(), last, last.Segment) | ||||
| 			_ = popLinkBottom(pc) | ||||
| 			return nil | ||||
| 		} | ||||
| 		link = ast.NewLink() | ||||
|  | @ -230,11 +236,7 @@ func processLinkLabelOpen(block text.Reader, pos int, isImage bool, pc Context) | |||
| } | ||||
| 
 | ||||
| func (s *linkParser) processLinkLabel(parent ast.Node, link *ast.Link, last *linkLabelState, pc Context) { | ||||
| 	var bottom ast.Node | ||||
| 	if v := pc.Get(linkBottom); v != nil { | ||||
| 		bottom = v.(ast.Node) | ||||
| 	} | ||||
| 	pc.Set(linkBottom, nil) | ||||
| 	bottom := popLinkBottom(pc) | ||||
| 	ProcessDelimiters(bottom, pc) | ||||
| 	for c := last.NextSibling(); c != nil; { | ||||
| 		next := c.NextSibling() | ||||
|  | @ -395,6 +397,43 @@ func parseLinkTitle(block text.Reader) ([]byte, bool) { | |||
| 	return nil, false | ||||
| } | ||||
| 
 | ||||
| func pushLinkBottom(pc Context) { | ||||
| 	bottoms := pc.Get(linkBottom) | ||||
| 	b := pc.LastDelimiter() | ||||
| 	if bottoms == nil { | ||||
| 		pc.Set(linkBottom, b) | ||||
| 		return | ||||
| 	} | ||||
| 	if s, ok := bottoms.([]ast.Node); ok { | ||||
| 		pc.Set(linkBottom, append(s, b)) | ||||
| 		return | ||||
| 	} | ||||
| 	pc.Set(linkBottom, []ast.Node{bottoms.(ast.Node), b}) | ||||
| } | ||||
| 
 | ||||
| func popLinkBottom(pc Context) ast.Node { | ||||
| 	bottoms := pc.Get(linkBottom) | ||||
| 	if bottoms == nil { | ||||
| 		return nil | ||||
| 	} | ||||
| 	if v, ok := bottoms.(ast.Node); ok { | ||||
| 		pc.Set(linkBottom, nil) | ||||
| 		return v | ||||
| 	} | ||||
| 	s := bottoms.([]ast.Node) | ||||
| 	v := s[len(s)-1] | ||||
| 	n := s[0 : len(s)-1] | ||||
| 	switch len(n) { | ||||
| 	case 0: | ||||
| 		pc.Set(linkBottom, nil) | ||||
| 	case 1: | ||||
| 		pc.Set(linkBottom, n[0]) | ||||
| 	default: | ||||
| 		pc.Set(linkBottom, s[0:len(s)-1]) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
| 
 | ||||
| func (s *linkParser) CloseBlock(parent ast.Node, block text.Reader, pc Context) { | ||||
| 	pc.Set(linkBottom, nil) | ||||
| 	tlist := pc.Get(linkLabelStateKey) | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/github.com/yuin/goldmark/renderer/html/html.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/yuin/goldmark/renderer/html/html.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -779,7 +779,7 @@ func (r *Renderer) renderAttribute(w util.BufWriter, source []byte, n ast.Node) | |||
| 		} else if !c.HasChildren() { | ||||
| 			r.Writer.Write(w, c.Text(source)) | ||||
| 			if t, ok := c.(*ast.Text); ok && t.SoftLineBreak() { | ||||
| 				w.WriteByte('\n') | ||||
| 				_ = w.WriteByte('\n') | ||||
| 			} | ||||
| 		} else { | ||||
| 			r.renderAttribute(w, source, c) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue