diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-11-13 18:05:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 18:05:51 -0500 |
| commit | b4d18dae19679816829d619fac2e211e08b98a2a (patch) | |
| tree | a1176f639534ccbada85b33e2e8a6075d7a6c745 | |
| parent | ee0097f97d80d0fe0e5fe1cb5ff4570a6a985373 (diff) | |
| download | gitea-b4d18dae19679816829d619fac2e211e08b98a2a.tar.gz gitea-b4d18dae19679816829d619fac2e211e08b98a2a.zip | |
Use existing analyzer module for language detection for highlighting (#13522) (#13551)
* Use existing analyzer module for language detction for highlighting
Thanks @lafriks for pointing out we can reuse existing code for more reliable language detection here.
* Update modules/highlight/highlight.go
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
| -rw-r--r-- | modules/highlight/highlight.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index 1a64108139..914ba8210e 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -13,6 +13,7 @@ import ( "strings" "sync" + "code.gitea.io/gitea/modules/analyze" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "github.com/alecthomas/chroma/formatters/html" @@ -117,9 +118,11 @@ func File(numLines int, fileName string, code []byte) map[int]string { fileName = "test." + val } - lexer := lexers.Match(fileName) + language := analyze.GetCodeLanguage(fileName, code) + + lexer := lexers.Get(language) if lexer == nil { - lexer = lexers.Analyse(string(code)) + lexer = lexers.Match(fileName) if lexer == nil { lexer = lexers.Fallback } |