X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Fsyntax%2Fsh.yaml;h=5471e7ada2bb3394af13257169b204bf63b263cf;hb=cef32d4ac7f7bbc1f57fc67f8a1788edddfbe771;hp=e2d793b302af5ca0c5f582d80fee264188fd9c0b;hpb=b977bf5cca84f7dc762fe8d9967831502ee5cc87;p=micro.git

diff --git a/runtime/syntax/sh.yaml b/runtime/syntax/sh.yaml
index e2d793b3..5471e7ad 100644
--- a/runtime/syntax/sh.yaml
+++ b/runtime/syntax/sh.yaml
@@ -1,24 +1,43 @@
 filetype: shell
 
-detect: 
-    filename: "\\.sh$|\\.bash|\\.bashrc|bashrc|\\.bash_aliases|bash_aliases|\\.bash_functions|bash_functions|\\.bash_profile|bash_profile|Pkgfile|pkgmk.conf|profile|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD"
-    header: "^#!.*/(env +)?(ba)?sh( |$)"
+detect:
+    filename: "(\\.sh$|\\.bash|\\.ash|\\.bashrc|bashrc|\\.bash_aliases|bash_aliases|\\.bash_functions|bash_functions|\\.bash_profile|bash_profile|\\.profile|profile|Pkgfile|pkgmk.conf|profile|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)"
+    header: "^#!.*/(env +)?(ba)?(a)?sh( |$)"
 
 rules:
+    # Numbers
     - constant.number: "\\b[0-9]+\\b"
+      # Conditionals and control flow
     - statement: "\\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\\b"
-    - symbol.operator: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+      # Shell commands
     - type: "\\b(cd|echo|export|let|set|umask|unset)\\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.var: "\\$\\{?[0-9A-Za-z_!@#$*?-]+\\}?"
-    - identifier.var: "\\$\\{?[0-9A-Za-z_!@#$*?-]+\\}?"
-    - comment: "(^|[[:space:]])#.*$"
-    - todo: "(TODO|XXX|FIXME):?"
-    - preproc.shebang: "^#!.+?( |$)"
+
+    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules: []
+
+    - comment:
+        start: "(^|\\s)#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+