fix: recognize linguist language aliases (#39135)

Co-authored-by: loveulvu <ax9inl@google.com>

Author: loveulvu

modules/git/languagestats/language_stats_get.go

@@ -114,6 +114,10 @@ func GetLanguageStats(ctx context.Context, repo *git.Repository, commitID string
 			if hasLanguage := attrs.GetLanguage(); hasLanguage.Value() != "" {
 				language := hasLanguage.Value()
 
+				if canonicalLanguage, ok := enry.GetLanguageByAlias(language); ok {
+					language = canonicalLanguage
+				}
+
 				// group languages, such as Pug -> HTML; SCSS -> CSS
 				group := enry.GetLanguageGroup(language)
 				if len(group) != 0 {

tests/integration/linguist_test.go

@@ -225,6 +225,17 @@ func TestLinguist(t *testing.T) {
 				},
 				ExpectedLanguageOrder: []string{"YAML"},
 			},
+			// case 15: linguist-language alias should resolve to its canonical language
+			{
+				GitAttributesContent: "*.cpp linguist-language=golang",
+				FilesToAdd: []*files_service.ChangeRepoFile{
+					{
+						TreePath:      "cplusplus.cpp",
+						ContentReader: strings.NewReader(cppContent),
+					},
+				},
+				ExpectedLanguageOrder: []string{"Go"},
+			},
 		}
 
 		for i, c := range cases {