mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2024-11-18 09:51:06 +01:00
Merge pull request #57 from jirutka/patch-2
Fix and unify formatting and code-style
This commit is contained in:
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
|
|
@ -28,22 +28,22 @@ function {
|
||||||
}
|
}
|
||||||
|
|
||||||
ZLE_AUTOSUGGEST_SUSPEND_WIDGETS=(
|
ZLE_AUTOSUGGEST_SUSPEND_WIDGETS=(
|
||||||
vi-cmd-mode vi-backward-char backward-char backward-word beginning-of-line
|
vi-cmd-mode vi-backward-char backward-char backward-word beginning-of-line
|
||||||
history-search-forward history-search-backward up-line-or-history
|
history-search-forward history-search-backward up-line-or-history
|
||||||
history-beginning-search-forward history-beginning-search-backward
|
history-beginning-search-forward history-beginning-search-backward
|
||||||
down-line-or-history history-substring-search-up history-substring-search-down
|
down-line-or-history history-substring-search-up history-substring-search-down
|
||||||
backward-kill-word
|
backward-kill-word
|
||||||
)
|
)
|
||||||
|
|
||||||
ZLE_AUTOSUGGEST_COMPLETION_WIDGETS=(
|
ZLE_AUTOSUGGEST_COMPLETION_WIDGETS=(
|
||||||
complete-word expand-or-complete expand-or-complete-prefix list-choices
|
complete-word expand-or-complete expand-or-complete-prefix list-choices
|
||||||
menu-complete reverse-menu-complete menu-expand-or-complete menu-select
|
menu-complete reverse-menu-complete menu-expand-or-complete menu-select
|
||||||
accept-and-menu-complete
|
accept-and-menu-complete
|
||||||
)
|
)
|
||||||
|
|
||||||
ZLE_AUTOSUGGEST_ACCEPT_WIDGETS=(
|
ZLE_AUTOSUGGEST_ACCEPT_WIDGETS=(
|
||||||
vi-forward-char forward-char vi-forward-word forward-word vi-add-eol
|
vi-forward-char forward-char vi-forward-word forward-word vi-add-eol
|
||||||
vi-add-next vi-forward-blank-word end-of-line
|
vi-add-next vi-forward-blank-word end-of-line
|
||||||
)
|
)
|
||||||
|
|
||||||
autosuggest-pause() {
|
autosuggest-pause() {
|
||||||
|
@ -100,7 +100,7 @@ autosuggest-resume() {
|
||||||
|
|
||||||
autosuggest-start() {
|
autosuggest-start() {
|
||||||
if [[ -z $ZLE_DISABLE_AUTOSUGGEST && -n $functions[_zsh_highlight] ]]; then
|
if [[ -z $ZLE_DISABLE_AUTOSUGGEST && -n $functions[_zsh_highlight] ]]; then
|
||||||
if [[ ${ZSH_HIGHLIGHT_HIGHLIGHTERS[(i)autosuggest]} -gt ${#ZSH_HIGHLIGHT_HIGHLIGHTERS} ]];then
|
if [[ ${ZSH_HIGHLIGHT_HIGHLIGHTERS[(i)autosuggest]} -gt ${#ZSH_HIGHLIGHT_HIGHLIGHTERS} ]]; then
|
||||||
ZSH_HIGHLIGHT_HIGHLIGHTERS+=(autosuggest)
|
ZSH_HIGHLIGHT_HIGHLIGHTERS+=(autosuggest)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -48,7 +48,7 @@ zstyle -d ':completion:*' list-colors
|
||||||
zmodload zsh/zutil
|
zmodload zsh/zutil
|
||||||
|
|
||||||
# override compadd (this our hook)
|
# override compadd (this our hook)
|
||||||
compadd () {
|
compadd() {
|
||||||
|
|
||||||
# check if any of -O, -A or -D are given
|
# check if any of -O, -A or -D are given
|
||||||
if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
|
if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
|
||||||
|
|
23
install
23
install
|
@ -3,8 +3,7 @@
|
||||||
# Install script for zsh-autocomplete
|
# Install script for zsh-autocomplete
|
||||||
|
|
||||||
config="$HOME/.zshrc"
|
config="$HOME/.zshrc"
|
||||||
for config in "$HOME/.zshrc" "$ZDOTDIR/.zshrc" "$1"
|
for config in "$HOME/.zshrc" "$ZDOTDIR/.zshrc" "$1"; do
|
||||||
do
|
|
||||||
echo $config
|
echo $config
|
||||||
#first checks if ~/.zshrc file exists and is readable
|
#first checks if ~/.zshrc file exists and is readable
|
||||||
if [ -r "$config" ]; then
|
if [ -r "$config" ]; then
|
||||||
|
@ -24,21 +23,21 @@ done
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
|
|
||||||
# appends the string to $config (usually ~/.zshrc) file
|
# appends the string to $config (usually ~/.zshrc) file
|
||||||
cat >> "$config" << EOF
|
cat >> "$config" <<-EOF
|
||||||
|
|
||||||
# Setup zsh-autosuggestions
|
# Setup zsh-autosuggestions
|
||||||
source $DIR/autosuggestions.zsh
|
source $DIR/autosuggestions.zsh
|
||||||
|
|
||||||
# Enable autosuggestions automatically
|
# Enable autosuggestions automatically
|
||||||
zle-line-init() {
|
zle-line-init() {
|
||||||
zle autosuggest-start
|
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
|
# use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
|
||||||
# zsh-autosuggestions is designed to be unobtrusive)
|
# zsh-autosuggestions is designed to be unobtrusive)
|
||||||
bindkey '^T' autosuggest-toggle
|
bindkey '^T' autosuggest-toggle
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo "\nSetup completed successfully!\n"
|
echo "\nSetup completed successfully!\n"
|
||||||
|
|
Loading…
Reference in a new issue