fix indented code block test
This commit is contained in:
parent
d507f17a18
commit
d89a564bb1
2 changed files with 7 additions and 33 deletions
|
|
@ -4,7 +4,6 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"math"
|
"math"
|
||||||
"strings"
|
"strings"
|
||||||
"unicode"
|
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
|
|
||||||
"github.com/PuerkitoBio/goquery"
|
"github.com/PuerkitoBio/goquery"
|
||||||
|
|
@ -209,7 +208,6 @@ func (ruler *Ruler) measureNode(depth int, n *html.Node, font d2fonts.Font) (wid
|
||||||
spaceRune, _ := utf8.DecodeRuneInString(" ")
|
spaceRune, _ := utf8.DecodeRuneInString(" ")
|
||||||
// measure will not include leading or trailing whitespace, so we have to add in the space width
|
// measure will not include leading or trailing whitespace, so we have to add in the space width
|
||||||
spaceWidth := ruler.atlases[font].glyph(spaceRune).advance
|
spaceWidth := ruler.atlases[font].glyph(spaceRune).advance
|
||||||
tabWidth := TAB_SIZE * spaceWidth
|
|
||||||
|
|
||||||
str := n.Data
|
str := n.Data
|
||||||
|
|
||||||
|
|
@ -234,33 +232,6 @@ func (ruler *Ruler) measureNode(depth int, n *html.Node, font d2fonts.Font) (wid
|
||||||
spaceWidths += spaceWidth
|
spaceWidths += spaceWidth
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
isNotSpace := func(r rune) bool {
|
|
||||||
return !unicode.IsSpace(r)
|
|
||||||
}
|
|
||||||
|
|
||||||
startIndex := strings.IndexFunc(str, isNotSpace)
|
|
||||||
endIndex := strings.LastIndexFunc(str, isNotSpace)
|
|
||||||
|
|
||||||
if startIndex != -1 && endIndex != -1 {
|
|
||||||
for i, r := range str {
|
|
||||||
// skip over runes in middle
|
|
||||||
if i >= startIndex && i <= endIndex {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// measure width of leading/trailing whitespace
|
|
||||||
switch r {
|
|
||||||
case ' ':
|
|
||||||
spaceWidths += spaceWidth
|
|
||||||
case '\t':
|
|
||||||
spaceWidths += tabWidth
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
str = str[startIndex : endIndex+1]
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if parentElementType == "pre" {
|
if parentElementType == "pre" {
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,13 @@ a -> md -> b
|
||||||
{
|
{
|
||||||
name: "md_code_block_indented",
|
name: "md_code_block_indented",
|
||||||
script: `md: |md
|
script: `md: |md
|
||||||
|
a line of text and an
|
||||||
|
|
||||||
{
|
{
|
||||||
indented: "block",
|
indented: "block",
|
||||||
of: "json",
|
of: "json",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
|
||||||
a -> md -> b
|
a -> md -> b
|
||||||
`,
|
`,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue