forked from gitea/gitea
Update to goldmark 1.3.3 (#15059)
Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
parent
d05539eb3e
commit
9ed9ed9ae0
2
go.mod
2
go.mod
|
@ -128,7 +128,7 @@ require (
|
||||||
github.com/xanzy/go-gitlab v0.44.0
|
github.com/xanzy/go-gitlab v0.44.0
|
||||||
github.com/xanzy/ssh-agent v0.3.0 // indirect
|
github.com/xanzy/ssh-agent v0.3.0 // indirect
|
||||||
github.com/yohcop/openid-go v1.0.0
|
github.com/yohcop/openid-go v1.0.0
|
||||||
github.com/yuin/goldmark v1.3.2
|
github.com/yuin/goldmark v1.3.3
|
||||||
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
|
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
|
||||||
github.com/yuin/goldmark-meta v1.0.0
|
github.com/yuin/goldmark-meta v1.0.0
|
||||||
go.jolheiser.com/hcaptcha v0.0.4
|
go.jolheiser.com/hcaptcha v0.0.4
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -1145,8 +1145,8 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.3.2 h1:YjHC5TgyMmHpicTgEqDN0Q96Xo8K6tLXPnmNOHXCgs0=
|
github.com/yuin/goldmark v1.3.3 h1:37BdQwPx8VOSic8eDSWee6QL9mRpZRm9VJp/QugNrW0=
|
||||||
github.com/yuin/goldmark v1.3.2/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
github.com/yuin/goldmark v1.3.3/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||||
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 h1:VWSxtAiQNh3zgHJpdpkpVYjTPqRE3P6UZCOPa1nRDio=
|
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 h1:VWSxtAiQNh3zgHJpdpkpVYjTPqRE3P6UZCOPa1nRDio=
|
||||||
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod h1:YLF3kDffRfUH/bTxOxHhV6lxwIB3Vfj91rEwNMS9MXo=
|
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod h1:YLF3kDffRfUH/bTxOxHhV6lxwIB3Vfj91rEwNMS9MXo=
|
||||||
github.com/yuin/goldmark-meta v1.0.0 h1:ScsatUIT2gFS6azqzLGUjgOnELsBOxMXerM3ogdJhAM=
|
github.com/yuin/goldmark-meta v1.0.0 h1:ScsatUIT2gFS6azqzLGUjgOnELsBOxMXerM3ogdJhAM=
|
||||||
|
|
|
@ -18,8 +18,9 @@ import (
|
||||||
var escapedPipeCellListKey = parser.NewContextKey()
|
var escapedPipeCellListKey = parser.NewContextKey()
|
||||||
|
|
||||||
type escapedPipeCell struct {
|
type escapedPipeCell struct {
|
||||||
Cell *ast.TableCell
|
Cell *ast.TableCell
|
||||||
Pos []int
|
Pos []int
|
||||||
|
Transformed bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// TableCellAlignMethod indicates how are table cells aligned in HTML format.indicates how are table cells aligned in HTML format.
|
// TableCellAlignMethod indicates how are table cells aligned in HTML format.indicates how are table cells aligned in HTML format.
|
||||||
|
@ -216,7 +217,7 @@ func (b *tableParagraphTransformer) parseRow(segment text.Segment, alignments []
|
||||||
break
|
break
|
||||||
} else if hasBacktick {
|
} else if hasBacktick {
|
||||||
if escapedCell == nil {
|
if escapedCell == nil {
|
||||||
escapedCell = &escapedPipeCell{node, []int{}}
|
escapedCell = &escapedPipeCell{node, []int{}, false}
|
||||||
escapedList := pc.ComputeIfAbsent(escapedPipeCellListKey,
|
escapedList := pc.ComputeIfAbsent(escapedPipeCellListKey,
|
||||||
func() interface{} {
|
func() interface{} {
|
||||||
return []*escapedPipeCell{}
|
return []*escapedPipeCell{}
|
||||||
|
@ -288,22 +289,34 @@ func (a *tableASTTransformer) Transform(node *gast.Document, reader text.Reader,
|
||||||
}
|
}
|
||||||
pc.Set(escapedPipeCellListKey, nil)
|
pc.Set(escapedPipeCellListKey, nil)
|
||||||
for _, v := range lst.([]*escapedPipeCell) {
|
for _, v := range lst.([]*escapedPipeCell) {
|
||||||
|
if v.Transformed {
|
||||||
|
continue
|
||||||
|
}
|
||||||
_ = gast.Walk(v.Cell, func(n gast.Node, entering bool) (gast.WalkStatus, error) {
|
_ = gast.Walk(v.Cell, func(n gast.Node, entering bool) (gast.WalkStatus, error) {
|
||||||
if n.Kind() != gast.KindCodeSpan {
|
if !entering || n.Kind() != gast.KindCodeSpan {
|
||||||
return gast.WalkContinue, nil
|
return gast.WalkContinue, nil
|
||||||
}
|
}
|
||||||
c := n.FirstChild()
|
|
||||||
for c != nil {
|
for c := n.FirstChild(); c != nil; {
|
||||||
next := c.NextSibling()
|
next := c.NextSibling()
|
||||||
if c.Kind() == gast.KindText {
|
if c.Kind() != gast.KindText {
|
||||||
t := c.(*gast.Text)
|
c = next
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parent := c.Parent()
|
||||||
|
ts := &c.(*gast.Text).Segment
|
||||||
|
n := c
|
||||||
|
for _, v := range lst.([]*escapedPipeCell) {
|
||||||
for _, pos := range v.Pos {
|
for _, pos := range v.Pos {
|
||||||
if t.Segment.Start <= pos && t.Segment.Stop > pos {
|
if ts.Start <= pos && pos < ts.Stop {
|
||||||
n1 := gast.NewRawTextSegment(t.Segment.WithStop(pos))
|
segment := n.(*gast.Text).Segment
|
||||||
n2 := gast.NewRawTextSegment(t.Segment.WithStart(pos + 1))
|
n1 := gast.NewRawTextSegment(segment.WithStop(pos))
|
||||||
n.InsertAfter(n, c, n1)
|
n2 := gast.NewRawTextSegment(segment.WithStart(pos + 1))
|
||||||
n.InsertAfter(n, n1, n2)
|
parent.InsertAfter(parent, n, n1)
|
||||||
n.RemoveChild(n, c)
|
parent.InsertAfter(parent, n1, n2)
|
||||||
|
parent.RemoveChild(parent, n)
|
||||||
|
n = n2
|
||||||
|
v.Transformed = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -798,7 +798,7 @@ github.com/xi2/xz
|
||||||
# github.com/yohcop/openid-go v1.0.0
|
# github.com/yohcop/openid-go v1.0.0
|
||||||
## explicit
|
## explicit
|
||||||
github.com/yohcop/openid-go
|
github.com/yohcop/openid-go
|
||||||
# github.com/yuin/goldmark v1.3.2
|
# github.com/yuin/goldmark v1.3.3
|
||||||
## explicit
|
## explicit
|
||||||
github.com/yuin/goldmark
|
github.com/yuin/goldmark
|
||||||
github.com/yuin/goldmark/ast
|
github.com/yuin/goldmark/ast
|
||||||
|
|
Loading…
Reference in New Issue