zhanshi/goldmark
1
0
Fork 0
mirror of https://github.com/yuin/goldmark synced 2025-03-04 23:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #70, #74

Browse source
This commit is contained in:
yuin 2019-12-22 22:27:39 +09:00
parent efd5960110
commit 12851a08ba
3 changed files with 30 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extension/_test/linkify.txt
View file

@ -137,3 +137,19 @@ https://github.com?q=stars:>1
//- - - - - - - - -//
<p><a href="https://github.com?q=stars:%3E1">https://github.com?q=stars:&gt;1</a></p>
//= = = = = = = = = = = = = = = = = = = = = = = =//
14
//- - - - - - - - -//
[https://google.com](https://google.com)
//- - - - - - - - -//
<p><a href="https://google.com">https://google.com</a></p>
//= = = = = = = = = = = = = = = = = = = = = = = =//
15
//- - - - - - - - -//
This is a `git@github.com:vim/vim`
//- - - - - - - - -//
<p>This is a <code>git@github.com:vim/vim</code></p>
//= = = = = = = = = = = = = = = = = = = = = = = =//

46
extension/linkify.go
View file

@ -36,6 +36,9 @@ var protoFTP = []byte("ftp:")
var domainWWW = []byte("www.")
func (s *linkifyParser) Parse(parent ast.Node, block text.Reader, pc parser.Context) ast.Node {
if pc.IsInLinkLabel() {
return nil
}
line, segment := block.PeekLine()
consumes := 0
start := segment.Start
@ -89,6 +92,9 @@ func (s *linkifyParser) Parse(parent ast.Node, block text.Reader, pc parser.Cont
}
}
if m == nil {
if len(line) > 0 && util.IsPunct(line[0]) {
return nil
}
typ = ast.AutoLinkEmail
stop := util.FindEmailIndex(line)
if stop < 0 {
@ -132,43 +138,6 @@ func (s *linkifyParser) CloseBlock(parent ast.Node, pc parser.Context) {
type linkify struct {
}
type linkifyASTTransformer struct {
}
var defaultLinkifyASTTransformer = &linkifyASTTransformer{}
// NewLinkifyASTTransformer returns a new parser.ASTTransformer that
// is related to AutoLink.
func NewLinkifyASTTransformer() parser.ASTTransformer {
return defaultLinkifyASTTransformer
}
func (a *linkifyASTTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
var autoLinks []*ast.AutoLink
_ = ast.Walk(node, func(n ast.Node, entering bool) (ast.WalkStatus, error) {
if entering {
if autoLink, ok := n.(*ast.AutoLink); ok {
autoLinks = append(autoLinks, autoLink)
}
}
return ast.WalkContinue, nil
})
for _, autoLink := range autoLinks {
nested := false
for p := autoLink.Parent(); p != nil; p = p.Parent() {
if _, ok := p.(*ast.Link); ok {
nested = true
break
}
}
if nested {
parent := autoLink.Parent()
parent.ReplaceChild(parent, autoLink, ast.NewString(autoLink.Label(reader.Source())))
}
}
}
// Linkify is an extension that allow you to parse text that seems like a URL.
var Linkify = &linkify{}
@ -177,8 +146,5 @@ func (e *linkify) Extend(m goldmark.Markdown) {
parser.WithInlineParsers(
util.Prioritized(NewLinkifyParser(), 999),
),
parser.WithASTTransformers(
util.Prioritized(NewLinkifyASTTransformer(), 999),
),
)
}

8
parser/parser.go
View file

@ -196,6 +196,9 @@ type Context interface {
// LastOpenedBlock returns a last node that is currently in parsing.
LastOpenedBlock() Block
// IsInLinkLabel returns true if current position seems to be in link label.
IsInLinkLabel() bool
}
// A ContextConfig struct is a data structure that holds configuration of the Context.
@ -378,6 +381,11 @@ func (p *parseContext) LastOpenedBlock() Block {
return Block{}
}
func (p *parseContext) IsInLinkLabel() bool {
tlist := p.Get(linkLabelStateKey)
return tlist != nil
}
// State represents parser's state.
// State is designed to use as a bit flag.
type State int