status-im/markdown
2
0
Fork 0
mirror of https://github.com/status-im/markdown.git synced 2025-02-23 08:38:23 +00:00
Code Issues Projects Releases Wiki Activity

Go style: Html{Block|Span} -> HTML{Block|Span}

Browse Source
This commit is contained in:
Vytautas Šaltenis 2016-04-01 13:15:47 +03:00
parent 32802dbae5
commit 02a5ce37ff
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.go
View File

@ -414,7 +414,7 @@ func (p *parser) html(data []byte, doRender bool) int {
for end > 0 && data[end-1] == '\n' { for end > 0 && data[end-1] == '\n' {
end-- end--
} }
finalizeHtmlBlock(p.addBlock(HtmlBlock, data[:end])) finalizeHtmlBlock(p.addBlock(HTMLBlock, data[:end]))
} }
return i return i
@ -437,7 +437,7 @@ func (p *parser) htmlComment(data []byte, doRender bool) int {
for end > 0 && data[end-1] == '\n' { for end > 0 && data[end-1] == '\n' {
end-- end--
} }
block := p.addBlock(HtmlBlock, data[:end]) block := p.addBlock(HTMLBlock, data[:end])
finalizeHtmlBlock(block) finalizeHtmlBlock(block)
} }
return size return size
@ -470,7 +470,7 @@ func (p *parser) htmlHr(data []byte, doRender bool) int {
for end > 0 && data[end-1] == '\n' { for end > 0 && data[end-1] == '\n' {
end-- end--
} }
finalizeHtmlBlock(p.addBlock(HtmlBlock, data[:end])) finalizeHtmlBlock(p.addBlock(HTMLBlock, data[:end]))
} }
return size return size
} }

6
html.go
View File

@ -1127,7 +1127,7 @@ func (r *HTML) RenderNode(w io.Writer, node *Node, entering bool) {
} else { } else {
r.out(w, tag("/del", nil, false)) r.out(w, tag("/del", nil, false))
} }
case HtmlSpan: case HTMLSpan:
//if options.safe { //if options.safe {
// out(w, "<!-- raw HTML omitted -->") // out(w, "<!-- raw HTML omitted -->")
//} else { //} else {
@ -1201,7 +1201,7 @@ func (r *HTML) RenderNode(w io.Writer, node *Node, entering bool) {
// to be added and when not. // to be added and when not.
if node.Prev != nil { if node.Prev != nil {
t := node.Prev.Type t := node.Prev.Type
if t == HtmlBlock || t == List || t == Paragraph || t == Header || t == CodeBlock || t == BlockQuote || t == HorizontalRule { if t == HTMLBlock || t == List || t == Paragraph || t == Header || t == CodeBlock || t == BlockQuote || t == HorizontalRule {
r.cr(w) r.cr(w)
} }
} }
@ -1225,7 +1225,7 @@ func (r *HTML) RenderNode(w io.Writer, node *Node, entering bool) {
r.cr(w) r.cr(w)
} }
break break
case HtmlBlock: case HTMLBlock:
r.cr(w) r.cr(w)
r.out(w, node.Literal) r.out(w, node.Literal)
r.cr(w) r.cr(w)

4
inline.go
View File

@ -658,7 +658,7 @@ func leftAngle(p *parser, data []byte, offset int) int {
node.appendChild(text(stripMailto(link))) node.appendChild(text(stripMailto(link)))
} }
} else { } else {
htmlTag := NewNode(HtmlSpan) htmlTag := NewNode(HTMLSpan)
htmlTag.Literal = data[:end] htmlTag.Literal = data[:end]
p.currBlock.appendChild(htmlTag) p.currBlock.appendChild(htmlTag)
} }
@ -782,7 +782,7 @@ func autoLink(p *parser, data []byte, offset int) int {
anchorStr := anchorRe.Find(data[anchorStart:]) anchorStr := anchorRe.Find(data[anchorStart:])
if anchorStr != nil { if anchorStr != nil {
anchorClose := NewNode(HtmlSpan) anchorClose := NewNode(HTMLSpan)
anchorClose.Literal = anchorStr[offsetFromAnchor:] anchorClose.Literal = anchorStr[offsetFromAnchor:]
p.currBlock.appendChild(anchorClose) p.currBlock.appendChild(anchorClose)
return len(anchorStr) - offsetFromAnchor return len(anchorStr) - offsetFromAnchor

4
markdown.go
View File

@ -466,7 +466,7 @@ func (p *parser) parseRefsToAST() {
return return
} }
p.tip = p.doc p.tip = p.doc
finalizeHtmlBlock(p.addBlock(HtmlBlock, []byte(`<div class="footnotes">`))) finalizeHtmlBlock(p.addBlock(HTMLBlock, []byte(`<div class="footnotes">`)))
p.addBlock(HorizontalRule, nil) p.addBlock(HorizontalRule, nil)
block := p.addBlock(List, nil) block := p.addBlock(List, nil)
block.ListFlags = ListTypeOrdered block.ListFlags = ListTypeOrdered
@ -492,7 +492,7 @@ func (p *parser) parseRefsToAST() {
above := block.Parent above := block.Parent
finalizeList(block) finalizeList(block)
p.tip = above p.tip = above
finalizeHtmlBlock(p.addBlock(HtmlBlock, []byte("</div>"))) finalizeHtmlBlock(p.addBlock(HTMLBlock, []byte("</div>")))
block.Walk(func(node *Node, entering bool) { block.Walk(func(node *Node, entering bool) {
if node.Type == Paragraph || node.Type == Header { if node.Type == Paragraph || node.Type == Header {
p.currBlock = node p.currBlock = node

8
node.go
View File

@ -21,12 +21,12 @@ const (
Link Link
Image Image
Text Text
HtmlBlock HTMLBlock
CodeBlock CodeBlock
Softbreak Softbreak
Hardbreak Hardbreak
Code Code
HtmlSpan HTMLSpan
Table Table
TableCell TableCell
TableHead TableHead
@ -48,12 +48,12 @@ var nodeTypeNames = []string{
Link: "Link", Link: "Link",
Image: "Image", Image: "Image",
Text: "Text", Text: "Text",
HtmlBlock: "HtmlBlock", HTMLBlock: "HTMLBlock",
CodeBlock: "CodeBlock", CodeBlock: "CodeBlock",
Softbreak: "Softbreak", Softbreak: "Softbreak",
Hardbreak: "Hardbreak", Hardbreak: "Hardbreak",
Code: "Code", Code: "Code",
HtmlSpan: "HtmlSpan", HTMLSpan: "HTMLSpan",
Table: "Table", Table: "Table",
TableCell: "TableCell", TableCell: "TableCell",
TableHead: "TableHead", TableHead: "TableHead",