1 files changed, 25 insertions, 11 deletions
diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go
index 65ed74b019..3836c05880 100644
--- a/modules/highlight/highlight.go
+++ b/modules/highlight/highlight.go
@@ -18,6 +18,7 @@ import (
 	"code.gitea.io/gitea/modules/analyze"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
 
 	"github.com/alecthomas/chroma/v2"
 	"github.com/alecthomas/chroma/v2/formatters/html"
@@ -56,18 +57,18 @@ func NewContext() {
 	})
 }
 
-// Code returns a HTML version of code string with chroma syntax highlighting classes
-func Code(fileName, language, code string) string {
+// Code returns a HTML version of code string with chroma syntax highlighting classes and the matched lexer name
+func Code(fileName, language, code string) (string, string) {
 	NewContext()
 
 	// diff view newline will be passed as empty, change to literal '\n' so it can be copied
 	// preserve literal newline in blame view
 	if code == "" || code == "\n" {
-		return "\n"
+		return "\n", ""
 	}
 
 	if len(code) > sizeLimit {
-		return code
+		return code, ""
 	}
 
 	var lexer chroma.Lexer
@@ -103,7 +104,10 @@ func Code(fileName, language, code string) string {
 		}
 		cache.Add(fileName, lexer)
 	}
-	return CodeFromLexer(lexer, code)
+
+	lexerName := formatLexerName(lexer.Config().Name)
+
+	return CodeFromLexer(lexer, code), lexerName
 }
 
 // CodeFromLexer returns a HTML version of code string with chroma syntax highlighting classes
@@ -134,12 +138,12 @@ func CodeFromLexer(lexer chroma.Lexer, code string) string {
 	return strings.TrimSuffix(htmlbuf.String(), "\n")
 }
 
-// File returns a slice of chroma syntax highlighted HTML lines of code
-func File(fileName, language string, code []byte) ([]string, error) {
+// File returns a slice of chroma syntax highlighted HTML lines of code and the matched lexer name
+func File(fileName, language string, code []byte) ([]string, string, error) {
 	NewContext()
 
 	if len(code) > sizeLimit {
-		return PlainText(code), nil
+		return PlainText(code), "", nil
 	}
 
 	formatter := html.New(html.WithClasses(true),
@@ -172,9 +176,11 @@ func File(fileName, language string, code []byte) ([]string, error) {
 		}
 	}
 
+	lexerName := formatLexerName(lexer.Config().Name)
+
 	iterator, err := lexer.Tokenise(nil, string(code))
 	if err != nil {
-		return nil, fmt.Errorf("can't tokenize code: %w", err)
+		return nil, "", fmt.Errorf("can't tokenize code: %w", err)
 	}
 
 	tokensLines := chroma.SplitTokensIntoLines(iterator.Tokens())
@@ -185,13 +191,13 @@ func File(fileName, language string, code []byte) ([]string, error) {
 		iterator = chroma.Literator(tokens...)
 		err = formatter.Format(htmlBuf, styles.GitHub, iterator)
 		if err != nil {
-			return nil, fmt.Errorf("can't format code: %w", err)
+			return nil, "", fmt.Errorf("can't format code: %w", err)
 		}
 		lines = append(lines, htmlBuf.String())
 		htmlBuf.Reset()
 	}
 
-	return lines, nil
+	return lines, lexerName, nil
 }
 
 // PlainText returns non-highlighted HTML for code
@@ -212,3 +218,11 @@ func PlainText(code []byte) []string {
 	}
 	return m
 }
+
+func formatLexerName(name string) string {
+	if name == "fallback" {
+		return "Plaintext"
+	}
+
+	return util.ToTitleCaseNoLower(name)
+}