Many optimizations and new syntax files

syntax_files/README.md

@@ -1,5 +1,11 @@
 # Syntax Files
 
-Here are highlight's syntax files. If you would like to make a new syntax file, you should first check it
-with the `syntax_checker.go` program. Just place it in this directory and run the program (`go run syntax_checker.go`)
-and it will let you know if there are issues with any of the files in the directory.
+Here are highlights's syntax files.
+
+Each yaml file specifies how to detect the filetype based on file extension or headers (first line of the file).
+Then there are patterns and regions linked to highlight groups which tell micro how to highlight that filetype.
+
+Making your own syntax files is very simple. I recommend you check the file after you are finished with the
+[`syntax_checker.go`](./syntax_checker.go) program (located in this directory). Just place your yaml syntax
+file in the current directory and run `go run syntax_checker.go` and it will check every file. If there are no
+errors it will print `No issues!`.

syntax_files/apacheconf.yaml

@@ -0,0 +1,58 @@
+filetype: apacheconf
+
+detect:
+    filename: "httpd\\.conf|mime\\.types|vhosts\\.d\\\\*|\\.htaccess"
+
+rules:
+    - identifier: "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
+    - identifier: "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)"
+    - identifier: "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)"
+    - identifier: "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
+    - identifier: "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
+    - identifier: "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
+    - identifier: "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
+    - identifier: "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
+    - identifier: "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
+    - identifier: "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
+    - identifier: "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
+    - identifier: "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
+    - identifier: "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
+    - identifier: "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
+    - identifier: "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)"
+    - identifier: "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
+    - identifier: "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
+    - identifier: "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
+    - identifier: "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
+    - identifier: "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
+    - identifier: "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
+    - identifier: "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
+    - identifier: "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)"
+    - identifier: "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
+    - identifier: "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
+    - identifier: "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
+    - identifier: "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)"
+    - identifier: "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)"
+    - identifier: "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)"
+    - identifier: "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
+    - identifier: "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
+    - identifier: "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
+    - identifier: "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
+    - identifier: "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
+    - identifier: "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
+    - identifier: "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
+    - symbol.tag: "<[^>]+>"
+    - identifier: "</?[A-Za-z]+"
+    - identifier: "(<|</|>)"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/arduino.yaml

@@ -74,13 +74,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - preproc: "..+"
             - constant.specialChar: "\\\\."
@@ -96,3 +96,4 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/asciidoc.yaml

@@ -4,30 +4,48 @@ detect:
     filename: "\\.(asc|asciidoc|adoc)$"
 
 rules:
-    - red: "^====+$"
-    - red: "^==[[:space:]].*$"
-    - red: "^----+$"
-    - magenta: "^===[[:space:]].*$"
-    - magenta: "^~~~~+$"
-    - green: "^====[[:space:]].*$"
-    - green: "^\\^\\^\\^\\^+$"
-    - brightblue: "^=====[[:space:]].*$"
-    - brightblue: "^\\+\\+\\+\\++$"
-    - brightgreen: ":.*:"
-    - brightred: "\\{[a-z0-9]*\\}"
-    - red: "\\\\\\{[a-z0-9]*\\}"
-    - red: "\\+\\+\\+\\{[a-z0-9]*\\}\\+\\+\\+"
-    - yellow: "^\\..*$"
-    - magenta: "^\\[(source,.+|NOTE|TIP|IMPORTANT|WARNING|CAUTION)\\]"
-    - yellow: ".*[[:space:]]\\+$"
-    - yellow: "_[^_]+_"
-    - yellow: "\\*[^\\*]+\\*"
-    - yellow: "\\+[^\\+]+\\+"
-    - yellow: "`[^`]+`"
-    - yellow: "\\^[^\\^]+\\^"
-    - yellow: "~[^~]+~"
-    - yellow: "'[^']+'"
-    - cyan: "`{1,2}[^']+'{1,2}"
-    - brightmagenta: "^[[:space:]]*[\\*\\.-]{1,5}[[:space:]]"
-    - brightwhite: "\\[\\[.*\\]\\]"
-    - brightwhite: "<<.*>>"
+    # main header
+    - preproc: "^====+$"
+      # h1
+    - statement: "^==[[:space:]].*$"
+    - statement: "^----+$"
+      # h2
+    - symbol: "^===[[:space:]].*$"
+    - symbol: "^~~~~+$"
+      # h4
+    - type: "^====[[:space:]].*$"
+    - type: "^\\^\\^\\^\\^+$"
+      # h5
+    - constant: "^=====[[:space:]].*$"
+    - constant: "^\\+\\+\\+\\++$"
+
+      # attributes
+    - type.keyword: ":.*:"
+    - identifier.macro: "\\{[a-z0-9]*\\}"
+    - identifier: "\\\\\\{[a-z0-9]*\\}"
+    - identifier: "\\+\\+\\+\\{[a-z0-9]*\\}\\+\\+\\+"
+
+      # Paragraph Title
+    - statement: "^\\..*$"
+
+      # source 
+    - identifier: "^\\[(source,.+|NOTE|TIP|IMPORTANT|WARNING|CAUTION)\\]"
+
+      # Other markup
+    - constant.string: ".*[[:space:]]\\+$"
+    - constant.string: "_[^_]+_"
+    - constant.string: "\\*[^\\*]+\\*"
+    - constant.string: "\\+[^\\+]+\\+"
+    - constant.string: "`[^`]+`"
+    - constant.string: "\\^[^\\^]+\\^"
+    - constant.string: "~[^~]+~"
+    - constant.string: "'[^']+'"
+
+    - constant: "`{1,2}[^']+'{1,2}"
+
+      # bullets
+    - symbol: "^[[:space:]]*[\\*\\.-]{1,5}[[:space:]]"
+
+      # anchors
+    - "bold default": "\\[\\[.*\\]\\]"
+    - "bold default": "<<.*>>"

syntax_files/asm.yaml

@@ -90,13 +90,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -105,3 +105,4 @@ rules:
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/awk.yaml

@@ -0,0 +1,42 @@
+filetype: awk
+
+detect:
+    filename: "\\.awk$"
+    header: "^#!.*bin/(env +)?awk( |$)"
+
+rules:
+    - preproc: "\\$[A-Za-z0-9_!@#$*?\\-]+"
+    - preproc: "\\b(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\\b"
+    - preproc: "\\b(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\\b"
+    - preproc: "\\b(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\\b"
+    - identifier.class: "\\b(function|extension|BEGIN|END)\\b"
+    - symbol.operator: "[\\-+*/%^|!=&<>?;:]|\\\\|\\[|\\]"
+    - statement:  "\\b(for|if|while|do|else|in|delete|exit)\\b"
+    - special:  "\\b(break|continue|return)\\b"
+    - statement: "\\b(close|getline|next|nextfile|print|printf|system|fflush)\\b"
+    - statement: "\\b(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\\b"
+    - statement: "\\b(asort|asorti|gensub|gsub|index|length|match)\\b"
+    - statement: "\\b(split|sprintf|strtonum|sub|substr|tolower|toupper)\\b"
+    - statement: "\\b(mktime|strftime|systime)\\b"
+    - statement: "\\b(and|compl|lshift|or|rshift|xor)\\b"
+    - statement: "\\b(bindtextdomain|dcgettext|dcngettext)\\b"
+    - special:   "/.*[^\\\\]/"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/c++.yaml

@@ -0,0 +1,28 @@
+filetype: c++
+
+detect: 
+    filename: "\\.c(c|pp|xx)$|\\.h(h|pp|xx)$|\\.ii?$|\\.(def)$"
+
+rules:
+    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b"
+    - type: "\\b(auto|float|double|bool|char|int|short|long|sizeof|enum|void|static|const|constexpr|struct|union|typedef|extern|(un)?signed|inline)\\b"
+    - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
+    - statement: "\\b(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\\b"
+    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
+    - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
+    - special: "\\b(goto|continue|break|return)\\b"
+    - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+    - constant: "'([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'|'\\\\(([0-3]?[0-7]{1,2}))'|'\\\\x[0-9A-Fa-f]{1,2}'"
+    - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+    - symbol.operator: "[.:;,+*|=!\\%]|<|>|/|-|&"
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    - constant.number: "\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b"
+    - constant.bool: "\\b(true|false)\\b|NULL"
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment: "//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - indent-char.whitespace: "[[:space:]]+$"

syntax_files/c.yaml

@@ -7,6 +7,7 @@ rules:
     - identifier: "\\b[A-Z_][0-9A-Z_]+\\b" 
     - type: "\\b(float|double|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\\b"
     - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
+    - type.extended: "\\b(bool)\\b"
     - statement: "\\b(typename|mutable|volatile|register|explicit)\\b"
     - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
     - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
@@ -19,19 +20,20 @@ rules:
     - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)"
     - statement: "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
       # Operator Color
-    - statement: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+    - symbol.brackets: "[(){}]|\\[|\\]"
     - constant.number: "(\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b)"
     - constant.number: "NULL"
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - preproc: "..+"
             - constant.specialChar: "\\\\."
@@ -47,3 +49,4 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/caddyfile.yaml

@@ -10,7 +10,7 @@ rules:
     - constant.specialChar: "^\\s*}$"
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
@@ -19,3 +19,4 @@ rules:
         start: "#"
         end: "$"
         rules: []
+

syntax_files/clojure.yaml

@@ -0,0 +1,37 @@
+filetype: clojure
+
+detect:
+    filename: "\\.(clj)$"
+
+rules:
+
+    # Constants
+    - constant.bool: "\\b(true|false)\\b"
+    - constant.macro: "\\b(nil)\\b"
+      # Valid numbers
+    - constant.number: "[\\-]?[0-9]+?\\b"
+    - constant.number: "0x[0-9][A-Fa-f]+?\\b"
+    - constant.number: "[\\-]?(3[0-6]|2[0-9]|1[0-9]|[2-9])r[0-9A-Z]+?\\b"
+      # Invalid numbers
+    - error: "[\\-]?([4-9][0-9]|3[7-9]|1|0)r[0-9A-Z]+?\\b"
+
+      # Symbols
+    - symbol.operator: "[=>+\\-*/'?]"
+
+      # Types/casting
+    - type: "\\b(byte|short|(big)?int(eger)?|long|float|num|bigdec|rationalize)\\b"
+
+      # String highlighting
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "(\\\\u[0-9A-fa-f]{4,4}|\\\\newline|\\\\space|\\\\tab|\\\\formfeed|\\\\backspace|\\\\return|\\\\.)"
+
+      # Comments
+    - comment:
+        start: ";"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/cmake.yaml

