mirror of
https://github.com/ralsina/tartrazine.git
synced 2024-09-20 07:21:22 +00:00
changed getAlphabeticalOrderedKeys to use sort.Strings
This commit is contained in:
parent
4ed60ad05b
commit
1bf555bc4c
@ -3,6 +3,7 @@ package generator
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"sort"
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
@ -24,11 +25,7 @@ func Languages(data []byte, languagesTmplPath, languagesTmplName, commit string)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
orderedKeyList, err := getAlphabeticalOrderedKeys(data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
orderedKeyList := getAlphabeticalOrderedKeys(languages)
|
||||
languagesByExtension := buildExtensionLanguageMap(languages, orderedKeyList)
|
||||
|
||||
buf := &bytes.Buffer{}
|
||||
@ -39,18 +36,14 @@ func Languages(data []byte, languagesTmplPath, languagesTmplName, commit string)
|
||||
return buf.Bytes(), nil
|
||||
}
|
||||
|
||||
func getAlphabeticalOrderedKeys(data []byte) ([]string, error) {
|
||||
var yamlSlice yaml.MapSlice
|
||||
if err := yaml.Unmarshal(data, &yamlSlice); err != nil {
|
||||
return nil, err
|
||||
func getAlphabeticalOrderedKeys(languages map[string]*languageInfo) []string {
|
||||
keyList := make([]string, 0)
|
||||
for lang := range languages {
|
||||
keyList = append(keyList, lang)
|
||||
}
|
||||
|
||||
orderedKeyList := make([]string, 0)
|
||||
for _, lang := range yamlSlice {
|
||||
orderedKeyList = append(orderedKeyList, lang.Key.(string))
|
||||
}
|
||||
|
||||
return orderedKeyList, nil
|
||||
sort.Strings(keyList)
|
||||
return keyList
|
||||
}
|
||||
|
||||
func buildExtensionLanguageMap(languages map[string]*languageInfo, orderedKeyList []string) map[string][]string {
|
||||
|
Loading…
Reference in New Issue
Block a user