Order syntax files, with custom syntax files first

Fixes #460

diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go
index c71870e50f4ae7da7e653e3ddf1f100d21d399ef..42279bfdbbbca98d13b3ca01baf4886c046c8918 100644 (file)
--- a/cmd/micro/highlighter.go
+++ b/cmd/micro/highlighter.go
@@ -26,6 +26,7 @@ type SyntaxRule struct {
        style tcell.Style
 }
 
+var syntaxKeys [][2]*regexp.Regexp
 var syntaxFiles map[[2]*regexp.Regexp]FileTypeRules
 
 // LoadSyntaxFiles loads the syntax files from the default directory (configDir)
@@ -124,6 +125,7 @@ func LoadSyntaxFile(text, filename string) {
        if syntaxRegex != nil {
                // Add the current rules to the syntaxFiles variable
                regexes := [2]*regexp.Regexp{syntaxRegex, headerRegex}
+               syntaxKeys = append(syntaxKeys, regexes)
                syntaxFiles[regexes] = FileTypeRules{filetype, filename, text}
        }
 }
@@ -259,13 +261,13 @@ func LoadRulesFromFile(text, filename string) []SyntaxRule {
 
 // FindFileType finds the filetype for the given buffer
 func FindFileType(buf *Buffer) string {
-       for r := range syntaxFiles {
+       for _, r := range syntaxKeys {
                if r[1] != nil && r[1].MatchString(buf.Line(0)) {
                        // The header statement matches the first line
                        return syntaxFiles[r].filetype
                }
        }
-       for r := range syntaxFiles {
+       for _, r := range syntaxKeys {
                if r[0] != nil && r[0].MatchString(buf.Path) {
                        // The syntax statement matches the extension
                        return syntaxFiles[r].filetype
@@ -277,7 +279,7 @@ func FindFileType(buf *Buffer) string {
 // GetRules finds the syntax rules that should be used for the buffer
 // and returns them. It also returns the filetype of the file
 func GetRules(buf *Buffer) []SyntaxRule {
-       for r := range syntaxFiles {
+       for _, r := range syntaxKeys {
                if syntaxFiles[r].filetype == buf.FileType() {
                        return LoadRulesFromFile(syntaxFiles[r].text, syntaxFiles[r].filename)
                }