Merge branch 'python-highlight-zero' of https://github.com/a11ce/micro into a11ce...

[micro.git] / runtime / syntax / fish.yaml

diff --git a/runtime/syntax/fish.yaml b/runtime/syntax/fish.yaml
index 1052118a33340dd2cc3823857ff7498267027c54..88798a04aabce2f47b49fe9a8611b3c2b79bdd09 100644 (file)
--- a/runtime/syntax/fish.yaml
+++ b/runtime/syntax/fish.yaml
@@ -1,25 +1,48 @@
 filetype: fish
 
-detect: 
+detect:
     filename: "\\.fish$"
     header: "^#!.*/(env +)?fish( |$)"
 
 rules:
-    - constant.number: "\\b[0-9]+\\b"
-    - statement: "\\b(and|begin|case|else|end|for|function|if|in|not|or|select|shift|switch|while)\\b"
-    - special: "\\b(break|continue|return)\\b"
-    - symbol: "(\\;|`|\\\\|\\$|<|>|^|!|=|&|\\|)"
-    - symbol.brackets: "\\{|\\}|\\(|\\)|\\[|\\]"
+      # 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]+"
-    - constant.string: "\"(\\\\.|[^\"])*\""
-    - constant.string: "'(\\\\.|[^'])*'"
-    - constant.specialChar: "\""
-    - constant.specialChar: "'"
-    - identifier: "\\$\\{?[0-9A-Za-z_!@#$*?-]+\\}?"
-    - comment: "(^|[[:space:]])#.*$"
-    - todo: "(TODO|XXX|FIXME):?"
-    - preproc.shebang: "^#!.+?( |$)"
+
+    - identifier: "(?i)\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+