From f6b7aaebbd1d4625548ed035475d4140db939242 Mon Sep 17 00:00:00 2001 From: Saeed Rasooli Date: Thu, 13 Oct 2016 01:52:10 +0330 Subject: [PATCH] Improvement: FindFileType: header regex should be prior to file extention --- cmd/micro/highlighter.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go index 413372d6..c71870e5 100644 --- a/cmd/micro/highlighter.go +++ b/cmd/micro/highlighter.go @@ -259,13 +259,16 @@ func LoadRulesFromFile(text, filename string) []SyntaxRule { // FindFileType finds the filetype for the given buffer func FindFileType(buf *Buffer) string { + for r := range syntaxFiles { + 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 { if r[0] != nil && r[0].MatchString(buf.Path) { // The syntax statement matches the extension return syntaxFiles[r].filetype - } else if r[1] != nil && r[1].MatchString(buf.Line(0)) { - // The header statement matches the first line - return syntaxFiles[r].filetype } } return "Unknown"