@@ -0,0 +1,40 @@
+filetype: cmake
+
+detect:
+    filename: "(CMakeLists\\.txt|\\.cmake)$"
+
+rules:
+    - identifier.var: "^[[:space:]]*[A-Z0-9_]+"
+    - preproc: "^[[:space:]]*(include|include_directories|include_external_msproject)\\b"
+
+    - statement: "^[[:space:]]*\\b((else|end)?if|else|(end)?while|(end)?foreach|break)\\b"
+    - statement: "\\b(COPY|NOT|COMMAND|PROPERTY|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\\b[[:space:]]"
+    - statement: "[[:space:]]\\b(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\\b[[:space:]]"
+
+    - special: "^[[:space:]]*\\b((end)?(function|macro)|return)"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - preproc:
+        start: "\\$(\\{|ENV\\{)"
+        end: "\\}"
+        rules: []
+
+    - identifier.macro: "\\b(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\\b"
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/coffeescript.yaml

@@ -4,19 +4,19 @@ detect:
     filename: "\\.coffee$"
 
 rules:
-    - statement: "[!&|=/*+-<>]|\\b(and|or|is|isnt|not)\\b"
-    - identifier: "([A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\\()|->)"
-    - statement: "[()]"
+    - symbol.operator: "[!&|=/*+-<>]|\\b(and|or|is|isnt|not)\\b"
+    - identifier.class: "([A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\\()|->)"
+    - symbol.brackets: "[()]"
     - statement:  "\\b(for|of|continue|break|isnt|null|unless|this|else|if|return)\\b"
     - statement:  "\\b(try|catch|finally|throw|new|delete|typeof|in|instanceof)\\b"
     - statement:  "\\b(debugger|switch|while|do|class|extends|super)\\b"
     - statement:  "\\b(undefined|then|unless|until|loop|of|by|when)\\b"
-    - constant:  "\\b(true|false|yes|no|on|off)\\b"
-    - preproc: "@[A-Za-z0-9_]*"
+    - constant.bool:  "\\b(true|false|yes|no|on|off)\\b"
+    - identifier: "@[A-Za-z0-9_]*"
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
@@ -25,3 +25,4 @@ rules:
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/conf.yaml

@@ -0,0 +1,16 @@
+filetype: conf
+
+detect:
+    filename: "\\.c[o]?nf$"
+
+rules:
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+

syntax_files/conky.yaml

@@ -0,0 +1,17 @@
+filetype: conky
+
+detect:
+    filename: "(\\.*conkyrc.*$|conky.conf)"
+
+rules:
+    - type: "\\b(alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_height|default_bar_width|default_color|default_gauge_height|default_gauge_width|default_graph_height|default_graph_width|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|http_refresh|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|lua_shutdown_hook|lua_startup_hook|mail_spool|max_port_monitor_connections|max_text_width|max_user_text|maximum_width|minimum_height|minimum_width|mpd_host|mpd_password|mpd_port|music_player_interval|mysql_host|mysql_port|mysql_user|mysql_password|mysql_db|net_avg_samples|no_buffers|nvidia_display|out_to_console|out_to_http|out_to_ncurses|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|times_in_seconds|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\\b"
+
+      # Configuration item constants
+    - statement: "\\b(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|middle_middle|undecorated|yes)\\b"
+
+      # Variables
+    - preproc: "\\b(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|ioscheduler|irc|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\\b"
+
+    - identifier.var: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - symbol.operator: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - constant.macro: "^TEXT$"

syntax_files/cpp.yaml

@@ -15,25 +15,26 @@ rules:
     - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
     - constant: "('([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'|'\\\\(([0-3]?[0-7]{1,2}))'|'\\\\x[0-9A-Fa-f]{1,2}')"
 
-      ##
-      ## GCC builtins
+      # GCC builtins
     - statement: "(__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__)"
 
-      #Operator Color
-    - statement: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+      # Operator Color
+    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+      # Parenthetical Color
+    - symbol.brackets: "[(){}]|\\[|\\]"
 
     - constant.number: "(\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b)"
-    - constant.number: "(\\b(true|false)\\b|NULL)"
+    - constant.bool: "(\\b(true|false)\\b|NULL)"
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - preproc: "..+"
             - constant.specialChar: "\\\\."
@@ -49,3 +50,4 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/crystal.yaml

@@ -0,0 +1,61 @@
+filetype: crystal
+
+detect:
+    filename: "\\.cr$|Gemfile|config.ru|Rakefile|Capfile|Vagrantfile"
+
+rules:
+    # Asciibetical list of reserved words
+    - statement: "\\b(BEGIN|END|abstract|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|enum|false|for|fun|if|in|include|lib|loop|macro|module|next|nil|not|of|or|pointerof|private|protected|raise|redo|require|rescue|retry|return|self|sizeof|spawn|struct|super|then|true|type|undef|union|uninitialized|unless|until|when|while|yield)\\b"
+      # Constants
+    - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - constant.number: "\\b[0-9]+\\b"
+      # Crystal "symbols"
+    - constant:  "([ 	]|^):[0-9A-Z_]+\\b"
+      # Some unique things we want to stand out
+    - constant: "\\b(__FILE__|__LINE__)\\b"
+      # Regular expressions
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+
+      # Shell command expansion is in `backticks` or like %x{this}.  These are
+      # "double-quotish" (to use a perlism).
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - constant.string:
+        start: "%x\\{"
+        end: "\\}"
+        rules: []
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialchar: "\\\\."
+            - special: "#\\{[^}]*\\}"
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment.bright:
+        start: "##"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+

syntax_files/csharp.yaml

