go/chroma
1
0
Fork 0
mirror of https://github.com/alecthomas/chroma.git synced 2025-07-15 01:14:21 +02:00
Code Issues Releases Activity

fix: synthesisable entries are ignored when cloned (#465)

Browse Source
This commit is contained in:
Zhangyuan Nie
2021-04-11 01:06:10 -04:00
committed by GitHub
parent 41b886a7fd
commit d67a2bfdc2
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
style.go
View File

@ -265,12 +265,12 @@ func (s *Style) Get(ttype TokenType) StyleEntry {
func (s *Style) get(ttype TokenType) StyleEntry { func (s *Style) get(ttype TokenType) StyleEntry {
out := s.entries[ttype] out := s.entries[ttype]
if out.IsZero() && s.synthesisable(ttype) {
out = s.synthesise(ttype)
}
if out.IsZero() && s.parent != nil { if out.IsZero() && s.parent != nil {
return s.parent.get(ttype) return s.parent.get(ttype)
} }
if out.IsZero() && s.synthesisable(ttype) {
out = s.synthesise(ttype)
}
return out return out
} }

15
style_test.go
View File

@ -48,3 +48,18 @@ func TestSynthesisedStyleEntries(t *testing.T) {
assert.Equal(t, "#7f7f7f bg:#ffffff", style.Get(LineNumbers).String()) assert.Equal(t, "#7f7f7f bg:#ffffff", style.Get(LineNumbers).String())
assert.Equal(t, "#7f7f7f bg:#ffffff", style.Get(LineNumbersTable).String()) assert.Equal(t, "#7f7f7f bg:#ffffff", style.Get(LineNumbersTable).String())
} }
func TestSynthesisedStyleClone(t *testing.T) {
style, err := NewStyle("test", StyleEntries{
Background: "bg:#ffffff",
LineHighlight: "bg:#ffffff",
LineNumbers: "bg:#fffff1",
})
assert.NoError(t, err)
style, err = style.Builder().Build()
assert.NoError(t, err)
assert.True(t, style.Has(LineHighlight))
assert.True(t, style.Has(LineNumbers))
assert.Equal(t, "bg:#ffffff", style.Get(LineHighlight).String())
assert.Equal(t, "bg:#fffff1", style.Get(LineNumbers).String())
}