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

[sh] Separate keywords and builtins; fix variables

Browse Source 
Previously, the keywords were a mess. They contained the shell’s
reserved words and some arbitrarily selected builtins. I generated
the word list using bash because it contains all POSIX builtins and
is common for scripting.

In variable assignments some characters that are allowed to be in
variables used to not be highlighted, e.g. hyphens. With this commit
all characters except whitespace are considered to be part of the
variable.
This commit is contained in:
Lennard 2020-01-12 10:35:56 +00:00 committed by Lennard Hofmann
parent b85365bff8
commit a8bbdc71d9
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rc/filetype/sh.kak
View File

@ -30,11 +30,9 @@ add-highlighter shared/sh/double_string/fill fill string
evaluate-commands %sh{ evaluate-commands %sh{
# Grammar # Grammar
keywords="alias bind builtin caller case cd command coproc declare do done # Generated with `compgen -k` in bash
echo elif else enable esac exit fi for function help keywords="if then else elif fi case esac for select while until do done in
if in let local logout mapfile printf read readarray function time coproc"
readonly return select set shift source test then
time type typeset ulimit unalias until while break continue"
join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; } join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; }
@ -43,10 +41,30 @@ evaluate-commands %sh{
# Highlight keywords # Highlight keywords
printf %s "add-highlighter shared/sh/code/ regex \b($(join "${keywords}" '|'))\b 0:keyword" 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
builtins="alias bg bind break builtin caller cd command compgen complete
compopt continue declare dirs disown echo enable eval exec
exit export false fc fg getopts hash help history jobs kill
let local logout mapfile popd printf pushd pwd read readarray
readonly return set shift shopt source suspend test times trap
true type typeset ulimit umask unalias unset wait"
join() { sep=$2; eval set -- $1; IFS="$sep"; echo "$*"; }
# Add the language's grammar to the static completion list
printf %s\\n "set-option -add global sh_static_words $(join "${builtins}" ' ')"
# Highlight builtins
printf %s "add-highlighter shared/sh/code/builtin regex \b($(join "${builtins}" '|'))\b 0:builtin"
} }
add-highlighter shared/sh/code/operators regex [\[\]\(\)&|]{1,2} 0:operator add-highlighter shared/sh/code/operators regex [\[\]\(\)&|]{1,2} 0:operator
add-highlighter shared/sh/code/variable regex (\w+)= 1:variable add-highlighter shared/sh/code/variable regex (\S+)= 1:variable
add-highlighter shared/sh/code/function regex ^\h*(\w+)\h*\(\) 1:function add-highlighter shared/sh/code/function regex ^\h*(\w+)\h*\(\) 1:function
add-highlighter shared/sh/code/unscoped_expansion regex \$(\w+|#|@|\?|\$|!|-|\*) 0:value add-highlighter shared/sh/code/unscoped_expansion regex \$(\w+|#|@|\?|\$|!|-|\*) 0:value