@@ -0,0 +1,49 @@
+filetype: csharp
+
+detect:
+    filename: "\\.cs"
+
+rules:
+    # Class
+    - identifier.class: "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
+
+      # Annotation
+    - identifier.var: "@[A-Za-z]+"
+
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+    - type: "\\b(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\\b"
+    - statement: "\\b(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\\b"
+    - statement: "\\b(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\\b"
+      # LINQ-only keywords (ones that cannot be used outside of a LINQ query - lots others can)
+    - statement: "\\b(from|where|select|group|info|orderby|join|let|in|on|equals|by|ascending|descending)\\b"
+    - special: "\\b(break|continue)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - symbol.operator: "[\\-+/*=<>?:!~%&|]"
+    - constant.number: "\\b([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\\b"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/cython.yaml

@@ -0,0 +1,50 @@
+filetype: cython
+
+detect:
+    filename: "\\.pyx$|\\.pxd$|\\.pyi$"
+
+rules:
+    # Python Keyword Color
+    - statement: "\\b(and|as|assert|class|def|DEF|del|elif|ELIF|else|ELSE|except|exec|finally|for|from|global|if|IF|import|in|is|lambda|map|not|or|pass|print|raise|try|while|with|yield)\\b"
+    - special: "\\b(continue|break|return)\\b"
+
+      # Cython Keyword Color
+    - identifier.macro: "\\b(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\\b"
+    - type: "\\b(bint|char|double|int|public|void|unsigned)\\b"
+
+      # Operator Color
+    - symbol: "[.:;,+*|=!\\%]|<|>|/|-|&"
+
+      # Parenthetical Color
+    - symbol.brackets: "[(){}]|\\[|\\]"
+
+    - constant.string:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'''"
+        end: "'''"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/d.yaml

@@ -26,7 +26,7 @@ rules:
     # Character literals
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
     # Keywords
@@ -52,13 +52,13 @@ rules:
     # DoubleQuotedString
     - constant.string: 
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules: 
             - constant.specialChar: "\\\\."
     # WysiwygString
     - constant.string:
         start: "r\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.string:
@@ -69,7 +69,7 @@ rules:
     # HexString
     - constant.string:
         start: "x\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     # DelimitedString
@@ -116,3 +116,4 @@ rules:
         start: "/\\+"
         end: "\\+/"
         rules: []
+

syntax_files/dart.yaml

@@ -32,12 +32,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
+

syntax_files/dockerfile.yaml

@@ -22,12 +22,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
+

syntax_files/dot.yaml

@@ -0,0 +1,28 @@
+filetype: dot
+
+detect:
+    filename: "\\.(dot|gv)$"
+
+rules:
+    - type:   "\\b(digraph|edge|graph|node|subgraph)\\b"
+    - statement: "\\b(arrow(head|size|tail)|(bg|fill|font)?color|center|constraint|decorateP|dir|distortion|font(name|size)|head(clip|label)|height|label(angle|distance|font(color|name|size))?|layer(s)?|margin|mclimit|minlen|name|nodesep|nslimit|ordering|orientation|page(dir)?|peripheries|port_label_distance|rank(dir|sep)?|ratio|regular|rotate|same(head|tail)|shape(file)?|sides|size|skew|style|tail(clip|label)|URL|weight|width)\\b"
+    - symbol:  "=|->|--"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/erb.yaml

@@ -0,0 +1,42 @@
+filetype: erb
+
+detect: 
+    filename: "\\.erb$|\\.rhtml$"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*|>)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*|>)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"
+    - default:
+        start: "<%"
+        end: "%>"
+        rules: []
+
+    - preproc: "<%|%>"
+    - red: "&[^;[[:space:]]]*;"
+    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\\b"
+    - identifier.var: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - magenta: "(?i)([  ]|^):[0-9A-Z_]+\\b"
+    - identifier.macro: "\\b(__FILE__|__LINE__)\\b"
+    - brightmagenta: "!/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - brightblue: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - brightgreen: "#\\{[^}]*\\}"
+    - green: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment.bright: "##[^{].*$|##$"
+    - identifier.macro:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"

syntax_files/fish.yaml

@@ -29,13 +29,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules: []
 
     - comment:
@@ -43,3 +43,4 @@ rules:
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/fortran.yaml

@@ -0,0 +1,61 @@
+filetype: fortran
+
+detect:
+    filename: "\\.([Ff]|[Ff]90|[Ff]95|[Ff][Oo][Rr])$"
+
+rules:
+    - type:  "(?i)\\b(action|advance|all|allocatable|allocated|any|apostrophe)\\b"
+    - type:  "(?i)\\b(append|asis|assign|assignment|associated|character|common)\\b"
+    - type:  "(?i)\\b(complex|data|default|delim|dimension|double precision)\\b"
+    - type:  "(?i)\\b(elemental|epsilon|external|file|fmt|form|format|huge)\\b"
+    - type:  "(?i)\\b(implicit|include|index|inquire|integer|intent|interface)\\b"
+    - type:  "(?i)\\b(intrinsic|iostat|kind|logical|module|none|null|only)\\\\b"
+    - type:  "(?i)\\b(operator|optional|pack|parameter|pointer|position|private)\\b"
+    - type:  "(?i)\\b(program|public|real|recl|recursive|selected_int_kind)\\b"
+    - type:  "(?i)\\b(selected_real_kind|subroutine|status)\\b"
+
+    - constant:  "(?i)\\b(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\\b" 
+    - constant:  "(?i)\\b(close|contains|count|cpu_time|cshift|date_and_time)\\b" 
+    - constant:  "(?i)\\b(deallocate|digits|dot_product|eor|eoshift|function|iachar)\\b" 
+    - constant:  "(?i)\\b(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\\b" 
+    - constant:  "(?i)\\b(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\\b" 
+    - constant:  "(?i)\\b(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\\b" 
+    - constant:  "(?i)\\b(open|pad|present|print|product|pure|quote|radix)\\b" 
+    - constant:  "(?i)\\b(random_number|random_seed|range|read|readwrite|replace)\\b" 
+    - constant:  "(?i)\\b(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\\b" 
+    - constant:  "(?i)\\b(spread|sum|system_clock|target|transfer|transpose|trim)\\b" 
+    - constant:  "(?i)\\b(ubound|unpack|verify|write|tiny|type|use|yes)\\b"
+
+    - statement: "(?i)\\b(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\\b"
+    - statement: "(?i)\\b(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\\b"
+    - statement: "(?i)\\b(.or.|repeat|select case|then|where|while)\\b"
+
+    - special: "(?i)\\b(continue|cycle|exit|go?to|result|return)\\b"
+
+      #Operator Color
+    - symbol.operator: "[.:;,+*|=!\\%]|/|-|&"
+
+      #Parenthetical Color
+    - symbol.bracket: "[(){}]|\\[|\\]"
+
+      # Add preprocessor commands.
+    - preproc: "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "!"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/gdscript.yaml

@@ -0,0 +1,69 @@
+filetype: gdscript
+
+detect:
+    filename: "\\.gd$"
+
+rules:
+    # built-in objects
+    - constant: "\\b(null|self|true|false)\\b"
+      # built-in attributes
+      # color constant "\\b()\\b"
+      # built-in functions
+    - identifier: "\\b(abs|acos|asin|atan|atan2|ceil|clamp|convert|cos|cosh|db2linear|decimals|deg2rad|ease|exp|float|floor|fmod|fposmod|hash|int|isinf|isnan|lerp|linear2db|load|log|max|min|nearest_po2|pow|preload|print|printerr|printraw|prints|printt|rad2deg|rand_range|rand_seed|randomize|randi|randf|range|round|seed|sin|slerp|sqrt|str|str2var|tan|typeof|var2str|weakref)\\b"
+      # special method names
+    - identifier: "\\b(AnimationPlayer|AnimationTreePlayer|Button|Control|HTTPClient|HTTPRequest|Input|InputEvent|MainLoop|Node|Node2D|SceneTree|Spatial|SteamPeer|PacketPeer|PacketPeerUDP|Timer|Tween)\\b"
+      # types
+    - type: "\\b(Vector2|Vector3)\\b"
+      # definitions
+    - identifier: "func [a-zA-Z_0-9]+" 
+      # keywords
+    - statement: "\\b(and|as|assert|break|breakpoint|class|const|continue|elif|else|export|extends|for|func|if|in|map|not|onready|or|pass|return|signal|var|while|yield)\\b" 
+
+      # decorators
+    - special: "@.*[(]"
+
+      # operators
+    - statement: "[.:;,+*|=!\\%@]|<|>|/|-|&"
+
+      # parentheses
+    - statement: "[(){}]|\\[|\\]"
+
+      # numbers
+    - constant: "\\b[0-9]+\\b"
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - comment:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "'''"
+        end: "'''"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/gentoo-ebuild.yaml

@@ -6,39 +6,41 @@ detect:
 rules:
     # All the standard portage functions
     - identifier: "^src_(unpack|compile|install|test)|^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
-    # Highlight bash related syntax
+      # Highlight bash related syntax
     - statement: "\\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\\b"
     - statement: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
     - statement: "-(e|d|f|r|g|u|w|x|L)\\b"
-    - statement: "-(eq|ne|gt|lt|ge|le|s|n|z)\\b"   
-    # Highlight variables ... official portage ones in red, all others in bright red
+    - statement: "-(eq|ne|gt|lt|ge|le|s|n|z)\\b"
+      # Highlight variables ... official portage ones in red, all others in bright red
     - preproc: "\\$\\{?[a-zA-Z_0-9]+\\}?"
-    - special: "\\b(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\\b" 
+    - special: "\\b(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\\b"
     - special: "\\b(S|D|T|PV|PF|P|PN|A)\\b|\\bC(XX)?FLAGS\\b|\\bLDFLAGS\\b|\\bC(HOST|TARGET|BUILD)\\b"
-    # Highlight portage commands
+      # Highlight portage commands
     - identifier: "\\buse(_(with|enable))?\\b [!a-zA-Z0-9_+ -]*|inherit.*"
     - statement: "\\be(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\\b"
     - statement: "\\bdie\\b|\\buse(_(with|enable))?\\b|\\binherit\\b|\\bhas\\b|\\b(has|best)_version\\b|\\bunpack\\b"
     - statement: "\\b(do|new)(ins|s?bin|doc|lib(\\.so|\\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\\b"
-    - statement: "\\bdo(python|sed|dir|hard|sym|html|jar|mo)\\b|\\bkeepdir|\b"
+    - statement: "\\bdo(python|sed|dir|hard|sym|html|jar|mo)\\b|\\bkeepdir\\b"
     - statement: "prepall(docs|info|man|strip)|prep(info|lib|lib\\.(so|a)|man|strip)"
     - statement: "\\b(doc|ins|exe)into\\b|\\bf(owners|perms)\\b|\\b(exe|ins|dir)opts\\b"
-    # Highlight common commands used in ebuilds
+      # Highlight common commands used in ebuilds
     - type: "\\bmake\\b|\\b(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\\b"
-    # Highlight comments (doesnt work that well)
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
     - comment:
         start: "#"
         end: "$"
-        rules: []
-    # Highlight strings (doesnt work that well)
-    - constant.string:
-        start: "\""
-        end: "\""
         rules:
-            - constant.specialChar: "\\\\."
-    - constant.string:
-        start: "'"
-        end: "'"
-        rules:
-            - constant.specialChar: "\\\\."
-            
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/gentoo-etc-portage.yaml

@@ -0,0 +1,23 @@
+filetype: etc-portage
+
+detect:
+    filename: "\\.(keywords|mask|unmask|use)$"
+
+rules:
+    # Use flags:
+    - constant.bool.false: "[[:space:]]+\\+?[a-zA-Z0-9_-]+"
+    - constant.bool.true: "[[:space:]]+-[a-zA-Z0-9_-]+"
+    # Likely version numbers:
+    - special: "-[[:digit:]].*([[:space:]]|$)"
+    # Accepted arches:
+    - identifier.class: "[~-]?\\b(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\\b"
+    - identifier.class: "[[:space:]][~-]?\\*"
+    # Categories:
+    - statement: "^[[:space:]]*.*/"
+    # Masking regulators:
+    - symbol: "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+    # Comments:
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []

syntax_files/git-commit.yaml

@@ -26,5 +26,3 @@ rules:
     - keyword: "^#[[:space:]]On branch"
     # Recolor hash symbols
     - special: "#"
-    # Trailing spaces (+LINT is not ok, git uses tabs)
-    - error: "[[:space:]]+$"

syntax_files/git-rebase-todo.yaml

@@ -4,26 +4,24 @@ detect:
     filename: "git-rebase-todo"
 
 rules:
-    # Default
-    - ignore: ".*"
     # Comments
     - comment:
         start: "#"
         end: "$"
         rules: []
     # Rebase commands
-    - keyword: "^(e|edit) [0-9a-f]{7,40}"
-    - keyword: "^#  (e, edit)"
-    - keyword: "^(f|fixup) [0-9a-f]{7,40}"
-    - keyword: "^#  (f, fixup)"
-    - keyword: "^(p|pick) [0-9a-f]{7,40}"
-    - keyword: "^#  (p, pick)"
-    - keyword: "^(r|reword) [0-9a-f]{7,40}"
-    - keyword: "^#  (r, reword)"
-    - keyword: "^(s|squash) [0-9a-f]{7,40}"
-    - keyword: "^#  (s, squash)"
-    - keyword: "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
-    - keyword: "^#  (x, exec)"
+    - statement: "^(e|edit) [0-9a-f]{7,40}"
+    - statement: "^#  (e, edit)"
+    - statement: "^(f|fixup) [0-9a-f]{7,40}"
+    - statement: "^#  (f, fixup)"
+    - statement: "^(p|pick) [0-9a-f]{7,40}"
+    - statement: "^#  (p, pick)"
+    - statement: "^(r|reword) [0-9a-f]{7,40}"
+    - statement: "^#  (r, reword)"
+    - statement: "^(s|squash) [0-9a-f]{7,40}"
+    - statement: "^#  (s, squash)"
+    - statement: "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+    - statement: "^#  (x, exec)"
     # Recolor hash symbols
     - special: "#"
     # Commit IDs

syntax_files/glsl.yaml

@@ -5,13 +5,13 @@ detect:
 
 rules:
     - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
-    - type: "\\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\>"
-    - statement: "\\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\>"
-    - statement: "\\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\>"
-    - statement: "\\<(break|continue)\\>"
-    - constant: "\\<(true|false)\\>"
-    - statement: "[-+/*=<>?:!~%&|^]"
-    - constant.number: "\\<([0-9]+|0x[0-9a-fA-F]*)\\>"
+    - type: "\\b(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\b"
+    - identifier: "\\bgl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\b"
+    - statement: "\\b(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\b"
+    - statement: "\\b(break|continue)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - symbol.operator: "[-+/*=<>?:!~%&|^]"
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b"
 
     - comment: 
         start: "//"

syntax_files/go.yaml

@@ -4,20 +4,50 @@ detect:
     filename: "\\.go$"
 
 rules:
-    - statement: "\\b(break|case|continue|default|else|for|go|goto|if|range|return|switch)\\b"
-    - statement: "\\b(package|import|const|var|type|struct|func|go|defer|iota)\\b"
-    - statement: "[-+/*=<>!~%&|^]|:="
-    - identifier: "[a-zA-Z0-9]*\\("
+    # Conditionals and control flow
+    - special: "\\b(break|case|continue|default|go|goto|range|return)\\b"
+    - statement: "\\b(else|for|if|switch)\\b"
+    - preproc: "\\b(package|import|const|var|type|struct|func|go|defer|iota)\\b"
+    - symbol.operator: "[-+/*=<>!~%&|^]|:="
+
+      # Types
+    - special: "[a-zA-Z0-9]*\\("
+    - symbol: "(,|\\.)"
     - type: "\\b(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\\b"
     - type: "\\b(uintptr|byte|rune|string|interface|bool|map|chan|error)\\b"
-    - constant: "\\b(true|false|nil)\\b"
-    - statement: "(\\{|\\})"
-    - statement: "(\\(|\\))"
-    - statement: "(\\[|\\])"
-    - statement: "!"
-    - statement: ","
-    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b"
-    - constant.specialChar: "([0-7]{3|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+      ##I'm... not sure, but aren't structs a type?
+    - type.keyword: "\\b(struct)\\b"
+    - constant.bool: "\\b(true|false|nil)\\b"
+
+      # Brackets
+    - symbol.brackets: "(\\{|\\})"
+    - symbol.brackets: "(\\(|\\))"
+    - symbol.brackets: "(\\[|\\])"
+
+      # Numbers and strings
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - error: "..+"
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
 
     - comment:
         start: "//"
@@ -30,23 +60,3 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-
-    - constant.string:
-        start: "\""
-        end: "\""
-        rules:
-            - constant.specialChar: "\\\\."
-            - constant.specialChar: "%."
-
-    - constant.string:
-        start: "'"
-        end: "'"
-        rules:
-            - preproc: "..+"
-            - constant.specialChar: "%."
-            - constant.specialChar: "\\\\."
-
-    - constant.string:
-        start: "`"
-        end: "`"
-        rules: []

syntax_files/golo.yaml

@@ -0,0 +1,71 @@
+filetype: golo
+
+detect:
+    filename: "\\.golo$"
+
+rules:
+    - type: "\\b(function|fun|)\\b"
+    - type: "\\b(struct|DynamicObject|union|AdapterFabric|Adapter|DynamicVariable|Observable)\\b"
+    - type: "\\b(list|set|array|vector|tuple|map)\\b"
+    - type: "\\b(Ok|Error|Empty|None|Some|Option|Result|Result.ok|Result.fail|Result.error|Result.empty|Optional.empty|Optional.of)\\b"
+
+    - identifier.class: "\\b(augment|pimp)\\b"
+    - identifier.class: "\\b(interfaces|implements|extends|overrides|maker|newInstance)\\b"
+    - identifier.class: "\\b(isEmpty|isNone|isPresent|isSome|iterator|flattened|toList|flatMap|`and|orElseGet|`or|toResult|apply|either)\\b"
+    - identifier.class: "\\b(result|option|trying|raising|nullify|catching)\\b"
+    - identifier.class: "\\b(promise|setFuture|failedFuture|all|any)\\b"
+    - identifier.class: "\\b(initialize|initializeWithinThread|start|future|fallbackTo|onSet|onFail|cancel|enqueue)\\b"
+    - identifier.class: "\\b(println|print|raise|readln|readPassword|secureReadPassword|requireNotNull|require|newTypedArray|range|reversedRange|mapEntry|asInterfaceInstance|asFunctionalInterface|isClosure|fileToText|textToFile|fileExists|currentDir|sleep|uuid|isArray|arrayTypeOf|charValue|intValue|longValue|doubleValue|floatValue|removeByIndex|box)\\b"
+    - identifier.class: "\\b(likelySupported|reset|bold|underscore|blink|reverse_video|concealed|fg_black|fg_red|fg_green|fg_yellow|fg_blue|fg_magenta|fg_cyan|fg_white|bg_black|bg_red|bg_green|bg_yellow|bg_blue|bg_magenta|bg_cyan|bg_white|cursor_position|cursor_save_position|cursor_restore_position|cursor_up|cursor_down|cursor_forward|cursor_backward|erase_display|erase_line)\\b"
+    - identifier.class: "\\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\\b"
+    - identifier.class: "\\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\\b"
+    - identifier.class: "\\b(import)\\b"
+    - identifier.class: "\\b(module)\\b"
+    - identifier.class: "\\b(JSON)\\b"
+    - identifier.class: "\\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\\b"
+    - identifier.class: "\\b(newInstance|define|getKey|getValue|properties|fallback)\\b"
+    - identifier.class: "\\b(times|upTo|downTo)\\b"
+    - identifier.class: "\\b(format|toInt|toInteger|toDouble|toFloat|toLong)\\b"
+    - identifier.class: "\\b(head|tail|isEmpty|reduce|each|count|exists)\\b"
+    - identifier.class: "\\b(newWithSameType|destruct|append|add|addIfAbsent|prepend|insert|last|unmodifiableView|find|filter|map|join|reverse|reversed|order|ordered|removeAt|include|exclude|remove|delete|has|contains|getOrElse|toArray)\\b"
+    - identifier.class: "\\b(add|addTo|succ|pred|mul|neg|sub|rsub|div|rdiv|mod|rmod|pow|rpow|str|lt|gt|eq|ne|ge|le|`and|`or|`not|xor|even|odd|contains|isEmpty|`is|`isnt|`oftype|`orIfNull|fst|snd|getitem|setitem|getter|id|const|False|True|Null|curry|uncurry|unary|spreader|varargs|swapArgs|swapCurry|swapCouple|swap|invokeWith|pipe|compose|io|andThen|until|recur|cond)\\b"
+    - identifier.class: "\\b(toUpperCase|equals|startsWith)\\b"
+
+    - statement: "\\b(if|else|then|when|case|match|otherwise)\\b"
+    - special: "\\b(with|break|continue|return)\\b"
+    - error: "\\b(try|catch|finally|throw)\\b"
+    - identifier: "\\b(super|this|let|var|local)\\b"
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    - statement: "\\b(for|while|foreach|in)\\b"
+    - constant: "\\b(and|in|is|not|or|isnt|orIfNull)\\b"
+
+    - constant.bool: "\\b(true|false)\\b"
+    - constant:  "\\b(null|undefined)\\b"
+
+    - symbol.operator: "[\\-+/*=<>!~%&|^]|:="
+    - constant.number:   "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "----"
+        end: "----"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/groff.yaml

@@ -0,0 +1,30 @@
+filetype: groff
+
+detect: 
+    filename: "\\.m[ems]$|\\.rof|\\.tmac$|^tmac."
+
+rules:
+    - statement: "^\\.(ds|nr) [^[[:space:]]]*"
+    - constant.specialChar: "\\\\."
+    - constant.specialChar: "\\\\f.|\\\\f\\(..|\\\\s(\\+|\\-)?[0-9]"
+    - constant: "(\\\\|\\\\\\\\)n(.|\\(..)"
+    - constant:
+        start: "(\\\\|\\\\\\\\)n\\["
+        end: "]"
+        rules: []
+
+    - type: "^\\.[[:space:]]*[^[[:space:]]]*"
+    - comment: "^\\.\\\\\".*$"
+    - constant.string: "(\\\\|\\\\\\\\)\\*(.|\\(..)"
+    - constant.string:
+        start: "(\\\\|\\\\\\\\)\\*\\["
+        end: "]"
+        rules: []
+
+    - constant.specialChar: "\\\\\\(.."
+    - constant.specialChar:
+        start: "\\\\\\["
+        end: "]"
+        rules: []
+
+    - identifier.macro: "\\\\\\\\\\$[1-9]"

syntax_files/haml.yaml

@@ -0,0 +1,16 @@
+filetype: haml
+
+detect: 
+    filename: "\\.haml$"
+
+rules:
+    - symbol: "-|="
+    - default: "->|=>"
+    - constant: "([  ]|^)%[0-9A-Za-z_]+>"
+    - special: ":[0-9A-Za-z_]+>"
+    - type: "\\.[A-Za-z_]+>"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - identifier: "#\\{[^}]*\\}"
+    - identifier.var: "(@|@@)[0-9A-Z_a-z]+"
+    - comment: "#[^{].*$|#$"

syntax_files/haskell.yaml

@@ -0,0 +1,49 @@
+filetype: haskell
+
+detect:
+    filename: "\\.hs$"
+
+rules:
+    # Keywords
+    - statement: "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
+    - statement: "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
+    - statement: "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+
+      # Various symbols
+    - symbol: "(\\||@|!|:|_|~|=|\\\\|;|\\(\\)|,|\\[|\\]|\\{|\\})"
+
+      # Operators
+    - symbol.operator: "(==|/=|&&|\\|\\||<|>|<=|>=)"
+
+      # Various symbols
+    - special: "(->|<-)"
+    - symbol: "\\.|\\$"
+
+      # Data constructors
+    - constant.bool: "\\b(True|False)\\b"
+    - constant: "(Nothing|Just|Left|Right|LT|EQ|GT)"
+
+      # Data classes
+    - identifier.class: "[ ](Read|Show|Enum|Eq|Ord|Data|Bounded|Typeable|Num|Real|Fractional|Integral|RealFrac|Floating|RealFloat|Monad|MonadPlus|Functor)"
+
+      # Strings
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+      # Comments
+    - comment:
+        start: "--"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "\\{-"
+        end: "-\\}"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - identifier.micro: "undefined"

syntax_files/html.yaml

@@ -7,5 +7,21 @@ rules:
     - identifier: "<.*?>"
     - special: "&[^;[[:space:]]]*;"
     - statement: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
-    - constant: "\"[^\"]*\"|qq\\|.*\\|"
-    
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules: []
+
+    - default:
+        start: "<script.*?>"
+        end: "</script.*?>"
+        rules:
+            - include: "javascript"
+
+    - default:
+        start: "<style.*?>"
+        end: "</style.*?>"
+        rules:
+            - include: "css"
+

syntax_files/html4.yaml

@@ -0,0 +1,25 @@
+filetype: html4
+
+detect: 
+    filename: "\\.htm[l]?$"
+    header: "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN|http://www.w3.org/TR/html4/strict.dtd\">"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - default:
+        start: ">"
+        end: "<"
+        rules: []
+
+    - symbol.tag: "<|>"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"

syntax_files/html5.yaml

@@ -0,0 +1,25 @@
+filetype: html5
+
+detect: 
+    filename: "\\.htm[l]?$"
+    header: "<!DOCTYPE html5>"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a|a(bbr|ddress|rea|rticle|side|udio)|b|b(ase|d(i|o)|lockquote|r|utton)|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata|atalist|d|el|etails|fn|ialog|l|t)|em|embed|fieldset|fig(caption|ure)|form|iframe|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li|link|ma(in|p|rk)|menu|menuitem|met(a|er)|nav|noscript|o(bject|l|pt(group|ion)|utput)|p|param|picture|pre|progress|q|r(p|t|uby)|s|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u|ul|var|video|wbr)( .*)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - default:
+        start: ">"
+        end: "<"
+        rules: []
+
+    - symbol.tag: "<|>"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"

syntax_files/ini.yaml

@@ -0,0 +1,14 @@
+filetype: ini
+
+detect: 
+    filename: "\\.(ini|desktop|lfl|override)$|(mimeapps\\.list|pinforc|setup\\.cfg)$|weechat/.+\\.conf$"
+    header: "^\\[[A-Za-z]+\\]$"
+
+rules:
+    - constant.bool.true: "\\btrue\\b"
+    - constant.bool.false: "\\bfalse\\b"
+    - identifier: "^[[:space:]]*[^=]*="
+    - special: "^[[:space:]]*\\[.*\\]$"
+    - statement: "[=;]"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"

syntax_files/inputrc.yaml

@@ -0,0 +1,14 @@
+filetype: inputrc
+
+detect: 
+    filename: "inputrc$"
+
+rules:
+    - constant.bool.false: "\\b(off|none)\\b"
+    - constant.bool.true: "\\bon\\b"
+    - preproc: "\\bset|\\$include\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/java.yaml

@@ -12,13 +12,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - preproc: "..+"
             - constant.specialChar: "\\\\."
@@ -32,3 +32,4 @@ rules:
         start: "/\\*"
         end: "\\*/"
         rules: []
+

syntax_files/javascript.yaml

@@ -21,13 +21,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -40,3 +40,4 @@ rules:
         start: "/\\*"
         end: "\\*/"
         rules: []
+

syntax_files/json.yaml

@@ -12,12 +12,12 @@ rules:
     - constant: "\\b(true|false)\\b"
     - constant.string: 
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
     - statement: "\\\"(\\\\\"|[^\"])*\\\"[[:space:]]*:\"  \"'(\\'|[^'])*'[[:space:]]*:"

syntax_files/keymap.yaml

@@ -10,15 +10,16 @@ rules:
     - special: "="
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
     - comment:
         start: "^!"
         end: "$"
         rules: []
+

syntax_files/kickstart.yaml

@@ -0,0 +1,16 @@
+filetype: kickstart
+
+detect: 
+    filename: "\\.ks$|\\.kickstart$"
+
+rules:
+    - special: "%[a-z]+"
+    - statement: "^[[:space:]]*(install|cdrom|text|graphical|volgroup|logvol|reboot|timezone|lang|keyboard|authconfig|firstboot|rootpw|user|firewall|selinux|repo|part|partition|clearpart|bootloader)"
+    - constant: "--(name|mirrorlist|baseurl|utc)(=|\\>)"
+    - statement: "\\$(releasever|basearch)\\>"
+    - brightblack: "^@[A-Za-z][A-Za-z-]*"
+    - brightred: "^-@[a-zA-Z0-9*-]+"
+    - red: "^-[a-zA-Z0-9*-]+"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/ledger.yaml

@@ -0,0 +1,14 @@
+filetype: ledger
+
+detect: 
+    filename: "(^|\\.|/)ledger|ldgr|beancount|bnct$"
+
+rules:
+    - special: "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
+    - constant: "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
+    - statement: "^~ .*"
+    - identifier.var: "^= .*"
+    - identifier: "^[[:space:]]+(![[:space:]]+)?\\(?[A-Za-z ]+(:[A-Za-z ]+)*\\)?"
+    - identifier: "^[[:space:]]+(![[:space:]]+)?\\(?[A-Za-z_\\-]+(:[A-Za-z_\\-]+)*\\)?"
+    - symbol: "[*!]"
+    - comment: "^[[:space:]]*;.*"

syntax_files/lfe.yaml

@@ -0,0 +1,17 @@
+filetype: lfe
+
+detect: 
+    filename: "lfe$|\\.lfe$"
+
+rules:
+    - symbol.brackets: "\\(|\\)"
+    - type: "defun|define-syntax|define|defmacro|defmodule|export"
+    - constant: "\\ [A-Za-z][A-Za-z0-9_-]+\\ "
+    - symbol.operator: "\\(([\\-+*/<>]|<=|>=)|'"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant.string: "\\\"(\\\\.|[^\"])*\\\""
+    - special: "['|`][A-Za-z][A-Za-z0-9_\\-]+"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]]);.*"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/lilypond.yaml

