refactor: simplify codes

Author: yuin

README.md

@@ -12,6 +12,8 @@ goldmark is compliant with CommonMark 0.31.2.
 
 - [goldmark playground](https://yuin.github.io/goldmark/playground/) : Try goldmark online. This playground is built with WASM(5-10MB).
 
+There is also a Rust version of goldmark: [rushdown](https://github.com/yuin/rushdown)
+
 Motivation
 ----------------------
 I needed a Markdown parser for Go that satisfies the following requirements:

extension/ast/tasklist.go

@@ -2,6 +2,7 @@ package ast
 
 import (
 	"fmt"
+
 	gast "github.com/yuin/goldmark/ast"
 )
 

parser/fcode_block.go

@@ -34,10 +34,7 @@ func (b *fencedCodeBlockParser) Trigger() []byte {
 
 func (b *fencedCodeBlockParser) Open(parent ast.Node, reader text.Reader, pc Context) (ast.Node, State) {
 	line, segment := reader.PeekLine()
-	pos := pc.BlockOffset()
-	if pos < 0 || (line[pos] != '`' && line[pos] != '~') {
-		return nil, NoChildren
-	}
+	pos := pc.BlockIndent()
 	findent := pos
 	fenceChar := line[pos]
 	i := pos
@@ -79,11 +76,7 @@ func (b *fencedCodeBlockParser) Continue(node ast.Node, reader text.Reader, pc C
 		}
 		length := i - pos
 		if length >= fdata.length && util.IsBlank(line[i:]) {
-			newline := 1
-			if line[len(line)-1] != '\n' {
-				newline = 0
-			}
-			reader.Advance(segment.Stop - segment.Start - newline + segment.Padding)
+			reader.AdvanceToEOL()
 			return Close
 		}
 	}
@@ -99,7 +92,7 @@ func (b *fencedCodeBlockParser) Continue(node ast.Node, reader text.Reader, pc C
 	}
 	seg.ForceNewline = true // EOF as newline
 	node.Lines().Append(seg)
-	reader.AdvanceAndSetPadding(segment.Stop-segment.Start-pos-1, padding)
+	reader.AdvanceToEOL()
 	return Continue | NoChildren
 }
 

parser/html_block.go

@@ -114,9 +114,6 @@ func (b *htmlBlockParser) Open(parent ast.Node, reader text.Reader, pc Context)
 	var node *ast.HTMLBlock
 	line, segment := reader.PeekLine()
 	last := pc.LastOpenedBlock().Node
-	if pos := pc.BlockOffset(); pos < 0 || line[pos] != '<' {
-		return nil, NoChildren
-	}
 
 	if m := htmlBlockType1OpenRegexp.FindSubmatchIndex(line); m != nil {
 		node = ast.NewHTMLBlock(ast.HTMLBlockType1)

parser/list.go

@@ -80,14 +80,6 @@ func parseListItem(line []byte) ([6]int, listItemType) {
 	return ret, typ
 }
 
-func matchesListItem(source []byte, strict bool) ([6]int, listItemType) {
-	m, typ := parseListItem(source)
-	if typ != notList && (!strict || strict && m[1] < 4) {
-		return m, typ
-	}
-	return m, notList
-}
-
 func calcListOffset(source []byte, match [6]int) int {
 	var offset int
 	if match[4] < 0 || util.IsBlank(source[match[4]:]) { // list item starts with a blank line
@@ -132,7 +124,7 @@ func (b *listParser) Open(parent ast.Node, reader text.Reader, pc Context) (ast.
 		return nil, NoChildren
 	}
 	line, _ := reader.PeekLine()
-	match, typ := matchesListItem(line, true)
+	match, typ := parseListItem(line)
 	if typ == notList {
 		return nil, NoChildren
 	}
@@ -198,7 +190,7 @@ func (b *listParser) Continue(node ast.Node, reader text.Reader, pc Context) Sta
 
 	if indent < offset || lastIsEmpty {
 		if indent < 4 {
-			match, typ := matchesListItem(line, false) // may have a leading spaces more than 3
+			match, typ := parseListItem(line)
 			if typ != notList && match[1]-offset < 4 {
 				marker := line[match[3]-1]
 				if !list.CanContinue(marker, typ == orderedList) {

parser/list_item.go

@@ -28,7 +28,7 @@ func (b *listItemParser) Open(parent ast.Node, reader text.Reader, pc Context) (
 	}
 	offset := lastOffset(list)
 	line, _ := reader.PeekLine()
-	match, typ := matchesListItem(line, false)
+	match, typ := parseListItem(line)
 	if typ == notList {
 		return nil, NoChildren
 	}
@@ -61,7 +61,7 @@ func (b *listItemParser) Continue(node ast.Node, reader text.Reader, pc Context)
 	isEmpty := node.ChildCount() == 0 && pc.Get(emptyListItemWithBlankLines) != nil
 	indent, _ := util.IndentWidth(line, reader.LineOffset())
 	if (isEmpty || indent < offset) && indent < 4 {
-		_, typ := matchesListItem(line, true)
+		_, typ := parseListItem(line)
 		// new list item found
 		if typ != notList {
 			pc.Set(skipListParserKey, listItemFlagValue)

renderer/html/html.go

@@ -497,7 +497,7 @@ func (r *Renderer) renderThematicBreak(
 }
 
 // LinkAttributeFilter defines attribute names which link elements can have.
-var LinkAttributeFilter = GlobalAttributeFilter.ExtendString(`download,hreflang,media,ping,referrerpolicy,rel,shape,target`) // nolint:lll
+var LinkAttributeFilter = GlobalAttributeFilter.ExtendString(`download,href,lang,media,ping,referrerpolicy,rel,shape,target`) // nolint:lll
 
 func (r *Renderer) renderAutoLink(
 	w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {