mirror of
https://github.com/yuin/goldmark
synced 2025-03-04 23:04:52 +00:00
Fix shadow declarations
This commit is contained in:
parent
9f9f8f0e5e
commit
748be0c096
6 changed files with 20 additions and 22 deletions
|
|
@ -436,7 +436,7 @@ func Walk(n Node, walker Walker) error {
|
|||
}
|
||||
if status != WalkSkipChildren {
|
||||
for c := n.FirstChild(); c != nil; c = c.NextSibling() {
|
||||
if err := Walk(c, walker); err != nil {
|
||||
if err = Walk(c, walker); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,10 +84,10 @@ func (b *tableParagraphTransformer) parseRow(segment text.Segment, alignments []
|
|||
closure = len(line[pos:])
|
||||
}
|
||||
node := ast.NewTableCell()
|
||||
segment := text.NewSegment(segment.Start+pos, segment.Start+pos+closure)
|
||||
segment = segment.TrimLeftSpace(source)
|
||||
segment = segment.TrimRightSpace(source)
|
||||
node.Lines().Append(segment)
|
||||
seg := text.NewSegment(segment.Start+pos, segment.Start+pos+closure)
|
||||
seg = seg.TrimLeftSpace(source)
|
||||
seg = seg.TrimRightSpace(source)
|
||||
node.Lines().Append(seg)
|
||||
node.Alignment = alignment
|
||||
row.AppendChild(row, node)
|
||||
pos += closure + 1
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@ package parser
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"strconv"
|
||||
|
||||
"github.com/yuin/goldmark/text"
|
||||
"github.com/yuin/goldmark/util"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
var attrNameID = []byte("id")
|
||||
|
|
@ -104,7 +105,7 @@ func parseAttribute(reader text.Reader) (Attribute, bool) {
|
|||
}
|
||||
i := 0
|
||||
for ; i < len(line); i++ {
|
||||
c := line[i]
|
||||
c = line[i]
|
||||
if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
|
||||
(c >= '0' && c <= '9') ||
|
||||
c == '_' || c == ':' || c == '.' || c == '-') {
|
||||
|
|
@ -125,7 +126,6 @@ func parseAttribute(reader text.Reader) (Attribute, bool) {
|
|||
return Attribute{}, false
|
||||
}
|
||||
return Attribute{Name: name, Value: value}, true
|
||||
|
||||
}
|
||||
|
||||
func parseAttributeValue(reader text.Reader) (interface{}, bool) {
|
||||
|
|
@ -153,7 +153,6 @@ func parseAttributeValue(reader text.Reader) (interface{}, bool) {
|
|||
return nil, false
|
||||
}
|
||||
return value, true
|
||||
|
||||
}
|
||||
|
||||
func parseAttributeArray(reader text.Reader) ([]interface{}, bool) {
|
||||
|
|
|
|||
|
|
@ -108,19 +108,19 @@ func (b *atxHeadingParser) Open(parent ast.Node, reader text.Reader, pc Context)
|
|||
start--
|
||||
closureClose := -1
|
||||
closureOpen := -1
|
||||
for i := start; i < stop; {
|
||||
c := line[i]
|
||||
if util.IsEscapedPunctuation(line, i) {
|
||||
i += 2
|
||||
} else if util.IsSpace(c) && i < stop-1 && line[i+1] == '#' {
|
||||
closureOpen = i + 1
|
||||
j := i + 1
|
||||
for ; j < stop && line[j] == '#'; j++ {
|
||||
for j := start; j < stop; {
|
||||
c := line[j]
|
||||
if util.IsEscapedPunctuation(line, j) {
|
||||
j += 2
|
||||
} else if util.IsSpace(c) && j < stop-1 && line[j+1] == '#' {
|
||||
closureOpen = j + 1
|
||||
k := j + 1
|
||||
for ; k < stop && line[k] == '#'; k++ {
|
||||
}
|
||||
closureClose = j
|
||||
closureClose = k
|
||||
break
|
||||
} else {
|
||||
i++
|
||||
j++
|
||||
}
|
||||
}
|
||||
if closureClose > 0 {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func (s *codeSpanParser) Parse(parent ast.Node, block text.Reader, pc Context) a
|
|||
}
|
||||
closure := i - oldi
|
||||
if closure == opener && (i+1 >= len(line) || line[i+1] != '`') {
|
||||
segment := segment.WithStop(segment.Start + i - closure)
|
||||
segment = segment.WithStop(segment.Start + i - closure)
|
||||
if !segment.IsEmpty() {
|
||||
node.AppendChild(node, ast.NewRawTextSegment(segment))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -903,7 +903,7 @@ retry:
|
|||
if w > 3 && !bp.CanAcceptIndentedLine() {
|
||||
continue
|
||||
}
|
||||
lastBlock := pc.LastOpenedBlock()
|
||||
lastBlock = pc.LastOpenedBlock()
|
||||
last := lastBlock.Node
|
||||
node, state := bp.Open(parent, reader, pc)
|
||||
if node != nil {
|
||||
|
|
@ -1177,5 +1177,4 @@ func (p *parser) parseBlock(block text.BlockReader, parent ast.Node, pc Context)
|
|||
for _, ip := range p.closeBlockers {
|
||||
ip.CloseBlock(parent, block, pc)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue