ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2024-11-13 23:12:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7 from smola/saltstack

Browse Source 
fix .sls disambiguation (Scheme/SaltStack).
This commit is contained in:
Máximo Cuadros 2016-09-15 17:58:00 +02:00 committed by GitHub
commit 2f971ef00d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content.go
View File

@ -402,13 +402,10 @@ var matchers = map[string]languageMatcher{
return OtherLanguage, false return OtherLanguage, false
}, },
".sls": func(i []byte) (string, bool) { ".sls": func(i []byte) (string, bool) {
if substring.BytesRegexp("## |@no-lib-strip@").Match(i) { if schemeMatcher.Match(i) {
return "World of Warcraft Addon Data", true return "Scheme", true
} else if substring.BytesRegexp("(contentsline|defcounter|beamer|boolfalse)").Match(i) {
return "TeX", true
} }
return "SaltStack", false
return OtherLanguage, false
}, },
".sql": func(i []byte) (string, bool) { ".sql": func(i []byte) (string, bool) {
if pgSQLMatcher.Match(i) { if pgSQLMatcher.Match(i) {
@ -484,4 +481,5 @@ var (
substring.BytesRegexp(`(?i)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`), substring.BytesRegexp(`(?i)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`),
substring.BytesRegexp(`(?i)constructor\W+function`), substring.BytesRegexp(`(?i)constructor\W+function`),
) )
schemeMatcher = substring.BytesRegexp(`(?m)\A(^\s*;;.*$)*\s*\(`)
) )