Allow custom highlight mapping beyond file extensions (#15808)
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
parent
27b29ffb22
commit
52f8dcda43
1 changed files with 17 additions and 10 deletions
|
@ -16,6 +16,7 @@ import (
|
||||||
"code.gitea.io/gitea/modules/analyze"
|
"code.gitea.io/gitea/modules/analyze"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"github.com/alecthomas/chroma"
|
||||||
"github.com/alecthomas/chroma/formatters/html"
|
"github.com/alecthomas/chroma/formatters/html"
|
||||||
"github.com/alecthomas/chroma/lexers"
|
"github.com/alecthomas/chroma/lexers"
|
||||||
"github.com/alecthomas/chroma/styles"
|
"github.com/alecthomas/chroma/styles"
|
||||||
|
@ -66,14 +67,17 @@ func Code(fileName, code string) string {
|
||||||
htmlbuf := bytes.Buffer{}
|
htmlbuf := bytes.Buffer{}
|
||||||
htmlw := bufio.NewWriter(&htmlbuf)
|
htmlw := bufio.NewWriter(&htmlbuf)
|
||||||
|
|
||||||
|
var lexer chroma.Lexer
|
||||||
if val, ok := highlightMapping[filepath.Ext(fileName)]; ok {
|
if val, ok := highlightMapping[filepath.Ext(fileName)]; ok {
|
||||||
//change file name to one with mapped extension so we look that up instead
|
//use mapped value to find lexer
|
||||||
fileName = "mapped." + val
|
lexer = lexers.Get(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
lexer := lexers.Match(fileName)
|
|
||||||
if lexer == nil {
|
if lexer == nil {
|
||||||
lexer = lexers.Fallback
|
lexer = lexers.Match(fileName)
|
||||||
|
if lexer == nil {
|
||||||
|
lexer = lexers.Fallback
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
iterator, err := lexer.Tokenise(nil, string(code))
|
iterator, err := lexer.Tokenise(nil, string(code))
|
||||||
|
@ -114,17 +118,20 @@ func File(numLines int, fileName string, code []byte) map[int]string {
|
||||||
htmlbuf := bytes.Buffer{}
|
htmlbuf := bytes.Buffer{}
|
||||||
htmlw := bufio.NewWriter(&htmlbuf)
|
htmlw := bufio.NewWriter(&htmlbuf)
|
||||||
|
|
||||||
|
var lexer chroma.Lexer
|
||||||
if val, ok := highlightMapping[filepath.Ext(fileName)]; ok {
|
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 {
|
if lexer == nil {
|
||||||
lexer = lexers.Match(fileName)
|
language := analyze.GetCodeLanguage(fileName, code)
|
||||||
|
|
||||||
|
lexer = lexers.Get(language)
|
||||||
if lexer == nil {
|
if lexer == nil {
|
||||||
lexer = lexers.Fallback
|
lexer = lexers.Match(fileName)
|
||||||
|
if lexer == nil {
|
||||||
|
lexer = lexers.Fallback
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue