xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[sh] Merge two %sh blocks into one

Browse Source 
It simply needed a newline
This commit is contained in:
Lennard Hofmann 2020-01-13 17:51:18 +01:00
parent d3e84f0eca
commit b84d852723
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rc/filetype/sh.kak
View File

@ -34,18 +34,6 @@ evaluate-commands %sh{
keywords="if then else elif fi case esac for select while until do done in keywords="if then else elif fi case esac for select while until do done in
function time coproc" function time coproc"
join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; }
# Add the language's grammar to the static completion list
printf %s\\n "declare-option str-list sh_static_words $(join "${keywords}" ' ')"
# Highlight keywords
printf %s "add-highlighter shared/sh/code/ regex \b($(join "${keywords}" '|'))\b 0:keyword"
}
# For some reasons this needs to be in its own %sh block
evaluate-commands %sh{
# Generated with `compgen -b` in bash # Generated with `compgen -b` in bash
builtins="alias bg bind break builtin caller cd command compgen complete builtins="alias bg bind break builtin caller cd command compgen complete
compopt continue declare dirs disown echo enable eval exec compopt continue declare dirs disown echo enable eval exec
@ -54,10 +42,13 @@ evaluate-commands %sh{
readonly return set shift shopt source suspend test times trap readonly return set shift shopt source suspend test times trap
true type typeset ulimit umask unalias unset wait" true type typeset ulimit umask unalias unset wait"
join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; } join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; }
# Add the language's grammar to the static completion list # Add the language's grammar to the static completion list
printf %s\\n "set-option -add global sh_static_words $(join "${builtins}" ' ')" printf %s\\n "declare-option str-list sh_static_words $(join "${keywords}" ' ') $(join "${builtins}" ' ')"
# Highlight keywords
printf %s\\n "add-highlighter shared/sh/code/ regex \b($(join "${keywords}" '|'))\b 0:keyword"
# Highlight builtins # Highlight builtins
printf %s "add-highlighter shared/sh/code/builtin regex \b($(join "${builtins}" '|'))\b 0:builtin" printf %s "add-highlighter shared/sh/code/builtin regex \b($(join "${builtins}" '|'))\b 0:builtin"