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

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

diff --git a/runtime/syntax/sh.yaml b/runtime/syntax/sh.yaml
index aa0263bb15a679501de96ed00eec0d7b8a890e73..5776c5963566484059392279e67c5bd4f61db973 100644 (file)
--- a/runtime/syntax/sh.yaml
+++ b/runtime/syntax/sh.yaml
@@ -1,8 +1,8 @@
 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( |$)"
+    filename: "(\\.sh$|\\.bash|\\.ash|bashrc|bash_aliases|bash_functions|profile|bash-fc\\.|Pkgfile|pkgmk.conf|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)"
+    header: "^#!.*/(env +)?(ba)?(a)?(mk)?sh( |$)"
 
 rules:
     # Numbers
@@ -20,12 +20,13 @@ rules:
     - statement: "--[a-z-]+"
     - statement: "\\ -[a-z]+"
 
-    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
-    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - identifier: "\\$\\{?[0-9A-Za-z_!@#$*?-]+\\}?"
+    - identifier: "\\$\\{?[0-9A-Za-z_!@#$*?-]+\\}?"
 
     - constant.string:
         start: "\""
         end: "\""
+        skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
 
@@ -35,7 +36,8 @@ rules:
         rules: []
 
     - comment:
-        start: "#"
+        start: "(^|\\s)#"
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+