From 258e06c9ab37809bb72becdc5bc1685f4544da91 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Mon, 18 May 2015 14:50:14 +0200 Subject: [PATCH] Fix and unify formatting and code-style --- README.mkd | 2 +- autosuggestions.zsh | 52 +++++++++++++++++++------------------- completion-server-init.zsh | 2 +- completion-server.zsh | 2 +- install | 31 +++++++++++------------ 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/README.mkd b/README.mkd index 5e6bfa4..abcaae0 100644 --- a/README.mkd +++ b/README.mkd @@ -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 TAB + - `COMPLETION_WAITING_DOTS`: setting this to `true` is known to cause problems when attempting to autocomplete with TAB diff --git a/autosuggestions.zsh b/autosuggestions.zsh index a335193..ae40936 100644 --- a/autosuggestions.zsh +++ b/autosuggestions.zsh @@ -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 diff --git a/completion-server-init.zsh b/completion-server-init.zsh index 4dec24c..5e98dcf 100644 --- a/completion-server-init.zsh +++ b/completion-server-init.zsh @@ -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 diff --git a/completion-server.zsh b/completion-server.zsh index cd103f1..e8e2946 100755 --- a/completion-server.zsh +++ b/completion-server.zsh @@ -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 } diff --git a/install b/install index 5cf7d42..9169519 100755 --- a/install +++ b/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"