@@ -11,7 +11,7 @@ rules:
     - special: "[(){}<>]|\\[|\\]"
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - comment:
@@ -22,3 +22,4 @@ rules:
         start: "%"
         end: "$"
         rules: []
+

syntax_files/lisp.yaml

@@ -0,0 +1,17 @@
+filetype: lisp
+
+detect: 
+    filename: "(emacs|zile)$|\\.(el|li?sp|scm|ss)$"
+
+rules:
+    - default: "\\([a-z-]+"
+    - symbol: "\\(([\\-+*/<>]|<=|>=)|'"
+    - constant.number: "\\b[0-9]+b>"
+    - special: "\\bnil\\b"
+    - preproc: "\\b[tT]b>"
+    - constant.string: "\\\"(\\\\.|[^\"])*\\\""
+    - constant.specialChar: "'[A-Za-z][A-Za-z0-9_-]+"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]]);.*"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/lua.yaml

@@ -26,13 +26,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -58,3 +58,4 @@ rules:
         start: "\\-\\-\\[\\["
         end: "\\]\\]"
         rules: []
+

syntax_files/makefile.yaml

@@ -23,7 +23,7 @@ rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
     - identifier: "\\$+(\\{[^} ]+\\}|\\([^) ]+\\))"
@@ -33,3 +33,4 @@ rules:
         start: "#"
         end: "$"
         rules: []
