changed yet more stuff
This commit is contained in:
parent
a0d198cdcb
commit
7935ec2ef6
23 changed files with 1080 additions and 47 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
|
@ -1,9 +1,6 @@
|
|||
[submodule "dotbot"]
|
||||
path = lib/dotbot
|
||||
url = https://github.com/anishathalye/dotbot
|
||||
[submodule "lib/highlighting"]
|
||||
path = lib/highlighting
|
||||
url = https://github.com/zsh-users/zsh-syntax-highlighting
|
||||
[submodule "lib/completions"]
|
||||
path = lib/completions
|
||||
url = https://github.com/zsh-users/zsh-completions
|
||||
|
|
@ -16,3 +13,6 @@
|
|||
[submodule "lib/fzf"]
|
||||
path = lib/fzf
|
||||
url = https://github.com/junegunn/fzf.git
|
||||
[submodule "lib/gitignore"]
|
||||
path = lib/gitignore
|
||||
url = https://github.com/github/gitignore
|
||||
|
|
|
|||
|
|
@ -1,31 +1,13 @@
|
|||
# Exports
|
||||
# Export with respect to dotfiles folder
|
||||
export DOTFILES="${HOME}/dotfiles"
|
||||
export DOTFILES_CONFIG="${DOTFILES}/config"
|
||||
export LIB="${DOTFILES}/lib"
|
||||
export ZSH="${LIB}/ohmyzsh"
|
||||
export CONFIG="${DOTFILES}/config"
|
||||
export ZSHRCD="${CONFIG}/zsh/zshrc.d"
|
||||
export SEPARATE="${ZSHRCD}/separate"
|
||||
export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
|
||||
export EDITOR='nano'
|
||||
export TERM=linux
|
||||
fpath+=(${LIB}/completions/src ${LIB}/local)
|
||||
|
||||
# Settings
|
||||
ZSH_THEME="mortalscumbag"
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
||||
|
||||
# Plugins
|
||||
case $(uname -n) in
|
||||
megumi|sayaka) source ${DOTFILES_CONFIG}/zsh/os-specific/archlinux.zsh ;;
|
||||
git) source ${DOTFILES_CONFIG}/zsh/os-specific/debian.zsh ;;
|
||||
esac
|
||||
|
||||
# Fix MobaXterm Home/End key with ZSH
|
||||
bindkey '^[[H' beginning-of-line
|
||||
bindkey '^[[F' end-of-line
|
||||
|
||||
# Source the needed parts
|
||||
source ${ZSH}/oh-my-zsh.sh # Oh My ZSH
|
||||
source ${LIB}/highlighting/zsh-syntax-highlighting.zsh # Syntax Highlighting
|
||||
for file in ${DOTFILES_CONFIG}/zsh/zshrc.d/*.zsh; do source $file; done # Other Files
|
||||
for file in ${ZSHRCD}/*.zsh; do source $file; done # Other Files
|
||||
source ${HOME}/.fzf.zsh # FZF
|
||||
eval `dircolors ${DOTFILES_CONFIG}/dir/dircolors` # Dircolors
|
||||
|
|
|
|||
7
config/zsh/zshrc.d/00-ohmy.zsh
Normal file
7
config/zsh/zshrc.d/00-ohmy.zsh
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
export ZSH="${LIB}/ohmyzsh"
|
||||
|
||||
# Settings
|
||||
ZSH_THEME="mortalscumbag"
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
|
||||
source ${ZSH}/oh-my-zsh.sh
|
||||
9
config/zsh/zshrc.d/01-aliases.zsh
Normal file
9
config/zsh/zshrc.d/01-aliases.zsh
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
alias rm='rm -i'
|
||||
alias cp='cp -i'
|
||||
alias mv='mv -i'
|
||||
alias la='ls -lAh'
|
||||
|
||||
clearall () { clear; printf '\033[3J' }
|
||||
mkcd() { mkdir $1 &>/dev/null; [ -e $1 ] && cd $1 }
|
||||
|
||||
for file in ${ZSHRCD}/aliases/*.zsh; do source $file; done
|
||||
1
config/zsh/zshrc.d/02-functions.zsh
Normal file
1
config/zsh/zshrc.d/02-functions.zsh
Normal file
|
|
@ -0,0 +1 @@
|
|||
for file in ${ZSHRCD}/functions/*.zsh; do source $file; done
|
||||
275
config/zsh/zshrc.d/03-highlighting.zsh
Normal file
275
config/zsh/zshrc.d/03-highlighting.zsh
Normal file
|
|
@ -0,0 +1,275 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
|
||||
# Copyright (c) 2017 Sebastian Gniazdowski (modifications)
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without modification, are permitted
|
||||
# provided that the following conditions are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright notice, this list of conditions
|
||||
# and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright notice, this list of
|
||||
# conditions and the following disclaimer in the documentation and/or other materials provided
|
||||
# with the distribution.
|
||||
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
|
||||
# may be used to endorse or promote products derived from this software without specific prior
|
||||
# written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
|
||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
||||
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
|
||||
# vim: ft=zsh sw=2 ts=2 et
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
# Set $ZERO to the expected value, regardless of functionargzero.
|
||||
typeset -g ZERO=${(%):-%N}
|
||||
|
||||
# Invokes each highlighter that needs updating.
|
||||
# This function is supposed to be called whenever the ZLE state changes.
|
||||
_zsh_highlight()
|
||||
{
|
||||
# Store the previous command return code to restore it whatever happens.
|
||||
local ret=$?
|
||||
|
||||
# Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
|
||||
# For details see FAQ entry 'Why does syntax highlighting not work while searching history?'.
|
||||
if [[ $WIDGET == zle-isearch-update ]] && ! (( $+ISEARCHMATCH_ACTIVE )); then
|
||||
region_highlight=()
|
||||
return $ret
|
||||
fi
|
||||
|
||||
setopt localoptions warncreateglobal noksharrays
|
||||
local REPLY # don't leak $REPLY into global scope
|
||||
local -a reply
|
||||
|
||||
# Do not highlight if there are more than 300 chars in the buffer. It's most
|
||||
# likely a pasted command or a huge list of files in that case..
|
||||
[[ -n ${ZSH_HIGHLIGHT_MAXLENGTH:-} ]] && [[ $#BUFFER -gt $ZSH_HIGHLIGHT_MAXLENGTH ]] && return $ret
|
||||
|
||||
# Do not highlight if there are pending inputs (copy/paste).
|
||||
[[ $PENDING -gt 0 ]] && return $ret
|
||||
|
||||
# Reset region highlight to build it from scratch
|
||||
# may need to remove path_prefix highlighting when the line ends
|
||||
if [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_buffer_modified; then
|
||||
-fast-highlight-init
|
||||
-fast-highlight-process && region_highlight=( $reply ) || region_highlight=()
|
||||
fi
|
||||
|
||||
{
|
||||
local cache_place
|
||||
local -a region_highlight_copy
|
||||
|
||||
# Re-apply zle_highlight settings
|
||||
|
||||
# region
|
||||
if (( REGION_ACTIVE == 1 )); then
|
||||
_zsh_highlight_apply_zle_highlight region standout "$MARK" "$CURSOR"
|
||||
elif (( REGION_ACTIVE == 2 )); then
|
||||
() {
|
||||
local needle=$'\n'
|
||||
integer min max
|
||||
if (( MARK > CURSOR )) ; then
|
||||
min=$CURSOR max=$MARK
|
||||
else
|
||||
min=$MARK max=$CURSOR
|
||||
fi
|
||||
(( min = ${${BUFFER[1,$min]}[(I)$needle]} ))
|
||||
(( max += ${${BUFFER:($max-1)}[(i)$needle]} - 1 ))
|
||||
_zsh_highlight_apply_zle_highlight region standout "$min" "$max"
|
||||
}
|
||||
fi
|
||||
|
||||
# yank / paste (zsh-5.1.1 and newer)
|
||||
(( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
|
||||
|
||||
# isearch
|
||||
(( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
|
||||
|
||||
# suffix
|
||||
(( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
|
||||
|
||||
return $ret
|
||||
|
||||
} always {
|
||||
typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER="$BUFFER"
|
||||
typeset -g _ZSH_HIGHLIGHT_PRIOR_RACTIVE="$REGION_ACTIVE"
|
||||
typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=$CURSOR
|
||||
}
|
||||
}
|
||||
|
||||
# Apply highlighting based on entries in the zle_highlight array.
|
||||
# This function takes four arguments:
|
||||
# 1. The exact entry (no patterns) in the zle_highlight array:
|
||||
# region, paste, isearch, or suffix
|
||||
# 2. The default highlighting that should be applied if the entry is unset
|
||||
# 3. and 4. Two integer values describing the beginning and end of the
|
||||
# range. The order does not matter.
|
||||
_zsh_highlight_apply_zle_highlight() {
|
||||
local entry="$1" default="$2"
|
||||
integer first="$3" second="$4"
|
||||
|
||||
# read the relevant entry from zle_highlight
|
||||
local region="${zle_highlight[(r)${entry}:*]}"
|
||||
|
||||
if [[ -z "$region" ]]; then
|
||||
# entry not specified at all, use default value
|
||||
region=$default
|
||||
else
|
||||
# strip prefix
|
||||
region="${region#${entry}:}"
|
||||
|
||||
# no highlighting when set to the empty string or to 'none'
|
||||
if [[ -z "$region" ]] || [[ "$region" == none ]]; then
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
integer start end
|
||||
if (( first < second )); then
|
||||
start=$first end=$second
|
||||
else
|
||||
start=$second end=$first
|
||||
fi
|
||||
region_highlight+=("$start $end $region")
|
||||
}
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# API/utility functions for highlighters
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
# Whether the command line buffer has been modified or not.
|
||||
#
|
||||
# Returns 0 if the buffer has changed since _zsh_highlight was last called.
|
||||
_zsh_highlight_buffer_modified()
|
||||
{
|
||||
[[ "${_ZSH_HIGHLIGHT_PRIOR_BUFFER:-}" != "$BUFFER" ]] || [[ "$REGION_ACTIVE" != "$_ZSH_HIGHLIGHT_PRIOR_RACTIVE" ]] || { _zsh_highlight_cursor_moved && [[ "$REGION_ACTIVE" = 1 || "$REGION_ACTIVE" = 2 ]] }
|
||||
}
|
||||
|
||||
# Whether the cursor has moved or not.
|
||||
#
|
||||
# Returns 0 if the cursor has moved since _zsh_highlight was last called.
|
||||
_zsh_highlight_cursor_moved()
|
||||
{
|
||||
[[ -n $CURSOR ]] && [[ -n ${_ZSH_HIGHLIGHT_PRIOR_CURSOR-} ]] && (($_ZSH_HIGHLIGHT_PRIOR_CURSOR != $CURSOR))
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Setup functions
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
# Helper for _zsh_highlight_bind_widgets
|
||||
# $1 is name of widget to call
|
||||
_zsh_highlight_call_widget()
|
||||
{
|
||||
builtin zle "$@" && _zsh_highlight
|
||||
}
|
||||
|
||||
# Rebind all ZLE widgets to make them invoke _zsh_highlights.
|
||||
_zsh_highlight_bind_widgets()
|
||||
{
|
||||
setopt localoptions noksharrays
|
||||
typeset -F SECONDS
|
||||
local prefix=orig-s$SECONDS-r$RANDOM # unique each time, in case we're sourced more than once
|
||||
|
||||
# Load ZSH module zsh/zleparameter, needed to override user defined widgets.
|
||||
zmodload zsh/zleparameter 2>/dev/null || {
|
||||
print -r -- >&2 'zsh-syntax-highlighting: failed loading zsh/zleparameter.'
|
||||
return 1
|
||||
}
|
||||
|
||||
# Override ZLE widgets to make them invoke _zsh_highlight.
|
||||
local -U widgets_to_bind
|
||||
widgets_to_bind=(${${(k)widgets}:#(.*|run-help|which-command|beep|set-local-history|yank)})
|
||||
|
||||
# Always wrap special zle-line-finish widget. This is needed to decide if the
|
||||
# current line ends and special highlighting logic needs to be applied.
|
||||
# E.g. remove cursor imprint, don't highlight partial paths, ...
|
||||
widgets_to_bind+=(zle-line-finish)
|
||||
|
||||
# Always wrap special zle-isearch-update widget to be notified of updates in isearch.
|
||||
# This is needed because we need to disable highlighting in that case.
|
||||
widgets_to_bind+=(zle-isearch-update)
|
||||
|
||||
local cur_widget
|
||||
for cur_widget in $widgets_to_bind; do
|
||||
case $widgets[$cur_widget] in
|
||||
|
||||
# Already rebound event: do nothing.
|
||||
user:_zsh_highlight_widget_*);;
|
||||
|
||||
# The "eval"'s are required to make $cur_widget a closure: the value of the parameter at function
|
||||
# definition time is used.
|
||||
#
|
||||
# We can't use ${0/_zsh_highlight_widget_} because these widgets are always invoked with
|
||||
# NO_function_argzero, regardless of the option's setting here.
|
||||
|
||||
# User defined widget: override and rebind old one with prefix "orig-".
|
||||
user:*) zle -N $prefix-$cur_widget ${widgets[$cur_widget]#*:}
|
||||
eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
|
||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
||||
|
||||
# Completion widget: override and rebind old one with prefix "orig-".
|
||||
completion:*) zle -C $prefix-$cur_widget ${${(s.:.)widgets[$cur_widget]}[2,3]}
|
||||
eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
|
||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
||||
|
||||
# Builtin widget: override and make it call the builtin ".widget".
|
||||
builtin) eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget .${(q)cur_widget} -- \"\$@\" }"
|
||||
zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
|
||||
|
||||
# Incomplete or nonexistent widget: Bind to z-sy-h directly.
|
||||
*)
|
||||
if [[ $cur_widget == zle-* ]] && [[ -z $widgets[$cur_widget] ]]; then
|
||||
_zsh_highlight_widget_${cur_widget}() { :; _zsh_highlight }
|
||||
zle -N $cur_widget _zsh_highlight_widget_$cur_widget
|
||||
else
|
||||
# Default: unhandled case.
|
||||
print -r -- >&2 "zsh-syntax-highlighting: unhandled ZLE widget ${(qq)cur_widget}"
|
||||
fi
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Setup
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
# Try binding widgets.
|
||||
_zsh_highlight_bind_widgets || {
|
||||
print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
|
||||
return 1
|
||||
}
|
||||
|
||||
# Reset scratch variables when commandline is done.
|
||||
_zsh_highlight_preexec_hook()
|
||||
{
|
||||
typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER=
|
||||
typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=0
|
||||
}
|
||||
|
||||
autoload -U add-zsh-hook
|
||||
add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
|
||||
print -r -- >&2 'zsh-syntax-highlighting: failed loading add-zsh-hook.'
|
||||
}
|
||||
|
||||
ZSH_HIGHLIGHT_MAXLENGTH=10000
|
||||
|
||||
# Load zsh/parameter module if available
|
||||
zmodload zsh/parameter 2>/dev/null
|
||||
|
||||
autoload -U is-at-least
|
||||
source "${LIB}/highlight"
|
||||
|
||||
[[ "${+termcap[Co]}" = 1 && "${termcap[Co]}" = "256" ]] && FAST_HIGHLIGHT_STYLES[variable]="fg=112"
|
||||
|
||||
-fast-highlight-fill-option-variables
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
# Interactive
|
||||
alias rm='rm -i'
|
||||
alias cp='cp -i'
|
||||
alias mv='mv -i'
|
||||
|
||||
# Listing
|
||||
alias l='ls -lh' #size,show type,human readable
|
||||
alias la='ls -lAh' #long list,show almost all,show type,human readable
|
||||
alias lr='ls -tRh' #sorted by date,recursive,show type,human readable
|
||||
alias lt='ls -lth' #long list,sorted by date,show type,human readable
|
||||
|
||||
# The Fuck
|
||||
TF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
|
||||
|
||||
# PClear
|
||||
clearall () { clear; printf '\033[3J' }
|
||||
|
||||
# Make Dir and enter it
|
||||
mkcd() { mkdir $1 &>/dev/null; [ -e $1 ] && cd $1 }
|
||||
3
config/zsh/zshrc.d/aliases/os.zsh
Normal file
3
config/zsh/zshrc.d/aliases/os.zsh
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# Aliases for OS
|
||||
if type pacman &>/dev/null; then source ${ZSHRCD}/aliases/os/archlinux.zsh; fi
|
||||
if type apt-get &>/dev/null; then source ${ZSHRCD}/aliases/os/debian.zsh; fi
|
||||
1
config/zsh/zshrc.d/functions/dircolors.zsh
Normal file
1
config/zsh/zshrc.d/functions/dircolors.zsh
Normal file
|
|
@ -0,0 +1 @@
|
|||
eval `dircolors ${CONFIG}/dir/dircolors`
|
||||
3
config/zsh/zshrc.d/functions/fixatwork.zsh
Normal file
3
config/zsh/zshrc.d/functions/fixatwork.zsh
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# Fix MobaXterm Home/End key with ZSH
|
||||
bindkey '^[[H' beginning-of-line
|
||||
bindkey '^[[F' end-of-line
|
||||
56
config/zsh/zshrc.d/functions/gitignore.zsh
Normal file
56
config/zsh/zshrc.d/functions/gitignore.zsh
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
export ZSH_PLUGIN_GITIGNORE_PATH=$(dirname $0)
|
||||
export ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS=${LIB}/gitignore
|
||||
|
||||
function gie () {
|
||||
${EDITOR} .gitignore
|
||||
}
|
||||
|
||||
function gi() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat .gitignore
|
||||
return 0
|
||||
fi
|
||||
|
||||
for t in $*; do
|
||||
get_gitignore_template $t
|
||||
done
|
||||
}
|
||||
|
||||
function gii() {
|
||||
if [[ $# -eq 0 ]]; then
|
||||
cat .gitignore
|
||||
return 0
|
||||
fi
|
||||
|
||||
# if NOCLOBBER option is setted
|
||||
gi $* >>! .gitignore
|
||||
}
|
||||
|
||||
function get_gitignore_template() {
|
||||
for tpath in ${(@s/:/)ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS}; do;
|
||||
local file=$(find $tpath -iname "$1.gitignore")
|
||||
if [[ ! -z $file ]]; then
|
||||
comment=$(basename $file | sed -e 's/.gitignore$//')
|
||||
echo
|
||||
echo "### $comment"
|
||||
cat $file
|
||||
break;
|
||||
fi
|
||||
done;
|
||||
}
|
||||
|
||||
_gitignore_get_template_list() {
|
||||
(for tpath in ${(@s/:/)ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS}; do; find $tpath -type f -name "*.gitignore"; done) \
|
||||
| xargs -n 1 basename \
|
||||
| sed -e 's/.gitignore$//' -e 's/\(.*\)/\L\1/' \
|
||||
| sort -u
|
||||
}
|
||||
|
||||
_gitignore () {
|
||||
compset -P '*,'
|
||||
compadd -S '' `_gitignore_get_template_list`
|
||||
}
|
||||
|
||||
compdef _gitignore gi
|
||||
compdef _gitignore gii
|
||||
|
||||
1
lib/gitignore
Submodule
1
lib/gitignore
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 8edb8a95c4c4b3dce71a378aaaf89275510b9cef
|
||||
715
lib/highlight
Normal file
715
lib/highlight
Normal file
|
|
@ -0,0 +1,715 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
|
||||
# Copyright (c) 2016-2017 Sebastian Gniazdowski (modifications)
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without modification, are permitted
|
||||
# provided that the following conditions are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright notice, this list of conditions
|
||||
# and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright notice, this list of
|
||||
# conditions and the following disclaimer in the documentation and/or other materials provided
|
||||
# with the distribution.
|
||||
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
|
||||
# may be used to endorse or promote products derived from this software without specific prior
|
||||
# written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
|
||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
||||
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
typeset -gA __fast_highlight_main__command_type_cache
|
||||
|
||||
# Define default styles. You can set this after loading the plugin in
|
||||
# Zshrc and use 256 via numbers, like: fg=150
|
||||
typeset -gA FAST_HIGHLIGHT_STYLES
|
||||
: ${FAST_HIGHLIGHT_STYLES[default]:=none}
|
||||
: ${FAST_HIGHLIGHT_STYLES[unknown-token]:=fg=red,bold}
|
||||
: ${FAST_HIGHLIGHT_STYLES[reserved-word]:=fg=yellow}
|
||||
: ${FAST_HIGHLIGHT_STYLES[alias]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[suffix-alias]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[builtin]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[function]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[command]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[precommand]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[commandseparator]:=none}
|
||||
: ${FAST_HIGHLIGHT_STYLES[hashed-command]:=fg=green}
|
||||
: ${FAST_HIGHLIGHT_STYLES[path]:=fg=magenta}
|
||||
: ${FAST_HIGHLIGHT_STYLES[path_pathseparator]:=}
|
||||
: ${FAST_HIGHLIGHT_STYLES[globbing]:=fg=blue,bold}
|
||||
: ${FAST_HIGHLIGHT_STYLES[history-expansion]:=fg=blue,bold}
|
||||
: ${FAST_HIGHLIGHT_STYLES[single-hyphen-option]:=fg=cyan}
|
||||
: ${FAST_HIGHLIGHT_STYLES[double-hyphen-option]:=fg=cyan}
|
||||
: ${FAST_HIGHLIGHT_STYLES[back-quoted-argument]:=none}
|
||||
: ${FAST_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow}
|
||||
: ${FAST_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow}
|
||||
: ${FAST_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow}
|
||||
: ${FAST_HIGHLIGHT_STYLES[back-or-dollar-double-quoted-argument]:=fg=cyan}
|
||||
: ${FAST_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
|
||||
: ${FAST_HIGHLIGHT_STYLES[assign]:=none}
|
||||
: ${FAST_HIGHLIGHT_STYLES[redirection]:=none}
|
||||
: ${FAST_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
|
||||
: ${FAST_HIGHLIGHT_STYLES[variable]:=none}
|
||||
|
||||
|
||||
typeset -gA __FAST_HIGHLIGHT_TOKEN_TYPES
|
||||
|
||||
__FAST_HIGHLIGHT_TOKEN_TYPES=(
|
||||
|
||||
# Precommand
|
||||
|
||||
'builtin' 1
|
||||
'command' 1
|
||||
'exec' 1
|
||||
'nocorrect' 1
|
||||
'noglob' 1
|
||||
'pkexec' 1 # immune to #121 because it's usually not passed --option flags
|
||||
|
||||
# Control flow
|
||||
# Tokens that, at (naively-determined) "command position", are followed by
|
||||
# a de jure command position. All of these are reserved words.
|
||||
|
||||
$'\x7b' 2 # block
|
||||
$'\x28' 2 # subshell
|
||||
'()' 2 # anonymous function
|
||||
'while' 2
|
||||
'until' 2
|
||||
'if' 2
|
||||
'then' 2
|
||||
'elif' 2
|
||||
'else' 2
|
||||
'do' 2
|
||||
'time' 2
|
||||
'coproc' 2
|
||||
'!' 2 # reserved word; unrelated to $histchars[1]
|
||||
|
||||
# Command separators
|
||||
|
||||
'|' 3
|
||||
'||' 3
|
||||
';' 3
|
||||
'&' 3
|
||||
'&&' 3
|
||||
'|&' 3
|
||||
'&!' 3
|
||||
'&|' 3
|
||||
# ### 'case' syntax, but followed by a pattern, not by a command
|
||||
# ';;' ';&' ';|'
|
||||
)
|
||||
|
||||
# A hash instead of multiple globals
|
||||
typeset -gA FAST_HIGHLIGHT
|
||||
|
||||
# Get the type of a command.
|
||||
#
|
||||
# Uses the zsh/parameter module if available to avoid forks, and a
|
||||
# wrapper around 'type -w' as fallback.
|
||||
#
|
||||
# Takes a single argument.
|
||||
#
|
||||
# The result will be stored in REPLY.
|
||||
-fast-highlight-main-type() {
|
||||
REPLY=$__fast_highlight_main__command_type_cache[(e)$1]
|
||||
[[ -z "$REPLY" ]] && {
|
||||
|
||||
if zmodload -e zsh/parameter; then
|
||||
if (( $+aliases[(e)$1] )); then
|
||||
REPLY=alias
|
||||
elif (( $+functions[(e)$1] )); then
|
||||
REPLY=function
|
||||
elif (( $+builtins[(e)$1] )); then
|
||||
REPLY=builtin
|
||||
elif (( $+commands[(e)$1] )); then
|
||||
REPLY=command
|
||||
elif (( $+saliases[(e)${1##*.}] )); then
|
||||
REPLY='suffix alias'
|
||||
elif (( $reswords[(Ie)$1] )); then
|
||||
REPLY=reserved
|
||||
# zsh 5.2 and older have a bug whereby running 'type -w ./sudo' implicitly
|
||||
# runs 'hash ./sudo=/usr/local/bin/./sudo' (assuming /usr/local/bin/sudo
|
||||
# exists and is in $PATH). Avoid triggering the bug, at the expense of
|
||||
# falling through to the $() below, incurring a fork. (Issue #354.)
|
||||
#
|
||||
# The second disjunct mimics the isrelative() C call from the zsh bug.
|
||||
elif [[ $1 != */* || "${+ZSH_ARGZERO}" = "1" ]] && ! builtin type -w -- $1 >/dev/null 2>&1; then
|
||||
REPLY=none
|
||||
fi
|
||||
fi
|
||||
|
||||
[[ -z "$REPLY" ]] && REPLY="${$(LC_ALL=C builtin type -w -- $1 2>/dev/null)##*: }"
|
||||
|
||||
[[ "$REPLY" = "none" ]] && {
|
||||
[[ -d "$1" ]] && REPLY="dirpath" || {
|
||||
for cdpath_dir in $cdpath; do
|
||||
[[ -d "$cdpath_dir/$1" ]] && { REPLY="dirpath"; break; }
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
__fast_highlight_main__command_type_cache[(e)$1]=$REPLY
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
# Below are variables that must be defined in outer
|
||||
# scope so that they are reachable in *-process()
|
||||
-fast-highlight-fill-option-variables() {
|
||||
if [[ -o ignore_braces ]] || eval '[[ -o ignore_close_braces ]] 2>/dev/null'; then
|
||||
FAST_HIGHLIGHT[right_brace_is_recognised_everywhere]=0
|
||||
else
|
||||
FAST_HIGHLIGHT[right_brace_is_recognised_everywhere]=1
|
||||
fi
|
||||
|
||||
if [[ -o path_dirs ]]; then
|
||||
FAST_HIGHLIGHT[path_dirs_was_set]=1
|
||||
else
|
||||
FAST_HIGHLIGHT[path_dirs_was_set]=0
|
||||
fi
|
||||
|
||||
if [[ -o multi_func_def ]]; then
|
||||
FAST_HIGHLIGHT[multi_func_def]=1
|
||||
else
|
||||
FAST_HIGHLIGHT[multi_func_def]=0
|
||||
fi
|
||||
|
||||
if [[ -o interactive_comments ]]; then
|
||||
FAST_HIGHLIGHT[ointeractive_comments]=1
|
||||
else
|
||||
FAST_HIGHLIGHT[ointeractive_comments]=0
|
||||
fi
|
||||
}
|
||||
|
||||
# Main syntax highlighting function.
|
||||
-fast-highlight-process()
|
||||
{
|
||||
emulate -L zsh
|
||||
setopt extendedglob bareglobqual nonomatch noksharrays
|
||||
|
||||
[[ $CONTEXT == "select" ]] && return 0
|
||||
|
||||
(( FAST_HIGHLIGHT[path_dirs_was_set] )) && setopt PATH_DIRS
|
||||
(( FAST_HIGHLIGHT[ointeractive_comments] )) && local interactive_comments= # _set_ to empty
|
||||
|
||||
# Variable declarations and initializations
|
||||
# in_array_assignment true between 'a=(' and the matching ')'
|
||||
# braces_stack: "R" for round, "Q" for square, "Y" for curly
|
||||
# mybuf, cdpath_dir are used in sub-functions
|
||||
local start_pos=0 end_pos start end highlight_glob=1 arg style in_array_assignment=0 MATCH expanded_path braces_stack buf="$PREBUFFER$BUFFER" mybuf cdpath_dir cur_cmd alias_target
|
||||
# arg_type can be 0, 1, 2 or 3, i.e. precommand, control flow, command separator
|
||||
# idx and end_idx are used in sub-functions
|
||||
# for this_word and next_word look below at commented integers and at state machine description
|
||||
integer arg_type=0 MBEGIN MEND in_redirection len=${#buf} already_added offset idx end_idx this_word=1 next_word=0 insane_alias pos
|
||||
local -a match mbegin mend
|
||||
|
||||
# integer BIT_start=1 BIT_regular=2 BIT_sudo_opt=4 BIT_sudo_arg=8 BIT_always=16
|
||||
|
||||
# State machine
|
||||
#
|
||||
# The states are:
|
||||
# - :start: Command word
|
||||
# - :sudo_opt: A leading-dash option to sudo (such as "-u" or "-i")
|
||||
# - :sudo_arg: The argument to a sudo leading-dash option that takes one,
|
||||
# when given as a separate word; i.e., "foo" in "-u foo" (two
|
||||
# words) but not in "-ufoo" (one word).
|
||||
# - :regular: "Not a command word", and command delimiters are permitted.
|
||||
# Mainly used to detect premature termination of commands.
|
||||
# - :always: The word 'always' in the «{ foo } always { bar }» syntax.
|
||||
#
|
||||
# When the kind of a word is not yet known, $this_word / $next_word may contain
|
||||
# multiple states. For example, after "sudo -i", the next word may be either
|
||||
# another --flag or a command name, hence the state would include both :start:
|
||||
# and :sudo_opt:.
|
||||
#
|
||||
# The tokens are always added with both leading and trailing colons to serve as
|
||||
# word delimiters (an improvised array); [[ $x == *:foo:* ]] and x=${x//:foo:/}
|
||||
# will DTRT regardless of how many elements or repetitions $x has..
|
||||
#
|
||||
# Handling of redirections: upon seeing a redirection token, we must stall
|
||||
# the current state --- that is, the value of $this_word --- for two iterations
|
||||
# (one for the redirection operator, one for the word following it representing
|
||||
# the redirection target). Therefore, we set $in_redirection to 2 upon seeing a
|
||||
# redirection operator, decrement it each iteration, and stall the current state
|
||||
# when it is non-zero. Thus, upon reaching the next word (the one that follows
|
||||
# the redirection operator and target), $this_word will still contain values
|
||||
# appropriate for the word immediately following the word that preceded the
|
||||
# redirection operator.
|
||||
#
|
||||
# The "the previous word was a redirection operator" state is not communicated
|
||||
# to the next iteration via $next_word/$this_word as usual, but via
|
||||
# $in_redirection. The value of $next_word from the iteration that processed
|
||||
# the operator is discarded.
|
||||
#
|
||||
|
||||
# Processing buffer
|
||||
local proc_buf="$buf" needle
|
||||
for arg in ${interactive_comments-${(z)buf}} \
|
||||
${interactive_comments+${(zZ+c+)buf}}; do
|
||||
# Initialize $next_word to its default value?
|
||||
(( in_redirection )) && (( --in_redirection ))
|
||||
(( in_redirection == 0 )) && next_word=2 # else Stall $next_word.
|
||||
|
||||
# Initialize per-"simple command" [zshmisc(1)] variables:
|
||||
#
|
||||
# $already_added (see next paragraph)
|
||||
# $style how to highlight $arg
|
||||
# $in_array_assignment boolean flag for "between '(' and ')' of array assignment"
|
||||
# $highlight_glob boolean flag for "'noglob' is in effect"
|
||||
#
|
||||
# $already_added is set to 1 to disable adding an entry to region_highlight
|
||||
# for this iteration. Currently, that is done for "" and $'' strings,
|
||||
# which add the entry early so escape sequences within the string override
|
||||
# the string's color.
|
||||
already_added=0
|
||||
style=unknown-token
|
||||
if (( this_word & 1 )); then
|
||||
in_array_assignment=0
|
||||
[[ $arg == 'noglob' ]] && highlight_glob=0
|
||||
fi
|
||||
|
||||
# Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
|
||||
if [[ $arg == ';' ]] ; then
|
||||
# We're looking for either a semicolon or a newline, whichever comes
|
||||
# first. Both of these are rendered as a ";" (SEPER) by the ${(z)..}
|
||||
# flag.
|
||||
#
|
||||
# We can't use the (Z+n+) flag because that elides the end-of-command
|
||||
# token altogether, so 'echo foo\necho bar' (two commands) becomes
|
||||
# indistinguishable from 'echo foo echo bar' (one command with three
|
||||
# words for arguments).
|
||||
needle=$'[;\n]'
|
||||
offset=$(( ${proc_buf[(i)$needle]} - 1 ))
|
||||
(( start_pos += offset ))
|
||||
(( end_pos = start_pos + $#arg ))
|
||||
|
||||
# Do not run default code for case when there is a new line
|
||||
# It shouldn't be treated as ';', i.e. shouldn't be highlighted
|
||||
# as unknown-token when appears after command-starting arg like "{"
|
||||
if [[ "${proc_buf[offset+1]}" = $'\n' ]]; then
|
||||
(( in_array_assignment )) && (( this_word = 2 )) || { (( this_word = 1 )); highlight_glob=1; }
|
||||
in_redirection=0
|
||||
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
|
||||
start_pos=$end_pos
|
||||
continue
|
||||
else
|
||||
# One more short path – for ';' command separator
|
||||
(( in_array_assignment )) && (( this_word = 2 )) || { (( this_word = 1 )); highlight_glob=1; }
|
||||
in_redirection=0
|
||||
[[ "${FAST_HIGHLIGHT_STYLES[commandseparator]}" != "none" ]] && (( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[commandseparator]}")
|
||||
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
|
||||
start_pos=$end_pos
|
||||
continue
|
||||
fi
|
||||
|
||||
arg_type=3
|
||||
else
|
||||
offset=0
|
||||
if [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\[[:space:]])##)* ]]; then
|
||||
# The first, outer parenthesis
|
||||
offset="${mend[1]}"
|
||||
fi
|
||||
((start_pos+=offset))
|
||||
((end_pos=start_pos+${#arg}))
|
||||
|
||||
# No-hit will result in value 0
|
||||
arg_type=${__FAST_HIGHLIGHT_TOKEN_TYPES[$arg]}
|
||||
fi
|
||||
|
||||
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
|
||||
|
||||
# Handle the INTERACTIVE_COMMENTS option.
|
||||
#
|
||||
# We use the (Z+c+) flag so the entire comment is presented as one token in $arg.
|
||||
if [[ -n ${interactive_comments+'set'} && $arg[1] == $histchars[3] ]]; then
|
||||
if (( this_word & 3 )); then
|
||||
style=comment
|
||||
else
|
||||
style=unknown-token # prematurely terminated
|
||||
fi
|
||||
# ADD
|
||||
(( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[$style]}")
|
||||
start_pos=$end_pos
|
||||
continue
|
||||
fi
|
||||
|
||||
# Analyse the current word.
|
||||
if [[ $arg == (<0-9>|)(\<|\>)* ]] && [[ $arg != (\<|\>)$'\x28'* ]]; then
|
||||
# A '<' or '>', possibly followed by a digit
|
||||
in_redirection=2
|
||||
fi
|
||||
|
||||
# Special-case the first word after 'sudo'.
|
||||
if (( ! in_redirection )); then
|
||||
if (( this_word & 4 )) && [[ $arg != -* ]]; then
|
||||
(( this_word = this_word ^ 4 ))
|
||||
fi
|
||||
|
||||
# Parse the sudo command line
|
||||
if (( this_word & 4 )); then
|
||||
case "$arg" in
|
||||
# Flag that requires an argument
|
||||
'-'[Cgprtu])
|
||||
(( this_word & 1 )) && (( this_word = this_word ^ 1 ))
|
||||
(( next_word = 8 ))
|
||||
;;
|
||||
# This prevents misbehavior with sudo -u -otherargument
|
||||
'-'*)
|
||||
(( this_word & 1 )) && (( this_word = this_word ^ 1 ))
|
||||
(( next_word = next_word | 1 ))
|
||||
(( next_word = next_word | 4 ))
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
elif (( this_word & 8 )); then
|
||||
(( next_word = next_word | 4 ))
|
||||
(( next_word = next_word | 1 ))
|
||||
fi
|
||||
fi
|
||||
|
||||
expanded_path=""
|
||||
|
||||
# The Great Fork: is this a command word? Is this a non-command word?
|
||||
if (( this_word & 16 )) && [[ $arg == 'always' ]]; then
|
||||
# try-always construct
|
||||
style=reserved-word # de facto a reserved word, although not de jure
|
||||
(( next_word = 1 ))
|
||||
elif (( this_word & 1 )) && (( in_redirection == 0 )); then # $arg is the command word
|
||||
cur_cmd="$arg"
|
||||
if (( arg_type == 1 )); then
|
||||
style=precommand
|
||||
elif [[ "$arg" = "sudo" ]]; then
|
||||
style=precommand
|
||||
(( next_word & 2 )) && (( next_word = next_word ^ 2 ))
|
||||
(( next_word = next_word | 4 ))
|
||||
(( next_word = next_word | 1 ))
|
||||
else
|
||||
# Special-case: command word is '$foo', like that, without braces or anything.
|
||||
#
|
||||
# That's not entirely correct --- if the parameter's value happens to be a reserved
|
||||
# word, the parameter expansion will be highlighted as a reserved word --- but that
|
||||
# incorrectness is outweighed by the usability improvement of permitting the use of
|
||||
# parameters that refer to commands, functions, and builtins.
|
||||
if [[ ${arg[1]} == \$ ]] && (( ${+parameters} )) && [[ ${arg:1} = (#m)([a-zA-Z_][a-zA-Z0-9_]#|[0-9]##) ]] && (( ${+parameters[${MATCH}]} )); then
|
||||
-fast-highlight-main-type ${(P)MATCH}
|
||||
else
|
||||
: ${expanded_path::=${(Q)~arg}}
|
||||
-fast-highlight-main-type $expanded_path
|
||||
fi
|
||||
|
||||
case $REPLY in
|
||||
reserved) # reserved word
|
||||
style=reserved-word
|
||||
if [[ $arg == $'\x7b' ]]; then
|
||||
braces_stack='Y'"$braces_stack"
|
||||
elif [[ $arg == $'\x7d' && $braces_stack[1] == "Y" ]]; then
|
||||
# We're at command word, so no need to check right_brace_is_recognised_everywhere
|
||||
braces_stack[1]=""
|
||||
style=reserved-word
|
||||
(( next_word = next_word | 16 ))
|
||||
elif [[ $arg == "[[" ]]; then
|
||||
braces_stack='A'"$braces_stack"
|
||||
fi
|
||||
;;
|
||||
'suffix alias') style=suffix-alias;;
|
||||
alias)
|
||||
insane_alias=0
|
||||
case $arg in
|
||||
# Issue #263: aliases with '=' on their LHS.
|
||||
#
|
||||
# There are three cases:
|
||||
#
|
||||
# - Unsupported, breaks 'alias -L' output, but invokable:
|
||||
('='*) :;;
|
||||
# - Unsupported, not invokable:
|
||||
(*'='*) insane_alias=1;;
|
||||
# - The common case:
|
||||
(*) :;;
|
||||
esac
|
||||
if (( insane_alias )); then
|
||||
style=unknown-token
|
||||
else
|
||||
style=alias
|
||||
zmodload -e zsh/parameter && alias_target=${aliases[$arg]} || alias_target="${"$(alias -- $arg)"#*=}"
|
||||
[[ ${__FAST_HIGHLIGHT_TOKEN_TYPES[$alias_target]} = "1" && "$arg_type" != "1" ]] && __FAST_HIGHLIGHT_TOKEN_TYPES[$arg]="1"
|
||||
fi
|
||||
;;
|
||||
builtin) style=builtin;;
|
||||
function) style=function;;
|
||||
command) style=command;;
|
||||
hashed) style=hashed-command;;
|
||||
dirpath) style=path;;
|
||||
none) # Assign?
|
||||
if [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[[^\]]#\])(|[+])=* ]] || [[ $arg == [0-9]##(|[+])=* ]]; then
|
||||
style=assign
|
||||
# Assignment to a scalar parameter or to array
|
||||
# (For array assignments, the command doesn't start until the ")" token.)
|
||||
[[ $arg[-1] == '(' ]] && in_array_assignment=1 || (( next_word = next_word | 1 ))
|
||||
elif [[ $arg[1] = $histchars[1] && -n "${arg[2]}" ]]; then
|
||||
style=history-expansion
|
||||
elif [[ $arg[1] == $histchars[2] ]]; then
|
||||
style=history-expansion
|
||||
elif (( arg_type == 3 )); then
|
||||
# This highlights empty commands (semicolon follows nothing) as an error.
|
||||
# Zsh accepts them, though.
|
||||
(( this_word & 2 )) && style=commandseparator
|
||||
elif [[ $arg[1,2] == '((' ]]; then
|
||||
# Arithmetic evaluation.
|
||||
#
|
||||
# Note: prior to zsh-5.1.1-52-g4bed2cf (workers/36669), the ${(z)...}
|
||||
# splitter would only output the '((' token if the matching '))' had
|
||||
# been typed. Therefore, under those versions of zsh, BUFFER="(( 42"
|
||||
# would be highlighted as an error until the matching "))" are typed.
|
||||
#
|
||||
# We highlight just the opening parentheses, as a reserved word; this
|
||||
# is how [[ ... ]] is highlighted, too.
|
||||
|
||||
# ADD
|
||||
(( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $(( start + 2 )) ${FAST_HIGHLIGHT_STYLES[reserved-word]}")
|
||||
already_added=1
|
||||
# ADD
|
||||
[[ $arg[-2,-1] == '))' ]] && (( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$(( end - 2 )) $end ${FAST_HIGHLIGHT_STYLES[reserved-word]}")
|
||||
elif [[ $arg == '()' ]]; then
|
||||
# anonymous function
|
||||
style=reserved-word
|
||||
elif [[ $arg == $'\x28' ]]; then
|
||||
# subshell
|
||||
style=reserved-word
|
||||
braces_stack='R'"$braces_stack"
|
||||
elif [[ $arg == $'\x29' ]]; then
|
||||
[[ $braces_stack[1] == "R" ]] && { braces_stack[1]=""; style=reserved-word; }
|
||||
elif (( this_word & 14 )); then
|
||||
style=default
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# ADD
|
||||
# (( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end commandtypefromthefuture-$REPLY")
|
||||
already_added=1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
# in_redirection || BIT_regular || BIT_sudo_opt || BIT_sudo_arg
|
||||
elif (( in_redirection + this_word & 14 ))
|
||||
then # $arg is a non-command word
|
||||
case $arg in
|
||||
']]')
|
||||
style=reserved-word
|
||||
[[ $braces_stack[1] == "A" ]] && braces_stack[1]=""
|
||||
;;
|
||||
']')
|
||||
style=builtin
|
||||
;;
|
||||
$'\x28')
|
||||
# '(' inside [[
|
||||
style=reserved-word
|
||||
braces_stack='R'"$braces_stack"
|
||||
;;
|
||||
$'\x29') # subshell or end of array assignment
|
||||
if (( in_array_assignment )); then
|
||||
style=assign
|
||||
in_array_assignment=0
|
||||
(( next_word = next_word | 1 ))
|
||||
elif [[ $braces_stack[1] == "R" ]]; then
|
||||
braces_stack[1]=""
|
||||
style=reserved-word
|
||||
fi;;
|
||||
$'\x28\x29') # possibly a function definition
|
||||
# || false # TODO: or if the previous word was a command word
|
||||
(( FAST_HIGHLIGHT[multi_func_def] )) && (( next_word = next_word | 1 ))
|
||||
style=reserved-word
|
||||
# Remove possible annoying unknown-token style, or misleading function style
|
||||
reply[-1]=()
|
||||
;;
|
||||
'--'*) style=double-hyphen-option;;
|
||||
'-'*) style=single-hyphen-option;;
|
||||
"'"*) style=single-quoted-argument;;
|
||||
'"'*)
|
||||
# ADD
|
||||
(( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[double-quoted-argument]}")
|
||||
-fast-highlight-string
|
||||
already_added=1
|
||||
;;
|
||||
\$\'*)
|
||||
# ADD
|
||||
(( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[dollar-quoted-argument]}")
|
||||
-fast-highlight-dollar-string
|
||||
already_added=1
|
||||
;;
|
||||
\$[^\(]*)
|
||||
style=variable
|
||||
;;
|
||||
'`'*) style=back-quoted-argument;;
|
||||
[*?]*|*[^\\][*?]*)
|
||||
(( highlight_glob )) && style=globbing || style=default;;
|
||||
*) if [[ $arg = $'\x7d' && $braces_stack[1] == "Y" && "$FAST_HIGHLIGHT[right_brace_is_recognised_everywhere]" = "1" ]]; then
|
||||
# right brace
|
||||
# Parsing rule: # {
|
||||
#
|
||||
# Additionally, `tt(})' is recognized in any position if neither the
|
||||
# tt(IGNORE_BRACES) option nor the tt(IGNORE_CLOSE_BRACES) option is set."""
|
||||
braces_stack[1]=""
|
||||
style=reserved-word
|
||||
(( next_word = next_word | 16 ))
|
||||
elif [[ $arg[1] = $histchars[1] && -n "${arg[2]}" ]]; then
|
||||
style=history-expansion
|
||||
elif (( arg_type == 3 )); then
|
||||
style=commandseparator
|
||||
elif (( in_redirection == 2 )); then
|
||||
style=redirection
|
||||
else
|
||||
if [[ -z "${FAST_HIGHLIGHT[no_check_paths]}" ]] && -fast-highlight-check-path; then
|
||||
# ADD
|
||||
(( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[path]}")
|
||||
already_added=1
|
||||
|
||||
[[ -n "$FAST_HIGHLIGHT_STYLES[path_pathseparator]" && "$FAST_HIGHLIGHT_STYLES[path]" != "$FAST_HIGHLIGHT_STYLES[path_pathseparator]" ]] && {
|
||||
for (( pos = start_pos; pos <= end_pos; pos++ )) ; do
|
||||
# ADD
|
||||
[[ ${buf[pos]} == "/" ]] && (( start=pos-${#PREBUFFER}, start >= 0 )) && reply+=("$(( start - 1 )) $start ${FAST_HIGHLIGHT_STYLES[path_pathseparator]}")
|
||||
done
|
||||
}
|
||||
else
|
||||
style=default
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# ADD
|
||||
(( already_added == 0 )) && [[ "${FAST_HIGHLIGHT_STYLES[$style]}" != "none" ]] && (( start=start_pos-${#PREBUFFER}, end=end_pos-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[$style]}")
|
||||
|
||||
if (( arg_type == 3 )); then
|
||||
if [[ $arg == ';' ]] && (( in_array_assignment )); then
|
||||
# literal newline inside an array assignment
|
||||
(( next_word = 2 ))
|
||||
elif [[ -n "${braces_stack[(r)A]}" ]]; then
|
||||
(( next_word = 2 ))
|
||||
else
|
||||
(( next_word = 1 ))
|
||||
highlight_glob=1
|
||||
fi
|
||||
elif (( arg_type == 1 || arg_type == 2 )) && (( this_word & 1 )); then
|
||||
(( next_word = 1 ))
|
||||
elif [[ $arg == "repeat" ]] && (( this_word & 1 )); then
|
||||
# skip the repeat-count word
|
||||
in_redirection=2
|
||||
# The redirection mechanism assumes $this_word describes the word
|
||||
# following the redirection. Make it so.
|
||||
#
|
||||
# That word can be a command word with shortloops (`repeat 2 ls`)
|
||||
# or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`).
|
||||
#
|
||||
# The repeat-count word will be handled like a redirection target.
|
||||
(( this_word = 3 ))
|
||||
fi
|
||||
start_pos=$end_pos
|
||||
# This is the default/common codepath.
|
||||
(( in_redirection == 0 )) && (( this_word = next_word )) #else # Stall $this_word.
|
||||
done
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
# Check if $arg is a path.
|
||||
# If yes, return 0 and in $REPLY the style to use.
|
||||
# Else, return non-zero (and the contents of $REPLY is undefined).
|
||||
-fast-highlight-check-path()
|
||||
{
|
||||
: ${expanded_path:=${(Q)~arg}}
|
||||
|
||||
[[ -z $expanded_path ]] && return 1
|
||||
[[ -e $expanded_path ]] && return 0
|
||||
|
||||
# Search the path in CDPATH, only for CD command
|
||||
[[ "$cur_cmd" = "cd" ]] && for cdpath_dir in $cdpath ; do
|
||||
[[ -e "$cdpath_dir/$expanded_path" ]] && return 0
|
||||
done
|
||||
|
||||
# It's not a path.
|
||||
return 1
|
||||
}
|
||||
|
||||
# Highlight special chars inside double-quoted strings
|
||||
-fast-highlight-string()
|
||||
{
|
||||
mybuf="$arg"
|
||||
idx=start_pos
|
||||
|
||||
while [[ "$mybuf" = (#b)[^\$\\]#((\$(#B)([a-zA-Z_:][a-zA-Z0-9_:]#|[0-9]##)(#b)(\[[^\]]#\])(#c0,1))|(\$[{](\([a-zA-Z0@%#]##\))(#c0,1)[a-zA-Z0-9_:#]##(\[[^\]]#\])(#c0,1)[}])|[\\][\'\"\$]|[\\](*))(*) ]]; do
|
||||
[[ -n "${match[7]}" ]] && {
|
||||
# Skip following char – it is quoted. Choice is
|
||||
# made to not highlight such quoting
|
||||
idx+=${mbegin[1]}+1
|
||||
mybuf="${match[7]:1}"
|
||||
} || {
|
||||
idx+=${mbegin[1]}-1
|
||||
end_idx=idx+${mend[1]}-${mbegin[1]}+1
|
||||
mybuf="${match[8]}"
|
||||
|
||||
# ADD
|
||||
(( start=idx-${#PREBUFFER}, end=end_idx-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[back-or-dollar-double-quoted-argument]}")
|
||||
|
||||
idx=end_idx
|
||||
}
|
||||
done
|
||||
}
|
||||
|
||||
# Highlight special chars inside dollar-quoted strings
|
||||
-fast-highlight-dollar-string()
|
||||
{
|
||||
local i j k style
|
||||
local AA
|
||||
integer c
|
||||
# Starting dollar-quote is at 1:2, so start parsing at offset 3 in the string.
|
||||
for (( i = 3 ; i < end_pos - start_pos ; i += 1 )) ; do
|
||||
(( j = i + start_pos - 1 ))
|
||||
(( k = j + 1 ))
|
||||
case "$arg[$i]" in
|
||||
"\\") style=back-dollar-quoted-argument
|
||||
for (( c = i + 1 ; c <= end_pos - start_pos ; c += 1 )); do
|
||||
[[ "$arg[$c]" != ([0-9xXuUa-fA-F]) ]] && break
|
||||
done
|
||||
AA=$arg[$i+1,$c-1]
|
||||
# Matching for HEX and OCT values like \0xA6, \xA6 or \012
|
||||
if [[ "$AA" =~ "^(x|X)[0-9a-fA-F]{1,2}"
|
||||
|| "$AA" =~ "^[0-7]{1,3}"
|
||||
|| "$AA" =~ "^u[0-9a-fA-F]{1,4}"
|
||||
|| "$AA" =~ "^U[0-9a-fA-F]{1,8}"
|
||||
]]; then
|
||||
(( k += $#MATCH ))
|
||||
(( i += $#MATCH ))
|
||||
else
|
||||
if (( $#arg > $i+1 )) && [[ $arg[$i+1] == [xXuU] ]]; then
|
||||
# \x not followed by hex digits is probably an error
|
||||
style=unknown-token
|
||||
fi
|
||||
(( k += 1 )) # Color following char too.
|
||||
(( i += 1 )) # Skip parsing the escaped char.
|
||||
fi
|
||||
;;
|
||||
*) continue ;;
|
||||
|
||||
esac
|
||||
# ADD
|
||||
(( start=j-${#PREBUFFER}, end=k-${#PREBUFFER}, start >= 0 )) && reply+=("$start $end ${FAST_HIGHLIGHT_STYLES[$style]}")
|
||||
done
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Main highlighter initialization
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
|
||||
-fast-highlight-init() {
|
||||
__fast_highlight_main__command_type_cache=()
|
||||
}
|
||||
|
||||
# vim:ft=zsh:sw=2:sts=2
|
||||
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit aac4a4423898fccbd1ab72c369ac09995a9139f1
|
||||
Loading…
Add table
Reference in a new issue