go/chroma
1
0
Fork 0
mirror of https://github.com/alecthomas/chroma.git synced 2025-03-25 21:39:02 +02:00
Code Issues Releases Activity

Consider baseLineNumber when calculating the column width

Browse Source
This commit is contained in:
Pablo Santiago Blum de Aguiar 2020-01-09 19:35:46 +01:00 committed by Alec Thomas
parent bac74c1016
commit 9e22bd6e2f
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
formatters/html/html.go
View File

@ -188,7 +188,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma.
wrapInTable := f.lineNumbers && f.lineNumbersInTable
lines := chroma.SplitTokensIntoLines(tokens)
lineDigits := len(fmt.Sprintf("%d", len(lines)))
lineDigits := len(fmt.Sprintf("%d", f.baseLineNumber+len(lines)-1))
highlightIndex := 0
if wrapInTable {

45
formatters/html/html_test.go
View File

@ -108,6 +108,51 @@ func TestTableLineNumberNewlines(t *testing.T) {
</span>`)
}
func TestTableLineNumberSpacing(t *testing.T) {
testCases := []struct {
baseLineNumber int
expectedBuf string
}{{
7,
`<span class="lnt"> 7
</span><span class="lnt"> 8
</span><span class="lnt"> 9
</span><span class="lnt">10
</span><span class="lnt">11
</span>`,
}, {
6,
`<span class="lnt"> 6
</span><span class="lnt"> 7
</span><span class="lnt"> 8
</span><span class="lnt"> 9
</span><span class="lnt">10
</span>`,
}, {
5,
`<span class="lnt">5
</span><span class="lnt">6
</span><span class="lnt">7
</span><span class="lnt">8
</span><span class="lnt">9
</span>`,
}}
for i, testCase := range testCases {
f := New(
WithClasses(true),
WithLineNumbers(true),
LineNumbersInTable(true),
BaseLineNumber(testCase.baseLineNumber),
)
it, err := lexers.Get("go").Tokenise(nil, "package main\nfunc main()\n{\nprintln(`hello world`)\n}\n")
assert.NoError(t, err)
var buf bytes.Buffer
err = f.Format(&buf, styles.Fallback, it)
assert.NoError(t, err, "Test Case %d", i)
assert.Contains(t, buf.String(), testCase.expectedBuf, "Test Case %d", i)
}
}
func TestWithPreWrapper(t *testing.T) {
wrapper := preWrapper{
start: func(code bool, styleAttr string) string {