+

syntax_files/man.yaml

@@ -0,0 +1,12 @@
+filetype: man
+
+detect: 
+    filename: "\\.[1-9]x?$"
+
+rules:
+    - green: "\\.(S|T)H.*$"
+    - brightgreen: "\\.(S|T)H|\\.TP"
+    - brightred: "\\.(BR?|I[PR]?).*$"
+    - brightblue: "\\.(BR?|I[PR]?|PP)"
+    - brightwhite: "\\\\f[BIPR]"
+    - yellow: "\\.(br|DS|RS|RE|PD)"

syntax_files/micro.yaml

@@ -15,8 +15,8 @@ rules:
         rules: []
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.number: "#[0-9 A-F a-f]+"
-    
+    

syntax_files/mpdconf.yaml

@@ -0,0 +1,13 @@
+filetype: mpd
+
+detect: 
+    filename: "mpd\\.conf$"
+
+rules:
+    - statement: "\\b(user|group|bind_to_address|host|port|plugin|name|type)\\b"
+    - statement: "\\b((music|playlist)_directory|(db|log|state|pid|sticker)_file)\\b"
+    - special: "^(input|audio_output|decoder)[[:space:]]*\\{|\\}"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/nanorc.yaml

@@ -0,0 +1,16 @@
+filetype: nanorc
+
+detect: 
+    filename: "\\.?nanorc$"
+
+rules:
+    - default: "(?i)^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+    - type: "(?i)^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\\>|^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\\b"
+    - preproc: "(?i)^[[:space:]]*(set|unset|include|syntax|header)\\b"
+    - constant.bool.true: "(?i)(set)\\b"
+    - constant.bool.false: "(?i)(unset)\\b"
+    - identifier: "(?i)^[[:space:]]*(i)?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\\b"
+    - special: "(?i)^[[:space:]]*(i)?color\\b|\\b(start|end)="
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment: "^[[:space:]]*#.*$"
+    - comment.bright: "^[[:space:]]*##.*$"

syntax_files/nginx.yaml

@@ -0,0 +1,22 @@
+filetype: nginx
+
+detect: 
+    filename: "nginx.*\\.conf$|\\.nginx$"
+    header: "^(server|upstream)[a-z ]*\\{$"
+
+rules:
+    - preproc: "\\b(events|server|http|location|upstream)[[:space:]]*\\{"
+    - statement: "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
+    - constant.bool.true: "\\b(on)\\b"
+    - constant.bool.false: "\\b(off)\\b"
+    - identifier: "\\$[A-Za-z][A-Za-z0-9_]*"
+    - symbol: "[*]"
+    - constant-string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.string:
+        start: "'$"
+        end: "';$"
+        rules: []
+
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/nim.yaml

@@ -0,0 +1,27 @@
+filetype: nim
+
+detect: 
+    filename: "\\.nim$"
+
+rules:
+    - preproc: "[\\{\\|]\\b(atom|lit|sym|ident|call|lvalue|sideeffect|nosideeffect|param|genericparam|module|type|let|var|const|result|proc|method|iterator|converter|macro|template|field|enumfield|forvar|label|nk[a-zA-Z]+|alias|noalias)\\b[\\}\\|]"
+    - statement: "\\b(addr|and|as|asm|atomic|bind|block|break|case|cast|concept|const|continue|converter|defer|discard|distinct|div|do|elif|else|end|enum|except|export|finally|for|from|func|generic|if|import|in|include|interface|is|isnot|iterator|let|macro|method|mixin|mod|nil|not|notin|object|of|or|out|proc|ptr|raise|ref|return|shl|shr|static|template|try|tuple|type|using|var|when|while|with|without|xor|yield)\\b"
+    - statement: "\\b(deprecated|noSideEffect|constructor|destructor|override|procvar|compileTime|noReturn|acyclic|final|shallow|pure|asmNoStackFrame|error|fatal|warning|hint|line|linearScanEnd|computedGoto|unroll|immediate|checks|boundsChecks|overflowChecks|nilChecks|assertations|warnings|hints|optimization|patterns|callconv|push|pop|global|pragma|experimental|bitsize|volatile|noDecl|header|incompleteStruct|compile|link|passC|passL|emit|importc|importcpp|importobjc|codegenDecl|injectStmt|intdefine|strdefine|varargs|exportc|extern|bycopy|byref|union|packed|unchecked|dynlib|cdecl|thread|gcsafe|threadvar|guard|locks|compileTime)\\b"
+    - symbol.operator: "[=\\+\\-\\*/<>@\\$~&%\\|!\\?\\^\\.:\\\\]+"
+    - special: "\\{\\.|\\.\\}|\\[\\.|\\.\\]|\\(\\.|\\.\\)|;|,|`"
+    - statement: "\\.\\."
+    - type: "\\b(int|cint|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|float|float32|float64|bool|char|enum|string|cstring|array|openarray|seq|varargs|tuple|object|set|void|auto|cshort|range|nil|T|untyped|typedesc)\\b"
+    - type: "'[iI](8|16|32|64)?\\b|'[uU](8|16|32|64)?\\b|'[fF](32|64|128)?\\b|'[dD]\\b"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant.number: "\\b0[xX][0-9A-Fa-f][0-9_A-Fa-f]+\\b"
+    - constant.number: "\\b0[ocC][0-7][0-7_]+\\b"
+    - constant.number: "\\b0[bB][01][01_]+\\b"
+    - constant.number: "\\b[0-9_]((\\.?)[0-9_]+)?[eE][+\\-][0-9][0-9_]+\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "[[:space:]]*#.*$"
+    - comment:
+        start: "\\#\\["
+        end: "\\]\\#"
+        rules: []
+
+    - todo: "(TODO|FIXME|XXX):?"

syntax_files/objc.yaml

@@ -34,13 +34,13 @@ rules:
 
     - constant.string:
         start: "@\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
@@ -55,3 +55,4 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/pascal.yaml

@@ -22,7 +22,7 @@ rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
     - preproc:
@@ -41,3 +41,4 @@ rules:
         start: "({)(?:[^$])"
         end: "}"
         rules: []
+

syntax_files/patch.yaml

@@ -0,0 +1,13 @@
+filetype: patch
+
+detect: 
+    filename: "\\.(patch|diff)$"
+
+rules:
+    - brightgreen: "^\\+.*"
+    - green: "^\\+\\+\\+.*"
+    - brightblue: "^ .*"
+    - brightred: "^-.*"
+    - red: "^---.*"
+    - brightyellow: "^@@.*"
+    - magenta: "^diff.*"

syntax_files/peg.yaml

