From 076e9c1634420cdc899ae16a71a0273f9489bbbe Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Fri, 17 Feb 2017 10:39:28 -0500
Subject: [PATCH] Add fish and toml

---
 syntax_files/fish.yaml | 45 ++++++++++++++++++++++++++++++++++++++++++
 syntax_files/sh.yaml   |  2 +-
 syntax_files/toml.yaml | 39 ++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 syntax_files/fish.yaml
 create mode 100644 syntax_files/toml.yaml

diff --git a/syntax_files/fish.yaml b/syntax_files/fish.yaml
new file mode 100644
index 0000000..9b11f38
--- /dev/null
+++ b/syntax_files/fish.yaml
@@ -0,0 +1,45 @@
+filetype: fish
+
+detect:
+    filename: "\\.fish$"
+    header: "^#!.*/(env +)?fish( |$)"
+
+rules:
+      # Numbers
+    - constant: "\\b[0-9]+\\b"
+
+      # Conditionals and control flow
+    - statement: "\\b(and|begin|break|case|continue|else|end|for|function|if|in|not|or|return|select|shift|switch|while)\\b"
+    - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|^|!|=|&|\\|)"
+
+      # Fish commands
+    - type: "\\b(bg|bind|block|breakpoint|builtin|cd|count|command|commandline|complete|dirh|dirs|echo|emit|eval|exec|exit|fg|fish|fish_config|fish_ident|fish_pager|fish_prompt|fish_right_prompt|fish_update_completions|fishd|funced|funcsave|functions|help|history|jobs|math|mimedb|nextd|open|popd|prevd|psub|pushd|pwd|random|read|set|set_color|source|status|string|trap|type|ulimit|umask|vared)\\b"
+
+      # Common linux commands
+    - type: "\\b((g|ig)?awk|bash|dash|find|\\w{0,4}grep|kill|killall|\\w{0,4}less|make|pkill|sed|sh|tar)\\b"
+
+      # Coreutils commands
+    - type: "\\b(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|time|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\\b"
+
+      # Conditional flags
+    - statement: "--[a-z-]+"
+    - statement: "\\ -[a-z]+"
+
+    - identifier: "(?i\$\{?[0-9A-Z_!@#$*?-]+\}?)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
diff --git a/syntax_files/sh.yaml b/syntax_files/sh.yaml
index a44ce6e..aa0263b 100644
--- a/syntax_files/sh.yaml
+++ b/syntax_files/sh.yaml
@@ -32,7 +32,7 @@ rules:
     - constant.string:
         start: "'"
         end: "'"
-        rules:
+        rules: []
 
     - comment:
         start: "#"
diff --git a/syntax_files/toml.yaml b/syntax_files/toml.yaml
new file mode 100644
index 0000000..e4e2218
--- /dev/null
+++ b/syntax_files/toml.yaml
@@ -0,0 +1,39 @@
+filetype: toml
+
+detect:
+    filename: "\\.toml"
+
+rules:
+    - statement: "(.*)[[:space:]]="
+    - special: "="
+
+      # Bracket thingies
+    - special: "(\\[|\\])"
+
+      # Numbers and strings
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+    - constant.number: "\\\\([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: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules: 
+    - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"