NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #159 from onodera-punpun/syntax_cleanup

Browse source 
Clean up shell and fish syntax files
This commit is contained in:
Zachary Yedidia 2016-06-02 10:15:02 -04:00
commit 931a895406
2 changed files with 55 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
runtime/syntax/fish.micro
View file

@ -1,36 +1,35 @@
## Here is an example for Fish shell scripts.
##
syntax "fish" "\.fish$"
header "^#!.*/(env +)?fish( |$)"
## Numbers
color brightcyan "\b[0-9]+\b"
# Numbers
color constant "\b[0-9]+\b"
## Conditionals and control flow
color brightyellow "\b(and|begin|break|case|continue|else|end|for|function|if|not|or|return|select|shift|switch|while)\b"
color brightmagenta "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|^|!|=|&|\|)"
# Conditionals and control flow
color statement "\b(and|begin|break|case|continue|else|end|for|function|if|not|or|return|select|shift|switch|while)\b"
color special "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|^|!|=|&|\|)"
## Fish commands
color green "\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|status|string|trap|type|ulimit|umask|vared)\b"
# Fish commands
color 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|status|string|trap|type|ulimit|umask|vared)\b"
## Common linux commands
color green "\b((g|ig)?awk|bash|dash|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|sh|tar)\b"
# Common linux commands
color 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
color green "\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"
# Coreutils commands
color 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
color brightyellow "--[a-z-]+"
color brightyellow "\ -[a-z]+"
# Conditional flags
color statement "--[a-z-]+"
color statement "\ -[a-z]+"
## Strings
color brightcyan ""(\\.|[^"])*""
color brightcyan "'(\\.|[^'])*'"
color brightmagenta """
color brightmagenta "'"
# Strings
color constant ""(\\.|[^"])*""
color constant "'(\\.|[^'])*'"
color special """
color special "'"
## Variables
color brightmagenta (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
# Variables
color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
## Comments
color brightblack "(^|[[:space:]])#.*$"
# Comments & TODOs
color comment "(^|[[:space:]])#.*$"
color todo "(TODO|XXX|FIXME):?"

41
runtime/syntax/sh.micro
View file

@ -1,15 +1,36 @@
## Here is an example for Bourne shell scripts.
##
syntax "SH" "\.sh$" "\.bash" "\.bashrc" "bashrc" "\.bash_aliases" "bash_aliases" "\.bash_functions" "bash_functions" "\.bash_profile" "bash_profile" "Pkgfile" "PKGBUILD" ".ebuild\$" "APKBUILD"
syntax "shell" "\.sh$" "\.bash" "\.bashrc" "bashrc" "\.bash_aliases" "bash_aliases" "\.bash_functions" "bash_functions" "\.bash_profile" "bash_profile" "Pkgfile" "PKGBUILD" ".ebuild\$" "APKBUILD"
header "^#!.*/(env +)?(ba)?sh( |$)"
# Numbers
color constant "\b[0-9]+\b"
# Conditionals and control flow
color statement "\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\b"
color special "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
color special "-[Ldefgruwx]\b"
color statement "-(eq|ne|gt|lt|ge|le|s|n|z)\b"
color statement "\b(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\b"
color color constant (i) "^\s+[0-9A-Z_]+\s+\(\)"
color color constant (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
color constant ""(\\.|[^"])*"" "'(\\.|[^'])*'"
# Shell commands
color type "\b(cd|echo|export|let|set|umask|unset)\b"
# Common linux commands
color 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
color 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
color statement "--[a-z-]+"
color statement "\ -[a-z]+"
# Strings
color constant ""(\\.|[^"])*""
color constant "'(\\.|[^'])*'"
color special """
color special "'"
# Variables
color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
# Comments & TODOs
color comment "(^|[[:space:]])#.*$"
#color ,green "[[:space:]]+$"
color todo "(TODO|XXX|FIXME):?"