@@ -0,0 +1,16 @@
+filetype: peg
+
+detect: 
+    filename: "\\.l?peg$"
+
+rules:
+    - identifier: "^[[:space:]]*[A-Za-z][A-Za-z0-9_]*[[:space:]]*<-"
+    - constant.number: "\\^[+-]?[0-9]+"
+    - symbol.operator: "[-+*?^/!&]|->|<-|=>"
+    - identifier.var: "%[A-Za-z][A-Za-z0-9_]*"
+    - special: "\\[[^]]*\\]"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "(^|[[:space:]])\\-\\-.*$"
+    - todo: "TODO:?"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/perl.yaml

@@ -0,0 +1,27 @@
+filetype: perl
+
+detect: 
+    filename: "\\.p[lm]$"
+    header: "^#!.*/(env +)?perl( |$)"
+
+rules:
+    - type: "\\b(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\\b|\\b(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\\b|\\b(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\\b|\\b(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\\b|\\b(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\\b"
+    - statement: "\\b(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\\b"
+    - identifier:
+        start: "[$@%]"
+        end: "((?i) |[^0-9A-Z_]|-)"
+        rules: []
+
+    - constant.string: "\".*\"|qq\\|.*\\|"
+    - default: "[sm]/.*/"
+    - preproc:
+        start: "(^use| = new)"
+        end: ";"
+        rules: []
+
+    - comment: "#.*"
+    - identifier.macro:
+        start: "<< 'STOP'"
+        end: "STOP"
+        rules: []
+

syntax_files/perl6.yaml

@@ -0,0 +1,27 @@
+filetype: perl6
+
+detect: 
+    filename: "\\.p6$"
+
+rules:
+    - type: "\\b(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\\b"
+    - statement: "\\b(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\\b"
+    - special: "\\b(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\\b"
+    - identifier:
+        start: "[$@%]"
+        end: "( |\\\\W|-)"
+        rules: []
+
+    - constant.string: "\".*\"|qq\\|.*\\|"
+    - default: "[sm]/.*/"
+    - preproc:
+        start: "(^use| = new)"
+        end: ";"
+        rules: []
+
+    - comment: "#.*"
+    - identifier.macro:
+        start: "<<EOSQL"
+        end: "EOSQL"
+        rules: []
+

syntax_files/php.yaml

@@ -0,0 +1,49 @@
+filetype: php
+
+detect: 
+    filename: "\\.php[2345s~]?$"
+
+rules:
+    - symbol.operator: "<|>"
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*|>)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*|>)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - default: "<\\?(php|=)\" end=\"\\?>"
+    - identifier.class: "([a-zA-Z0-9_-]+)\\("
+    - preproc: "(require|include|require_once|include_once)"
+    - type: "\\b(var|class|extends|function|echo|case|default|exit|switch|extends|as|define|do|declare|in|trait|interface|[E|e]xception|array|int|string|bool|iterable|void)\\b"
+    - identifier.class: "[a-zA-Z\\\\]+::"
+    - identifier: "([A-Z][a-zA-Z0-9_]+)\\s"
+    - identifier: "([A-Z0-9_]+)[;|\\s|\\)|,]"
+    - type.keyword: "(global|public|private|protected|static|const)"
+    - statement: "(implements|abstract|instanceof|if|else(if)?|endif|namespace|use|as|new|throw|catch|try|while|print|(end)?(foreach)?)\\b"
+    - identifier: "new\\s([a-zA-Z0-9\\\\]+)"
+    - special: "(break|continue|goto|return)"
+    - constant.bool: "(true|false|null|TRUE|FALSE|NULL)"
+    - constant: "[\\s|=|\\s|\\(|/|+|-|\\*|\\[]"
+    - constant.number: "[0-9]"
+    - identifier: "(\\$this|parent|self|\\$this->)"
+    - symbol.operator: "(=>|===|!==|==|!=|&&|\\|\\||::|=|->|\\!)"
+    - identifier.var: "(\\$[a-zA-Z0-9\\-_]+)"
+    - symbol.operator: "[\\(|\\)|/|+|\\-|\\*|\\[|.|,|;]"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+    - symbol.brackets: "(\\[|\\]|\\{|\\}|[()])"
+    - comment: "(^|[[:space:]])//.*"
+    - comment: "(^|[[:space:]])#.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - preproc: "<\\?(php|=)?"
+    - preproc: "\\?>"
+    - preproc: "<!DOCTYPE.+?>"

syntax_files/pkg-config.yaml

@@ -0,0 +1,12 @@
+filetype: pc
+
+detect: 
+    filename: "\\.pc$"
+
+rules:
+    - preproc: "^(Name|Description|URL|Version|Conflicts|Cflags):"
+    - preproc: "^(Requires|Libs)(\\.private)?:"
+    - symbol.operator: "="
+    - identifier.var: "\\$\\{[A-Za-z_][A-Za-z0-9_]*\\}"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/po.yaml

@@ -0,0 +1,12 @@
+filetype: po
+
+detect: 
+    filename: "\\.pot?$"
+
+rules:
+    - preproc: "\\b(msgid|msgstr)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - special: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/pony.yaml

@@ -0,0 +1,37 @@
+filetype: pony
+
+detect: 
+    filename: "\\.pony$"
+
+rules:
+    - statement: "\\b(type|interface|trait|primitive|class|struct|actor)\\b"
+    - statement: "\\b(compiler_intrinsic)\\b"
+    - statement: "\\b(use)\\b"
+    - statement: "\\b(var|let|embed)\\b"
+    - statement: "\\b(new|be|fun)\\b"
+    - statement: "\\b(iso|trn|ref|val|box|tag|consume)\\b"
+    - statement: "\\b(break|continue|return|error)\\b"
+    - statement: "\\b(if|then|elseif|else|end|match|where|try|with|as|recover|object|lambda|as|digestof|ifdef)\\b"
+    - statement: "\\b(while|do|repeat|until|for|in)\\b"
+    - statement: "(\\?|=>)"
+    - statement: "(\\||\\&|\\,|\\^)"
+    - symbol.operator: "(\\-|\\+|\\*|/|\\!|%|<<|>>)"
+    - symbol.operator: "(==|!=|<=|>=|<|>)"
+    - statement: "\\b(is|isnt|not|and|or|xor)\\b"
+    - type: "\\b(_*[A-Z][_a-zA-Z0-9\\']*)\\b"
+    - constant: "\\b(this)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - constant.number: "\\b((0b[0-1_]*)|(0o[0-7_]*)|(0x[0-9a-fA-F_]*)|([0-9_]+(\\.[0-9_]+)?((e|E)(\\\\+|-)?[0-9_]+)?))\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment:
+        start: "\"\"\"[^\"]*"
+        end: "\"\"\""
+        rules: []
+
+    - comment: "(^|[[:space:]])//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - todo: "TODO:?"

syntax_files/pov.yaml

@@ -0,0 +1,21 @@
+filetype: pov
+
+detect: 
+    filename: "\\.(pov|POV|povray|POVRAY)$"
+
+rules:
+    - preproc: "^[[:space:]]*#[[:space:]]*(declare)"
+    - statement: "\\b(sphere|cylinder|translate|matrix|rotate|scale)\\b"
+    - statement: "\\b(orthographic|location|up|right|direction|clipped_by)\\b"
+    - statement: "\\b(fog_type|fog_offset|fog_alt|rgb|distance|transform)\\b"
+    - identifier: "^\\b(texture)\\b"
+    - identifier: "\\b(light_source|background)\\b"
+    - identifier: "\\b(fog|object|camera)\\b"
+    - symbol.operator: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - special: "\\b(union|group|subgroup)\\b"
+    - comment: "//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+

syntax_files/privoxy-action.yaml

@@ -0,0 +1,14 @@
+filetype: privoxy-action
+
+detect: 
+    filename: "\\.action$"
+
+rules:
+    - constant.bool.false: "[{[:space:]]\\-block([[:space:]{}]|$)"
+    - constant.bool.true: "[{[:space:]]\\+block([[:space:]{}]|$)"
+    - constant.bool.false: "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+    - constant.bool.true: "\\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/privoxy-config.yaml

@@ -0,0 +1,10 @@
+filetype: privoxy-config
+
+detect: 
+    filename: "privoxy/config$"
+
+rules:
+    - statement: "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/privoxy-filter.yaml

@@ -0,0 +1,12 @@
+filetype: privoxy-filter
+
+detect: 
+    filename: "\\.filter$"
+
+rules:
+    - statement: "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
+    - identifier: "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/puppet.yaml

@@ -0,0 +1,22 @@
+filetype: puppet
+
+detect: 
+    filename: "\\.pp$"
+
+rules:
+    - default: "^[[:space:]]([a-z][a-z0-9_]+)"
+    - identifier.var: "\\$[a-z:][a-z0-9_:]+"
+    - type: "\\b(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|anchor)\\b"
+    - statement: "\\b(class|define|if|else|undef|inherits)\\b"
+    - symbol: "(=|-|~|>)"
+    - identifier.var: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - symbol: "([      ]|^):[0-9A-Z_]+\\b"
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - special: "\\$\\{[^}]*\\}"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment.bright: "##[^{].*$|##$"
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
+    - indent-char.whitespace: "[[:space:]]+$"

syntax_files/python2.yaml

@@ -29,23 +29,6 @@ rules:
       # numbers
     - constant.number: "\\b[0-9]+\\b"
 
-    - constant.string:
-        start: "\""
-        end: "\""
-        rules:
-            - constant.specialChar: "\\\\."
-
-    - constant.string:
-        start: "'"
-        end: "'"
-        rules:
-            - constant.specialChar: "\\\\."
-
-    - comment:
-        start: "#"
-        end: "$"
-        rules: []
-
     - comment:
         start: "\"\"\""
         end: "\"\"\""
@@ -55,3 +38,21 @@ rules:
         start: "'''"
         end: "'''"
         rules: []
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+

syntax_files/python3.yaml

@@ -28,23 +28,6 @@ rules:
       # numbers
     - constant.number: "\\b[0-9]+\\b"
 
-    - constant.string:
-        start: "\""
-        end: "\""
-        rules:
-            - constant.specialChar: "\\\\."
-
-    - constant.string:
-        start: "'"
-        end: "'"
-        rules:
-            - constant.specialChar: "\\\\."
-
-    - comment:
-        start: "#"
-        end: "$"
-        rules: []
-
     - comment:
         start: "\"\"\""
         end: "\"\"\""
@@ -54,3 +37,21 @@ rules:
         start: "'''"
         end: "'''"
         rules: []
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+

syntax_files/rpmspec.yaml

