Skip to content

improvement: use lang-* classes declared in snippet markup #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
httpjamesm merged 3 commits into from
Mar 28, 2024
Merged

improvement: use lang-* classes declared in snippet markup #97

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b073c0
improvement: use lang-* classes declared in snippet markup
sgvictorino Mar 21, 2024
066a3fd
fix: don't require snippet lang classes in code blocks
sgvictorino Mar 22, 2024
f7ae1a6
fix: constrain greedy code block match
sgvictorino Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/utils/syntax.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ import (

// highlightSyntaxViaContent uses Chroma to lex code content and apply the appropriate tokenizer engine.
// If it can't find one, it defaults to JavaScript syntax highlighting.
func highlightSyntaxViaContent(content string) (htmlOut string) {
func highlightSyntaxViaContent(content string, lang string) (htmlOut string) {
content = html.UnescapeString(content)

fallbackOut := html.EscapeString(content)

// identify the language
lexer := lexers.Analyse(content)
lexer := lexers.Get(lang)
if lexer == nil {
lexer = lexers.Analyse(content)
}
if lexer == nil {
lexer = lexers.Get(".js")
}
Expand Down Expand Up @@ -71,19 +73,20 @@ func stripBlockTags(content string) (result string) {
return
}

var codeBlockRegex = regexp.MustCompile(`(?s)<pre><code>(.*?)<\/code><\/pre>`)
var codeBlockRegex = regexp.MustCompile(`(?s)<pre(?:[^>]+?lang-(.+?)[\s"'])?.*?><code>(.*?)<\/code><\/pre>`)

// HighlightCodeBlocks uses both highlightSyntaxViaContent stripCodeBlocks and returns the newly highlighted code HTML.
func HighlightCodeBlocks(html string) string {
// Replace each code block with the highlighted version
highlightedHTML := codeBlockRegex.ReplaceAllStringFunc(html, func(codeBlock string) string {
// Extract the code content from the code block
codeContent := codeBlockRegex.FindStringSubmatch(codeBlock)[1]
matches := codeBlockRegex.FindStringSubmatch(codeBlock)
lang, codeContent := matches[1], matches[2]

codeContent = stripBlockTags(codeContent)

// Highlight the code content
highlightedCode := highlightSyntaxViaContent(codeContent)
highlightedCode := highlightSyntaxViaContent(codeContent, lang)

// Replace the original code block with the highlighted version
highlightedCodeBlock := "<pre>" + highlightedCode + "</pre>"
Expand Down