go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-13 09:57:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg/md: Support starting a list item with a blank line.

Browse Source
This commit is contained in:
Qi Xiao 2022-10-03 03:19:52 +01:00
parent a2a7126064
commit bfb0a380c2
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/md/md.go
View File

@ -136,6 +136,12 @@ func (p *blockParser) render() {
continue continue
} }
} }
if len(newContainers) == 0 && len(p.paragraph) == 0 &&
(p.lastContainerIs(bulletItem) || p.lastContainerIs(orderedItem)) {
if p.containers[len(p.containers)-1].blankFirst {
p.popLastContainer()
}
}
p.popParagraph(len(p.containers)) p.popParagraph(len(p.containers))
} else if thematicBreakRegexp.MatchString(line) { } else if thematicBreakRegexp.MatchString(line) {
p.popParagraph(matchedContainers) p.popParagraph(matchedContainers)
@ -209,13 +215,18 @@ func matchContinuationMarkers(line string, containers []container) (string, int)
return line, len(containers) return line, len(containers)
} }
var containerStartingMarkerRegexp = regexp.MustCompile( var (
// Capture groups: containerStartingMarkerRegexp = regexp.MustCompile(
// 1. blockquote marker // Capture groups:
// 2. bullet item punctuation // 1. blockquote marker
// 3. ordered item start index // 2. bullet item punctuation
// 4. ordered item punctuation // 3. ordered item start index
`^ {0,3}(?:(> ?)|([-+*]) {1,4}|([0-9]{1,9})([.)]) {1,4})`) // 4. ordered item punctuation
`^ {0,3}(?:(> ?)|([-+*]) {1,4}|([0-9]{1,9})([.)]) {1,4})`)
itemStartingMarkerBlankLineRegexp = regexp.MustCompile(
// Capture groups are the same, with group 1 always empty.
`^ {0,3}(?:()([-+*])|([0-9]{1,9})([.)]))[ \t]*$`)
)
// Parses starting markers of container blocks. Returns the line after removing // Parses starting markers of container blocks. Returns the line after removing
// all starting markers and new containers to create. // all starting markers and new containers to create.
@ -224,6 +235,11 @@ func parseStartingMarkers(line string, newParagraph bool) (string, []container)
// Don't parse thematic breaks like "- - - " as three bullets. // Don't parse thematic breaks like "- - - " as three bullets.
for !thematicBreakRegexp.MatchString(line) { for !thematicBreakRegexp.MatchString(line) {
m := containerStartingMarkerRegexp.FindStringSubmatch(line) m := containerStartingMarkerRegexp.FindStringSubmatch(line)
blankFirst := false
if m == nil && newParagraph {
m = itemStartingMarkerBlankLineRegexp.FindStringSubmatch(line)
blankFirst = true
}
if m == nil { if m == nil {
break break
} }
@ -237,6 +253,7 @@ func parseStartingMarkers(line string, newParagraph bool) (string, []container)
indent = len(strings.TrimRight(marker, " \t")) + 1 indent = len(strings.TrimRight(marker, " \t")) + 1
} }
c.indent = strings.Repeat(" ", indent) c.indent = strings.Repeat(" ", indent)
c.blankFirst = blankFirst
if bulletPunct != "" { if bulletPunct != "" {
c.typ = bulletItem c.typ = bulletItem
c.punct = bulletPunct[0] c.punct = bulletPunct[0]
@ -436,10 +453,11 @@ func (s *lineSplitter) backup() {
} }
type container struct { type container struct {
typ containerType typ containerType
punct byte punct byte
start int start int
indent string indent string
blankFirst bool
} }
type containerType uint8 type containerType uint8

12
pkg/md/md_test.go
View File

@ -67,6 +67,14 @@ var additionalCases = []testCase{
`, `,
Name: "Code fence supplemental/Empty line in list item", Name: "Code fence supplemental/Empty line in list item",
}, },
{
Name: "List items supplemental/Two leading empty lines with spaces",
Markdown: "- \n \na", HTML: `<ul>
<li></li>
</ul>
<p>a</p>
`,
},
} }
func init() { func init() {
@ -159,7 +167,6 @@ func combineHTMLTagPairs(p TagPair, more ...TagPair) TagPair {
var ( var (
linkRef = regexp.MustCompile(`(^|\n) {0,3}\[([^\\\[\]]|\\[\\\[\]])+\]:`) linkRef = regexp.MustCompile(`(^|\n) {0,3}\[([^\\\[\]]|\\[\\\[\]])+\]:`)
indentedCodeBlock = regexp.MustCompile("(^|\n)[ >]*( )") indentedCodeBlock = regexp.MustCompile("(^|\n)[ >]*( )")
emptyListItem = regexp.MustCompile(`(^|\n)([-+*]|[0-9]{1,9}[.)])(\n|$)`)
) )
func TestRender(t *testing.T) { func TestRender(t *testing.T) {
@ -181,9 +188,6 @@ func TestRender(t *testing.T) {
if linkRef.MatchString(tc.Markdown) { if linkRef.MatchString(tc.Markdown) {
t.Skipf("Link reference not supported") t.Skipf("Link reference not supported")
} }
if emptyListItem.MatchString(tc.Markdown) {
t.Skipf("Empty list item not supported")
}
got := Render(tc.Markdown, htmlSyntax) got := Render(tc.Markdown, htmlSyntax)
want := loosifyLists(tc.HTML) want := loosifyLists(tc.HTML)