@@ -0,0 +1,43 @@
+filetype: rpmspec
+
+detect: 
+    filename: "\\.spec$|\\.rpmspec$"
+
+rules:
+    - preproc: "\\b(Icon|ExclusiveOs|ExcludeOs):"
+    - preproc: "\\b(BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):"
+    - preproc: "\\b(Conflicts|Obsoletes|Provides|Requires|Requires\\(.*\\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements):"
+    - preproc: "\\b(Epoch|Serial|Nosource|Nopatch):"
+    - preproc: "\\b(AutoReq|AutoProv|AutoReqProv):"
+    - preproc: "\\b(Copyright|License|Summary|Summary\\(.*\\)|Distribution|Vendor|Packager|Group|Source[0-9]*|Patch[0-9]*|BuildRoot|Prefix):"
+    - preproc: "\\b(Name|Version|Release|Url|URL):"
+    - preproc:
+        start: "^(Source|Patch)"
+        end: ":"
+        rules: []
+
+    - preproc: "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
+    - preproc: "(ifarch|ifnarch|ifos|ifnos)"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - statement: "%(if|else|endif|define|global|undefine)"
+    - statement: "%_?([A-Z_a-z_0-9_]*)"
+    - statement:
+        start: "%\\{"
+        end: "\\}"
+        rules: []
+
+    - statement:
+        start: "%\\{__"
+        end: "\\}"
+        rules: []
+
+    - statement: "\\$(RPM_BUILD_ROOT)\\>"
+    - special: "^%(build$|changelog|check$|clean$|description)"
+    - special: "^%(files|install$|package|prep$)"
+    - special: "^%(pre|preun|pretrans|post|postun|posttrans)"
+    - special: "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - constant: "^\\*.*$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
+    - todo: "TODO:?"

syntax_files/ruby.yaml

@@ -0,0 +1,26 @@
+filetype: ruby
+
+detect: 
+    filename: "\\.rb$|\\.gemspec$|Gemfile|config.ru|Rakefile|Capfile|Vagrantfile"
+    header: "^#!.*/(env +)?ruby( |$)"
+
+rules:
+    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\\b"
+    - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant: "(i?)([ 	]|^):[0-9A-Z_]+\\b"
+    - constant: "\\b(__FILE__|__LINE__)\\b"
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - special: "#\\{[^}]*\\}"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment.bright: "##[^{].*$|##$"
+    - constant.macro:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
+    - preproc.shebang: "^#!.+?( |$)"

syntax_files/rust.yaml

@@ -19,7 +19,7 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
@@ -44,3 +44,4 @@ rules:
         start: "#!\\["
         end: "\\]"
         rules: []
+

syntax_files/scala.yaml

@@ -9,7 +9,7 @@ rules:
     - statement: "\\b(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile|sealed)\\b"
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant: "\\b(true|false|null)\\b"
@@ -25,3 +25,4 @@ rules:
         start: "/\\*\\*"
         end: "\\*/"
         rules: []
+

syntax_files/sed.yaml

@@ -0,0 +1,13 @@
+filetype: sed
+
+detect: 
+    filename: "\\.sed$"
+    header: "^#!.*bin/(env +)?sed( |$)"
+
+rules:
+    - symbol.operator: "[|^$.*+]"
+    - constant.number: "\\{[0-9]+,?[0-9]*\\}"
+    - constant.specialChar: "\\\\."
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/sh.yaml

@@ -25,13 +25,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules: []
 
     - comment:
@@ -39,3 +39,4 @@ rules:
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/sls.yaml

@@ -0,0 +1,15 @@
+filetype: salt
+
+detect: 
+    filename: "\\.sls$"
+
+rules:
+    - identifier.var: "^[^ -].*:$"
+    - identifier.var: ".*:"
+    - default: "salt:"
+    - constant.number: "/*[0-9]/*"
+    - constant.bool: "\\b(True|False)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - special: "\\b(grain|grains|compound|pcre|grain_pcre|list|pillar)\\b"
+    - comment: "^#.*"
+    - statement: "\\b(if|elif|else|or|not|and|endif|end)\\b"

syntax_files/solidity.yaml

@@ -28,11 +28,12 @@ rules:
     - todo: "TODO:?"
     - constant.string: 
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
+

syntax_files/sql.yaml

