Merge pull request #1259 from wakatime/bugfix/language-gen-ordering

Sort language generation deterministically

Author: gandarez

pkg/heartbeat/language_gen.go

@@ -769,9 +769,13 @@ func updateTestFile(languageTests, languageTestsAliases map[string]string) {
 	for k := range languageTests {
 		testKeys = append(testKeys, k)
 	}
-	// Sort case-insensitively for proper alphabetical order
+	// Sort case-insensitively for proper alphabetical order, with case-sensitive tiebreaker for determinism
 	sort.Slice(testKeys, func(i, j int) bool {
-		return strings.ToLower(testKeys[i]) < strings.ToLower(testKeys[j])
+		li, lj := strings.ToLower(testKeys[i]), strings.ToLower(testKeys[j])
+		if li != lj {
+			return li < lj
+		}
+		return testKeys[i] < testKeys[j]
 	})
 
 	for _, k := range testKeys {
@@ -789,9 +793,13 @@ func updateTestFile(languageTests, languageTestsAliases map[string]string) {
 	for k := range languageTestsAliases {
 		aliasKeys = append(aliasKeys, k)
 	}
-	// Sort case-insensitively for proper alphabetical order
+	// Sort case-insensitively for proper alphabetical order, with case-sensitive tiebreaker for determinism
 	sort.Slice(aliasKeys, func(i, j int) bool {
-		return strings.ToLower(aliasKeys[i]) < strings.ToLower(aliasKeys[j])
+		li, lj := strings.ToLower(aliasKeys[i]), strings.ToLower(aliasKeys[j])
+		if li != lj {
+			return li < lj
+		}
+		return aliasKeys[i] < aliasKeys[j]
 	})
 
 	for _, k := range aliasKeys {

pkg/heartbeat/language_test.go

@@ -826,8 +826,8 @@ func languageTestsAliases() map[string]heartbeat.Language {
 		"ada2005":                     heartbeat.LanguageAda,
 		"ada95":                       heartbeat.LanguageAda,
 		"ahk":                         heartbeat.LanguageAutoHotkey,
-		"apacheconf":                  heartbeat.LanguageApacheConfig,
 		"ApacheConf":                  heartbeat.LanguageApacheConfig,
+		"apacheconf":                  heartbeat.LanguageApacheConfig,
 		"ArangoDB AQL":                heartbeat.LanguageArangoDBQueryLanguage,
 		"arexx":                       heartbeat.LanguageRexx,
 		"as":                          heartbeat.LanguageActionScript,
@@ -966,8 +966,8 @@ func languageTestsAliases() map[string]heartbeat.Language {
 		"Protocol Buffer Text Format": heartbeat.LanguageProtocolBuffer,
 		"ps1":                         heartbeat.LanguagePowerShell,
 		"psd1":                        heartbeat.LanguagePowerShell,
-		"psl":                         heartbeat.LanguagePSL,
 		"PSL":                         heartbeat.LanguagePSL,
+		"psl":                         heartbeat.LanguagePSL,
 		"psm1":                        heartbeat.LanguagePowerShell,
 		"pwsh":                        heartbeat.LanguagePowerShell,
 		"py":                          heartbeat.LanguagePython,
@@ -979,8 +979,8 @@ func languageTestsAliases() map[string]heartbeat.Language {
 		"qbs":                         heartbeat.LanguageQML,
 		"rb":                          heartbeat.LanguageRuby,
 		"react":                       heartbeat.LanguageJSX,
-		"reasonml":                    heartbeat.LanguageReasonML,
 		"ReasonML":                    heartbeat.LanguageReasonML,
+		"reasonml":                    heartbeat.LanguageReasonML,
 		"registry":                    heartbeat.LanguageRegistry,
 		"rest":                        heartbeat.LanguageReStructuredText,
 		"rgbasm":                      heartbeat.LanguageRGBDSAssembly,
@@ -1004,8 +1004,8 @@ func languageTestsAliases() map[string]heartbeat.Language {
 		"st":                          heartbeat.LanguageSmalltalk,
 		"stas":                        heartbeat.LanguageStas,
 		"sv":                          heartbeat.LanguageSystemVerilog,
-		"tal":                         heartbeat.LanguageUxntal,
 		"Tal":                         heartbeat.LanguageUxntal,
+		"tal":                         heartbeat.LanguageUxntal,
 		"tape":                        heartbeat.LanguageVHS,
 		"tf":                          heartbeat.LanguageTerraform,
 		"Transact-SQL":                heartbeat.LanguageTransactSQL,