Skip to content
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

Jump to bottom

Allow custom highlight mapping beyond file extensions #15808

Merged
merged 4 commits into from May 13, 2021
Merged

Allow custom highlight mapping beyond file extensions #15808

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e37ceb4
Allow custom highlight mapping beyond file extensions
mlpo May 9, 2021
8b21e09
Merge branch 'main' into highlight-patch
mlpo May 10, 2021
ae5616b
Merge branch 'main' into highlight-patch
lafriks May 13, 2021
c97f014
Merge branch 'main' into highlight-patch
mlpo May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 17 additions & 10 deletions modules/highlight/highlight.go
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/analyze"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/alecthomas/chroma"
"github.com/alecthomas/chroma/formatters/html"
"github.com/alecthomas/chroma/lexers"
"github.com/alecthomas/chroma/styles"
Expand Down Expand Up @@ -66,14 +67,17 @@ func Code(fileName, code string) string {
htmlbuf := bytes.Buffer{}
htmlw := bufio.NewWriter(&htmlbuf)

var lexer chroma.Lexer
if val, ok := highlightMapping[filepath.Ext(fileName)]; ok {
//change file name to one with mapped extension so we look that up instead
fileName = "mapped." + val
//use mapped value to find lexer
lexer = lexers.Get(val)
}

lexer := lexers.Match(fileName)
if lexer == nil {
lexer = lexers.Fallback
lexer = lexers.Match(fileName)
if lexer == nil {
lexer = lexers.Fallback
}
}

iterator, err := lexer.Tokenise(nil, string(code))
Expand Down Expand Up @@ -114,17 +118,20 @@ func File(numLines int, fileName string, code []byte) map[int]string {
htmlbuf := bytes.Buffer{}
htmlw := bufio.NewWriter(&htmlbuf)

var lexer chroma.Lexer
if val, ok := highlightMapping[filepath.Ext(fileName)]; ok {
fileName = "test." + val
lexer = lexers.Get(val)
}

language := analyze.GetCodeLanguage(fileName, code)

lexer := lexers.Get(language)
if lexer == nil {
lexer = lexers.Match(fileName)
language := analyze.GetCodeLanguage(fileName, code)

lexer = lexers.Get(language)
if lexer == nil {
lexer = lexers.Fallback
lexer = lexers.Match(fileName)
if lexer == nil {
lexer = lexers.Fallback
}
}
}

Expand Down