linux/powerlevel10k
0
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-09-19 03:51:22 +02:00
Code Issues Projects Releases Wiki Activity

remove function decls from the list of commands

Browse source
This commit is contained in:
romkatv 2020-01-11 10:30:36 +01:00
parent c4f68bd609
commit 90ac9c9e20
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
internal/parse.zsh
View file

@ -16,6 +16,7 @@ typeset -gA _p9k_skip_token=(
'if' '' 'if' ''
'fi' '' 'fi' ''
'elif' '' 'elif' ''
'else' ''
'then' '' 'then' ''
'while' '' 'while' ''
'until' '' 'until' ''
@ -62,6 +63,21 @@ typeset -gA _p9k_redirect=(
'>>|' '' '>>|' ''
) )
typeset -gA _p9k_term=(
'|' ''
'||' ''
';' ''
'&' ''
'&&' ''
'|&' ''
'&!' ''
'&|' ''
';;' ''
';&' ''
';|' ''
')' ''
)
function _p9k_extract_commands() { function _p9k_extract_commands() {
local rcquotes local rcquotes
[[ -o rcquotes ]] && rcquotes=(-o rcquotes) [[ -o rcquotes ]] && rcquotes=(-o rcquotes)
@ -73,7 +89,7 @@ function _p9k_extract_commands() {
local -i e local -i e
local id='$(<->|[[:alpha:]_][[:IDENT:]]#)' local id='$(<->|[[:alpha:]_][[:IDENT:]]#)'
local skip n s r var="\$$id|\${$id}|\"\$$id\"|\"\${$id}\"" local skip n s r var="\$$id|\${$id}|\"\$$id\"|\"\${$id}\""
local -a aln alp alf v match mbegin mend local -a aln alp alf v commands match mbegin mend
[[ -o interactive_comments ]] && local tokens=(${(Z+C+)1}) || local tokens=(${(z)1}) [[ -o interactive_comments ]] && local tokens=(${(Z+C+)1}) || local tokens=(${(z)1})
@ -119,7 +135,14 @@ function _p9k_extract_commands() {
if [[ -n $skip ]]; then if [[ -n $skip ]]; then
if [[ $token == $~skip ]]; then if [[ $token == $~skip ]]; then
[[ $token == ';'[';&|'] ]] && skip='\)|esac' || skip= skip=
if (( $+_p9k_term[$token] )); then
[[ $token == ';'[';&|'] ]] && skip='\)|esac'
_p9k_commands+=($commands)
commands=()
elif [[ $token == '()' ]]; then
commands=()
fi
fi fi
continue continue
fi fi
@ -153,9 +176,11 @@ function _p9k_extract_commands() {
fi fi
fi fi
_p9k_commands+=${token::=${(Q)${~token}}} commands+=${:-${(Q)${~token}}}
# '|' '||' ';' '&' '&&' '|&' '&!' '&|' ';;' ';&' ';|' ')' # '|' '||' ';' '&' '&&' '|&' '&!' '&|' ';;' ';&' ';|' ')' '()'
skip='\||\|\||;|&|&&|\|&|&!|&\||;;|;&|;\||\)|}' skip='\||\|\||;|&|&&|\|&|&!|&\||;;|;&|;\||\)|}|\(\)'
done done
_p9k_commands+=($commands)
} }