fix: include compress state in style cache key

alecthomas · alecthomas · commit bd47355e460e · 2024-03-12T17:08:58.000+11:00
Fixes #945
diff --git a/formatters/html/html.go b/formatters/html/html.go
@@ -224,7 +224,7 @@ func (f *Formatter) Format(w io.Writer, style *chroma.Style, iterator chroma.Ite
 //
 // OTOH we need to be super careful about correct escaping...
 func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma.Token) (err error) { // nolint: gocyclo
-	css := f.styleCache.get(style)
+	css := f.styleCache.get(style, true)
 	if f.standalone {
 		fmt.Fprint(w, "<html>\n")
 		if f.Classes {
@@ -418,7 +418,7 @@ func (f *Formatter) tabWidthStyle() string {
 
 // WriteCSS writes CSS style definitions (without any surrounding HTML).
 func (f *Formatter) WriteCSS(w io.Writer, style *chroma.Style) error {
-	css := f.styleCache.get(style)
+	css := f.styleCache.get(style, false)
 	// Special-case background as it is mapped to the outer ".chroma" class.
 	if _, err := fmt.Fprintf(w, "/* %s */ .%sbg { %s }\n", chroma.Background, f.prefix, css[chroma.Background]); err != nil {
 		return err
@@ -562,11 +562,12 @@ func compressStyle(s string) string {
 	return strings.Join(out, ";")
 }
 
-const styleCacheLimit = 16
+const styleCacheLimit = 32
 
 type styleCacheEntry struct {
-	style *chroma.Style
-	cache map[chroma.TokenType]string
+	style      *chroma.Style
+	compressed bool
+	cache      map[chroma.TokenType]string
 }
 
 type styleCache struct {
@@ -582,14 +583,14 @@ func newStyleCache(f *Formatter) *styleCache {
 	return &styleCache{f: f}
 }
 
-func (l *styleCache) get(style *chroma.Style) map[chroma.TokenType]string {
+func (l *styleCache) get(style *chroma.Style, compress bool) map[chroma.TokenType]string {
 	l.mu.Lock()
 	defer l.mu.Unlock()
 
 	// Look for an existing entry.
 	for i := len(l.cache) - 1; i >= 0; i-- {
 		entry := l.cache[i]
-		if entry.style == style {
+		if entry.style == style && entry.compressed == compress {
 			// Top of the cache, no need to adjust the order.
 			if i == len(l.cache)-1 {
 				return entry.cache
@@ -608,13 +609,15 @@ func (l *styleCache) get(style *chroma.Style) map[chroma.TokenType]string {
 			cached[t] = compressStyle(style)
 		}
 	}
-	for t, style := range cached {
-		cached[t] = compressStyle(style)
+	if compress {
+		for t, style := range cached {
+			cached[t] = compressStyle(style)
+		}
 	}
 	// Evict the oldest entry.
 	if len(l.cache) >= styleCacheLimit {
 		l.cache = l.cache[0:copy(l.cache, l.cache[1:])]
 	}
-	l.cache = append(l.cache, styleCacheEntry{style: style, cache: cached})
+	l.cache = append(l.cache, styleCacheEntry{style: style, cache: cached, compressed: compress})
 	return cached
 }
diff --git a/formatters/html/html_test.go b/formatters/html/html_test.go
@@ -222,7 +222,7 @@ func TestTableLinkeableLineNumbers(t *testing.T) {
 
 	assert.Contains(t, buf.String(), `id="line1"><a class="lnlinks" href="#line1">1</a>`)
 	assert.Contains(t, buf.String(), `id="line5"><a class="lnlinks" href="#line5">5</a>`)
-	assert.Contains(t, buf.String(), `/* LineLink */ .chroma .lnlinks { outline:none;text-decoration:none;color:inherit }`, buf.String())
+	assert.Contains(t, buf.String(), `/* LineLink */ .chroma .lnlinks { outline: none; text-decoration: none; color: inherit }`, buf.String())
 }
 
 func TestTableLineNumberSpacing(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func TestTableLinkeableLineNumbers(t *testing.T) {`
`222`	`222`
`223`	`223`	assert.Contains(t, buf.String(), `id="line1"><a class="lnlinks" href="#line1">1</a>`)
`224`	`224`	assert.Contains(t, buf.String(), `id="line5"><a class="lnlinks" href="#line5">5</a>`)
`225`		- assert.Contains(t, buf.String(), `/* LineLink */ .chroma .lnlinks { outline:none;text-decoration:none;color:inherit }`, buf.String())
	`225`	+ assert.Contains(t, buf.String(), `/* LineLink */ .chroma .lnlinks { outline: none; text-decoration: none; color: inherit }`, buf.String())
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`func TestTableLineNumberSpacing(t *testing.T) {`