@@ -0,0 +1,35 @@
+filetype: sql
+
+detect: 
+    filename: "\\.sql$|sqliterc$"
+
+rules:
+    - statement: "(?i)\\b(ALL|ASC|AS|ALTER|AND|ADD|AUTO_INCREMENT)\\b"
+    - statement: "(?i)\\b(BETWEEN|BINARY|BOTH|BY|BOOLEAN)\\b"
+    - statement: "(?i)\\b(CHANGE|CHECK|COLUMNS|COLUMN|CROSS|CREATE)\\b"
+    - statement: "(?i)\\b(DATABASES|DATABASE|DATA|DELAYED|DESCRIBE|DESC|DISTINCT|DELETE|DROP|DEFAULT)\\b"
+    - statement: "(?i)\\b(ENCLOSED|ESCAPED|EXISTS|EXPLAIN)\\b"
+    - statement: "(?i)\\b(FIELDS|FIELD|FLUSH|FOR|FOREIGN|FUNCTION|FROM)\\b"
+    - statement: "(?i)\\b(GROUP|GRANT|HAVING)\\b"
+    - statement: "(?i)\\b(IGNORE|INDEX|INFILE|INSERT|INNER|INTO|IDENTIFIED|IN|IS|IF)\\b"
+    - statement: "(?i)\\b(JOIN|KEYS|KILL|KEY)\\b"
+    - statement: "(?i)\\b(LEADING|LIKE|LIMIT|LINES|LOAD|LOCAL|LOCK|LOW_PRIORITY|LEFT|LANGUAGE)\\b"
+    - statement: "(?i)\\b(MODIFY|NATURAL|NOT|NULL|NEXTVAL)\\b"
+    - statement: "(?i)\\b(OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUTFILE|OR|OUTER|ON)\\b"
+    - statement: "(?i)\\b(PROCEDURE|PROCEDURAL|PRIMARY)\\b"
+    - statement: "(?i)\\b(READ|REFERENCES|REGEXP|RENAME|REPLACE|RETURN|REVOKE|RLIKE|RIGHT)\\b"
+    - statement: "(?i)\\b(SHOW|SONAME|STATUS|STRAIGHT_JOIN|SELECT|SETVAL|SET)\\b"
+    - statement: "(?i)\\b(TABLES|TERMINATED|TO|TRAILING|TRUNCATE|TABLE|TEMPORARY|TRIGGER|TRUSTED)\\b"
+    - statement: "(?i)\\b(UNIQUE|UNLOCK|USE|USING|UPDATE|VALUES|VARIABLES|VIEW)\\b"
+    - statement: "(?i)\\b(WITH|WRITE|WHERE|ZEROFILL|TYPE|XOR)\\b"
+    - type: "(?i)\\b(VARCHAR|TINYINT|TEXT|DATE|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT|FLOAT|DOUBLE|DECIMAL|DATETIME|TIMESTAMP|TIME|YEAR|UNSIGNED|CHAR|TINYBLOB|TINYTEXT|BLOB|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|ENUM|BOOL|BINARY|VARBINARY)\\b"
+    - preproc: "(?i)\\.\\b(databases|dump|echo|exit|explain|header(s)?|help)\\b"
+    - preproc: "(?i)\\.\\b(import|indices|mode|nullvalue|output|prompt|quit|read)\\b"
+    - preproc: "(?i)\\.\\b(schema|separator|show|tables|timeout|width)\\b"
+    - constant.bool: "\\b(ON|OFF)\\b"
+    - constant.number: "\\b([0-9]+)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.string: "`(\\\\.|[^\\\\`])*`"
+    - comment: "\\-\\-.*$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/swift.yaml

@@ -26,7 +26,7 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
@@ -47,3 +47,4 @@ rules:
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/syntax_checker.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/zyedidia/highlight"
+	"github.com/zyedidia/micro/cmd/micro/highlight"
 )
 
 func main() {
@@ -14,7 +14,7 @@ func main() {
 	hadErr := false
 	for _, f := range files {
 		if strings.HasSuffix(f.Name(), ".yaml") {
-			input, _ := ioutil.ReadFile("/Users/zachary/gocode/src/github.com/zyedidia/highlight/syntax_files/" + f.Name())
+			input, _ := ioutil.ReadFile(f.Name())
 			_, err := highlight.ParseDef(input)
 			if err != nil {
 				hadErr = true

syntax_files/systemd.yaml

@@ -0,0 +1,16 @@
+filetype: systemd
+
+detect: 
+    filename: "\\.(service|socket)$"
+    header: "^\\[Unit\\]$"
+
+rules:
+    - statement: "^(Accept|After|Alias|AllowIsolate|Also|ANSI_COLOR|_AUDIT_LOGINUID|_AUDIT_SESSION|Backlog|Before|BindIPv6Only|BindsTo|BindToDevice|BlockIOReadBandwidth|BlockIOWeight|BlockIOWriteBandwidth|_BOOT_ID|Broadcast|BUG_REPORT_URL|BusName|Capabilities|CapabilityBoundingSet|CHASSIS|cipher|class|_CMDLINE|CODE_FILE|CODE_FUNC|CODE_LINE|_COMM|Compress|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionHost|ConditionKernelCommandLine|ConditionNull|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsDirectory|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|Conflicts|ControlGroup|ControlGroupAttribute|ControlGroupModify|ControlGroupPersistent|controllers|Controllers|CPE_NAME|CPUAffinity|CPUSchedulingPolicy|CPUSchedulingPriority|CPUSchedulingResetOnFork|CPUShares|CrashChVT|CrashShell|__CURSOR|debug|DefaultControllers|DefaultDependencies|DefaultLimitAS|DefaultLimitCORE|DefaultLimitCPU|DefaultLimitDATA|DefaultLimitFSIZE|DefaultLimitLOCKS|DefaultLimitMEMLOCK|DefaultLimitMSGQUEUE|DefaultLimitNICE|DefaultLimitNOFILE|DefaultLimitNPROC|DefaultLimitRSS|DefaultLimitRTPRIO|DefaultLimitRTTIME|DefaultLimitSIGPENDING|DefaultLimitSTACK|DefaultStandardError|DefaultStandardOutput|Description|DeviceAllow|DeviceDeny|DirectoryMode|DirectoryNotEmpty|Documentation|DumpCore|entropy|Environment|EnvironmentFile|ERRNO|event_timeout|_EXE|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|ExecStopPost|ExecStopPre|filter|FONT|FONT_MAP|FONT_UNIMAP|ForwardToConsole|ForwardToKMsg|ForwardToSyslog|FreeBind|freq|FsckPassNo|fstab|_GID|Group|GuessMainPID|HandleHibernateKey|HandleLidSwitch|HandlePowerKey|HandleSuspendKey|hash|HibernateKeyIgnoreInhibited|HOME_URL|_HOSTNAME|ICON_NAME|ID|IdleAction|IdleActionSec|ID_LIKE|ID_MODEL|ID_MODEL_FROM_DATABASE|IgnoreOnIsolate|IgnoreOnSnapshot|IgnoreSIGPIPE|InaccessibleDirectories|InhibitDelayMaxSec|init|IOSchedulingClass|IOSchedulingPriority|IPTOS|IPTTL|JobTimeoutSec|JoinControllers|KeepAlive|KEYMAP|KEYMAP_TOGGLE|KillExcludeUsers|KillMode|KillOnlyUsers|KillSignal|KillUserProcesses|LidSwitchIgnoreInhibited|LimitAS|LimitCORE|LimitCPU|LimitDATA|LimitFSIZE|LimitLOCKS|LimitMEMLOCK|LimitMSGQUEUE|LimitNICE|LimitNOFILE|LimitNPROC|LimitRSS|LimitRTPRIO|LimitRTTIME|LimitSIGPENDING|LimitSTACK|link_priority|valueListenDatagram|ListenFIFO|ListenMessageQueue|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LogColor|LogLevel|LogLocation|LogTarget|luks|_MACHINE_ID|MakeDirectory|Mark|MaxConnections|MaxFileSec|MaxLevelConsole|MaxLevelKMsg|MaxLevelStore|MaxLevelSyslog|MaxRetentionSec|MemoryLimit|MemorySoftLimit|MESSAGE|MESSAGE_ID|MessageQueueMaxMessages|MessageQueueMessageSize|__MONOTONIC_TIMESTAMP|MountFlags|NAME|NAutoVTs|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureIsolate|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|output|PAMName|PartOf|PassCredentials|PassSecurity|PathChanged|PathExists|PathExistsGlob|PathModified|PermissionsStartOnly|_PID|PIDFile|PipeSize|PowerKeyIgnoreInhibited|PRETTY_HOSTNAME|PRETTY_NAME|Priority|PRIORITY|PrivateNetwork|PrivateTmp|PropagatesReloadTo|pss|RateLimitBurst|RateLimitInterval|ReadOnlyDirectories|ReadWriteDirectories|__REALTIME_TIMESTAMP|ReceiveBuffer|RefuseManualStart|RefuseManualStop|rel|ReloadPropagatedFrom|RemainAfterExit|RequiredBy|Requires|RequiresMountsFor|RequiresOverridable|Requisite|RequisiteOverridable|ReserveVT|ResetControllers|Restart|RestartPreventExitStatus|RestartSec|RootDirectory|RootDirectoryStartOnly|RuntimeKeepFree|RuntimeMaxFileSize|RuntimeMaxUse|RuntimeWatchdogSec|samples|scale_x|scale_y|Seal|SecureBits|_SELINUX_CONTEXT|SendBuffer|SendSIGKILL|Service|ShowStatus|ShutdownWatchdogSec|size|SmackLabel|SmackLabelIPIn|SmackLabelIPOut|SocketMode|Sockets|SourcePath|_SOURCE_REALTIME_TIMESTAMP|SplitMode|StandardError|StandardInput|StandardOutput|StartLimitAction|StartLimitBurst|StartLimitInterval|static_node|StopWhenUnneeded|Storage|string_escape|none|replaceSuccessExitStatus|SupplementaryGroups|SUPPORT_URL|SuspendKeyIgnoreInhibited|SyslogFacility|SYSLOG_FACILITY|SyslogIdentifier|SYSLOG_IDENTIFIER|SyslogLevel|SyslogLevelPrefix|SYSLOG_PID|SystemCallFilter|SYSTEMD_ALIAS|_SYSTEMD_CGROUP|_SYSTEMD_OWNER_UID|SYSTEMD_READY|_SYSTEMD_SESSION|_SYSTEMD_UNIT|_SYSTEMD_USER_UNIT|SYSTEMD_WANTS|SystemKeepFree|SystemMaxFileSize|SystemMaxUse|SysVStartPriority|TCPCongestion|TCPWrapName|timeout|TimeoutSec|TimeoutStartSec|TimeoutStopSec|TimerSlackNSec|Transparent|_TRANSPORT|tries|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|_UID|UMask|Unit|User|UtmpIdentifier|VERSION|VERSION_ID|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory)="
+    - preproc: "^\\.include\\>"
+    - symbol: "="
+    - special: "^\\[(Unit|Install|Service|Socket)\\]"
+    - identifier.class: "\\$MAINPID"
+    - constant.bool: "\\b(true|false)\\b"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/tcl.yaml

@@ -0,0 +1,18 @@
+filetype: tcl
+
+detect: 
+    filename: "\\.tcl$"
+    header: "^#!.*/(env +)?tclsh( |$)"
+
+rules:
+    - statement: "\\b(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|else|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\\b"
+    - statement: "\\b(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\\b"
+    - statement: "\\b(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\\b"
+    - statement: "\\b(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\\b"
+    - identifier.class: "proc[[:space:]]|(\\{|\\})"
+    - symbol.operator: "(\\(|\\)|\\;|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - constant.number: "\\b[0-9]+(\\.[0-9]+)?\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - identifier.var: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - comment: "(^|;)[[:space:]]*#.*"
+    - indent-char.whitespace: "[[:space:]]+$"

syntax_files/toml.yaml

@@ -16,13 +16,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -37,3 +37,4 @@ rules:
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+

syntax_files/typescript.yaml

@@ -31,12 +31,12 @@ rules:
             - todo: "TODO:?"
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
-    
+    

syntax_files/vala.yaml

@@ -0,0 +1,26 @@
+filetype: vala
+
+detect: 
+    filename: "\\.vala$"
+
+rules:
+    - type: "\\b(float|double|bool|char|int|uint|short|long|void|(un)?signed)\\b"
+    - identifier.class: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+    - statement: "\\b(for|if|while|do|else|case|default|switch|try|throw|catch)\\b"
+    - statement: "\\b(inline|typedef|struct|enum|union|extern|static|const)\\b"
+    - statement: "\\b(operator|new|delete|return|null)\\b"
+    - statement: "\\b(class|override|private|public|signal|this|weak)\\b"
+    - special: "\\b(goto|break|continue)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - constant.number: "\\b([0-9]+)\\b"
+    - symbol.operator: "[\\-+/*=<>?:!~%&|]|->"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "(^|[[:space:]])//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - todo: "TODO:?"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/vhdl.yaml

@@ -0,0 +1,37 @@
+filetype: vhdl
+
+detect: 
+    filename: "\\.vhdl?$"
+
+rules:
+    - type: "(i)\\b(string|integer|natural|positive|(un)?signed|std_u?logic(_vector)?|bit(_vector)?|boolean|u?x01z?|array|range)\\b"
+    - identifier: "(?i)library[[:space:]]+[a-zA-Z_0-9]+"
+    - identifier: "(?i)use[[:space:]]+[a-zA-Z_0-9\\.]+"
+    - identifier: "(?i)component[[:space:]]+[a-zA-Z_0-9]+"
+    - identifier: "(?i)(architecture|configuration)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+of[[:space:]]+[a-zA-Z_0-9]+"
+    - identifier: "(?i)(entity|package)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+is"
+    - identifier: "(?i)end[[:space:]]+((architecture|entity|component|process|package|generate)[[:space:]]+)?[a-zA-Z_0-9]+"
+    - statement: "(?i)\\b(abs|access|after|alias|all|and|architecture|assert|attribute)\\b"
+    - statement: "(?i)\\b(begin|block|body|buffer|bus|case|component|configuration|constant)\\b"
+    - statement: "(?i)\\b(disconnect|downto|else|elsif|end|entity|exit)\\b"
+    - statement: "(?i)\\b(file|for|function|generate|generic|guarded)\\b"
+    - statement: "(?i)\\b(if|impure|in|inertial|inout|is)\\b"
+    - statement: "(?i)\\b(label|library|linkage|literal|loop|map|mod)\\b"
+    - statement: "(?i)\\b(nand|new|next|nor|not|null|of|on|open|or|others|out)\\b"
+    - statement: "(?i)\\b(package|port|postponed|procedure|process|pure)\\b"
+    - statement: "(?i)\\b(range|record|register|reject|rem|report|return|rol|ror)\\b"
+    - statement: "(?i)\\b(select|severity|shared|signal|sla|sll|sra|srl|subtype)\\b"
+    - statement: "(?i)\\b(then|to|transport|type|unaffected|units|until|use)\\b"
+    - statement: "(?i)\\b(variable|wait|when|while|with|xnor|xor)\\b"
+    - statement: "(?i)'(base|left|right|high|low|pos|val|succ|pred|leftof|rightof|image|(last_)?value)"
+    - statement: "(?i)'((reverse_)?range|length|ascending|event|stable)"
+    - statement: "(?i)'(simple|path|instance)_name"
+    - statement: "(?i)\\b(std_match|(rising|falling)_edge|is_x)\\b"
+    - statement: "(?i)\\bto_(unsigned|signed|integer|u?x01z?|stdu?logic(vector)?)\\b"
+    - symbol.operator: "(\\+|-|\\*|/|&|<|>|=|\\.|:)"
+    - constant.number: "(?i)'([0-1]|u|x|z|w|l|h|-)'|[box]?\"([0-1a-fA-F]|u|x|z|w|l|h|-)+\""
+    - constant.number: "(?i)\\b[0-9\\._]+(e[\\-]?[0-9]+)?( ?[fpnum]?s)?\\b"
+    - constant.bool: "(?i)\\b(true|false)\\b"
+    - constant: "(?i)\\b(note|warning|error|failure)\\b"
+    - constant.string: "\"[^\"]*\""
+    - comment: "--.*"

syntax_files/vi.yaml

@@ -12,13 +12,13 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -27,3 +27,4 @@ rules:
         end: "$"
         rules: []
         
+

syntax_files/xresources.yaml

@@ -0,0 +1,14 @@
+filetype: xresources
+
+detect: 
+    filename: "X(defaults|resources)$"
+
+rules:
+    - special: "^[[:alnum:]]+\\*"
+    - identifier.var: "\\*[[:alnum:]]+\\:"
+    - constant.number: "\\b[0-9]+\\b"
+    - symbol.operator: "[*:=]"
+    - constant.bool: "\\b(true|false)\\b"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/yaml.yaml

@@ -10,18 +10,19 @@ rules:
     - constant: "\\b(true|false)\\b"
     - statement: "(:[[:space:]]|\\[|\\]|:[[:space:]]+[|>]|^[[:space:]]*- )"
     - identifier: "[[:space:]][\\*&][A-Za-z0-9]+"
-    - type: "([-\\w]+:\\s+)|([-\\w]+:$)"
+    - type: "[-.\\w]+:"
+    - statement: ":"
     - special:  "(^---|^\\.\\.\\.|^%YAML|^%TAG)"
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules:
             - constant.specialChar: "\\\\."
 
@@ -30,3 +31,4 @@ rules:
         end: "$"
         rules: []
 
+

syntax_files/yum.yaml

@@ -0,0 +1,12 @@
+filetype: yum
+
+detect: 
+    filename: "\\.repo$|yum.*\\.conf$"
+
+rules:
+    - identifier: "^[[:space:]]*[^=]*="
+    - constant.specialChar: "^[[:space:]]*\\[.*\\]$"
+    - statement: "\\$(releasever|arch|basearch|uuid|YUM[0-9])"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"

syntax_files/zsh.yaml

@@ -35,16 +35,17 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(?<!\\\\)\""
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "(?<!\\\\)'"
         rules: []
 
     - comment:
         start: "#"
         end: "$"
         rules: []
+