From ec9c6912163f9ca3c10ad75aba939a76ec96e932 Mon Sep 17 00:00:00 2001 From: Nathan Youngman Date: Wed, 14 Oct 2015 15:10:50 -0600 Subject: [PATCH] Insert code tag for server-side syntax highlighting Inserts a code tag into Pygments output with the language-info that is present when using client-side highlighting (useful for CSS hooks) ```html ``` closes #1490 --- helpers/content_renderer_test.go | 2 +- helpers/pygments.go | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/helpers/content_renderer_test.go b/helpers/content_renderer_test.go index 90b4c493..1c84818a 100644 --- a/helpers/content_renderer_test.go +++ b/helpers/content_renderer_test.go @@ -38,7 +38,7 @@ func TestCodeFence(t *testing.T) { input, expected string } data := []test{ - {true, "", "
<html></html>\n
\n"}, + {true, "", "
<html></html>\n
\n"}, {false, "", "
<html></html>
\n"}, } diff --git a/helpers/pygments.go b/helpers/pygments.go index 29a5ec54..17c30ee0 100644 --- a/helpers/pygments.go +++ b/helpers/pygments.go @@ -111,14 +111,23 @@ func Highlight(code, lang, optsStr string) string { return code } + str := out.String() + + // inject code tag into Pygments output + if lang != "" && strings.Contains(str, "
") {
+		codeTag := fmt.Sprintf(`
`, lang, lang)
+		str = strings.Replace(str, "
", codeTag, 1)
+		str = strings.Replace(str, "
", "
", 1)
+	}
+
 	if cachefile != "" {
 		// Write cache file
-		if err := WriteToDisk(cachefile, bytes.NewReader(out.Bytes()), fs); err != nil {
+		if err := WriteToDisk(cachefile, strings.NewReader(str), fs); err != nil {
 			jww.ERROR.Print(stderr.String())
 		}
 	}
 
-	return out.String()
+	return str
 }
 
 var pygmentsKeywords = make(map[string]bool)
-- 
2.30.2