mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2024-12-23 10:21:15 +01:00
Merge pull request #57 from jirutka/patch-2
Fix and unify formatting and code-style
This commit is contained in:
Michael Robinson
commit
2d5ac282a9
6 changed files with 51 additions and 45 deletions
7
.editorconfig
Normal file
7
.editorconfig
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
[*]
|
||||
charset = utf-8
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
|
|
@ -40,4 +40,4 @@ You may override default global config variables after plugin load.
|
|||
|
||||
## Known Issues
|
||||
|
||||
- `COMPLETION_WAITING_DOTS`: setting this to `true` is known to cause problems when attempting to autocomplete with <kbd>TAB</kbd>
|
||||
- `COMPLETION_WAITING_DOTS`: setting this to `true` is known to cause problems when attempting to autocomplete with <kbd>TAB</kbd>
|
||||
|
|
|
|||
|
|
@ -28,22 +28,22 @@ function {
|
|||
}
|
||||
|
||||
ZLE_AUTOSUGGEST_SUSPEND_WIDGETS=(
|
||||
vi-cmd-mode vi-backward-char backward-char backward-word beginning-of-line
|
||||
history-search-forward history-search-backward up-line-or-history
|
||||
history-beginning-search-forward history-beginning-search-backward
|
||||
down-line-or-history history-substring-search-up history-substring-search-down
|
||||
backward-kill-word
|
||||
vi-cmd-mode vi-backward-char backward-char backward-word beginning-of-line
|
||||
history-search-forward history-search-backward up-line-or-history
|
||||
history-beginning-search-forward history-beginning-search-backward
|
||||
down-line-or-history history-substring-search-up history-substring-search-down
|
||||
backward-kill-word
|
||||
)
|
||||
|
||||
ZLE_AUTOSUGGEST_COMPLETION_WIDGETS=(
|
||||
complete-word expand-or-complete expand-or-complete-prefix list-choices
|
||||
menu-complete reverse-menu-complete menu-expand-or-complete menu-select
|
||||
accept-and-menu-complete
|
||||
complete-word expand-or-complete expand-or-complete-prefix list-choices
|
||||
menu-complete reverse-menu-complete menu-expand-or-complete menu-select
|
||||
accept-and-menu-complete
|
||||
)
|
||||
|
||||
ZLE_AUTOSUGGEST_ACCEPT_WIDGETS=(
|
||||
vi-forward-char forward-char vi-forward-word forward-word vi-add-eol
|
||||
vi-add-next vi-forward-blank-word end-of-line
|
||||
vi-forward-char forward-char vi-forward-word forward-word vi-add-eol
|
||||
vi-add-next vi-forward-blank-word end-of-line
|
||||
)
|
||||
|
||||
autosuggest-pause() {
|
||||
|
|
@ -100,9 +100,9 @@ autosuggest-resume() {
|
|||
|
||||
autosuggest-start() {
|
||||
if [[ -z $ZLE_DISABLE_AUTOSUGGEST && -n $functions[_zsh_highlight] ]]; then
|
||||
if [[ ${ZSH_HIGHLIGHT_HIGHLIGHTERS[(i)autosuggest]} -gt ${#ZSH_HIGHLIGHT_HIGHLIGHTERS} ]];then
|
||||
ZSH_HIGHLIGHT_HIGHLIGHTERS+=(autosuggest)
|
||||
fi
|
||||
if [[ ${ZSH_HIGHLIGHT_HIGHLIGHTERS[(i)autosuggest]} -gt ${#ZSH_HIGHLIGHT_HIGHLIGHTERS} ]]; then
|
||||
ZSH_HIGHLIGHT_HIGHLIGHTERS+=(autosuggest)
|
||||
fi
|
||||
fi
|
||||
autosuggest-resume
|
||||
}
|
||||
|
|
@ -135,7 +135,7 @@ _zsh_highlight_autosuggest_highlighter() {
|
|||
}
|
||||
|
||||
autosuggest-insert-or-space() {
|
||||
setopt localoptions noshwordsplit noksharrays
|
||||
setopt localoptions noshwordsplit noksharrays
|
||||
if [[ $LBUFFER == *$'\012'* ]] || (( PENDING )); then
|
||||
# Editing multiline buffer or pasting a chunk of text, pause
|
||||
autosuggest-suspend
|
||||
|
|
@ -163,13 +163,13 @@ autosuggest-insert-or-space() {
|
|||
autosuggest-backward-delete-char() {
|
||||
if (( $#LBUFFER > 1 )); then
|
||||
setopt localoptions noshwordsplit noksharrays
|
||||
if [[ $LBUFFER = *$'\012'* || $LASTWIDGET != (self-insert|magic-space|backward-delete-char) ]]; then
|
||||
LBUFFER="$LBUFFER[1,-2]"
|
||||
else
|
||||
((--CURSOR))
|
||||
autosuggest-invalidate-highlight-cache
|
||||
zle .history-beginning-search-forward || RBUFFER=''
|
||||
fi
|
||||
if [[ $LBUFFER = *$'\012'* || $LASTWIDGET != (self-insert|magic-space|backward-delete-char) ]]; then
|
||||
LBUFFER="$LBUFFER[1,-2]"
|
||||
else
|
||||
((--CURSOR))
|
||||
autosuggest-invalidate-highlight-cache
|
||||
zle .history-beginning-search-forward || RBUFFER=''
|
||||
fi
|
||||
autosuggest-highlight-suggested-text
|
||||
else
|
||||
zle .kill-whole-line
|
||||
|
|
@ -237,11 +237,11 @@ autosuggest-tab() {
|
|||
}
|
||||
|
||||
autosuggest-accept-suggestion() {
|
||||
if [[ AUTOSUGGESTION_ACCEPT_RIGHT_ARROW -eq 1 && "$WIDGET" == 'forward-char' ]]; then
|
||||
zle autosuggest-end-of-line-orig "$@"
|
||||
else
|
||||
zle autosuggest-${WIDGET}-orig "$@"
|
||||
fi
|
||||
if [[ AUTOSUGGESTION_ACCEPT_RIGHT_ARROW -eq 1 && "$WIDGET" == 'forward-char' ]]; then
|
||||
zle autosuggest-end-of-line-orig "$@"
|
||||
else
|
||||
zle autosuggest-${WIDGET}-orig "$@"
|
||||
fi
|
||||
if [[ -n $ZLE_AUTOSUGGESTING ]]; then
|
||||
autosuggest-invalidate-highlight-cache
|
||||
autosuggest-highlight-suggested-text
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ zstyle -d ':completion:*' list-colors
|
|||
zmodload zsh/zutil
|
||||
|
||||
# override compadd (this our hook)
|
||||
compadd () {
|
||||
compadd() {
|
||||
|
||||
# check if any of -O, -A or -D are given
|
||||
if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ handle-request() {
|
|||
done
|
||||
if ! (( read_something )); then
|
||||
print "connection with fd $connection closed" >&2
|
||||
unset fds[$connection]
|
||||
unset fds[$connection]
|
||||
exec {connection}>&- # free the file descriptor
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
31
install
31
install
|
|
@ -3,8 +3,7 @@
|
|||
# Install script for zsh-autocomplete
|
||||
|
||||
config="$HOME/.zshrc"
|
||||
for config in "$HOME/.zshrc" "$ZDOTDIR/.zshrc" "$1"
|
||||
do
|
||||
for config in "$HOME/.zshrc" "$ZDOTDIR/.zshrc" "$1"; do
|
||||
echo $config
|
||||
#first checks if ~/.zshrc file exists and is readable
|
||||
if [ -r "$config" ]; then
|
||||
|
|
@ -17,28 +16,28 @@ done
|
|||
|
||||
SOURCE="${BASH_SOURCE[0]}"
|
||||
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
SOURCE="$(readlink "$SOURCE")"
|
||||
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
SOURCE="$(readlink "$SOURCE")"
|
||||
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||
done
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
|
||||
# appends the string to $config (usually ~/.zshrc) file
|
||||
cat >> "$config" << EOF
|
||||
cat >> "$config" <<-EOF
|
||||
|
||||
# Setup zsh-autosuggestions
|
||||
source $DIR/autosuggestions.zsh
|
||||
# Setup zsh-autosuggestions
|
||||
source $DIR/autosuggestions.zsh
|
||||
|
||||
# Enable autosuggestions automatically
|
||||
zle-line-init() {
|
||||
zle autosuggest-start
|
||||
}
|
||||
# Enable autosuggestions automatically
|
||||
zle-line-init() {
|
||||
zle autosuggest-start
|
||||
}
|
||||
|
||||
zle -N zle-line-init
|
||||
zle -N zle-line-init
|
||||
|
||||
# use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
|
||||
# zsh-autosuggestions is designed to be unobtrusive)
|
||||
bindkey '^T' autosuggest-toggle
|
||||
# use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
|
||||
# zsh-autosuggestions is designed to be unobtrusive)
|
||||
bindkey '^T' autosuggest-toggle
|
||||
EOF
|
||||
|
||||
echo "\nSetup completed successfully!\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue