From 04a87368412a5e9e7343a1eae197e6bd747a4e12 Mon Sep 17 00:00:00 2001 From: skywind3000 Date: Wed, 7 Mar 2018 16:48:14 +0800 Subject: [PATCH] update predefined strategies --- src/strategies/predefined.zsh | 84 +++++++++++++++++------------------ zsh-autosuggestions.zsh | 84 +++++++++++++++++------------------ 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/strategies/predefined.zsh b/src/strategies/predefined.zsh index 03b4671..138f79c 100644 --- a/src/strategies/predefined.zsh +++ b/src/strategies/predefined.zsh @@ -16,55 +16,55 @@ _zsh_autosuggest_script_path="${0:A:h}" _zsh_autosuggest_data_home="${XDG_DATA_HOME:-$HOME/.local/share}/zsh_autosuggest" _zsh_autosuggest_predefined_generate() { - local pbase="$_zsh_autosuggest_data_home" + local pbase="$_zsh_autosuggest_data_home" local pname="$pbase/predefined" - local ptemp="$pbase/predefined.$[RANDOM]" + local ptemp="$pbase/predefined.$[RANDOM]" local suggests=() local pwd=$(pwd) - [ ! -d "$pbase" ] && mkdir -p "$pbase" 2> /dev/null - - # skip when ~/.zsh_autosuggest exists - [ -f "$pname" ] && return + [ ! -d "$pbase" ] && mkdir -p "$pbase" 2> /dev/null + + # skip when ~/.zsh_autosuggest exists + [ -f "$pname" ] && return - echo "autosuggestions is generating: $pname" + echo "autosuggestions is generating: $pname" - # copy builtin predefine database - local txt="${_zsh_autosuggest_script_path}/predefined.txt" + # copy builtin predefine database + local txt="${_zsh_autosuggest_script_path}/predefined.txt" - [ -f "$txt" ] && cat "$txt" > "$ptemp" + [ -f "$txt" ] && cat "$txt" > "$ptemp" - # enumerate commands in $PATH and add them to ~/.zsh_autosuggest + # enumerate commands in $PATH and add them to ~/.zsh_autosuggest for p ("${(@s/:/)PATH}"); do - [ ! -d "$p" ] && continue - cd "$p" - local files=("${(@f)$(ls -la | awk -F ' ' '{print $9}')}") - for fn in ${files}; do - if [ -x "$fn" ] && [[ "${fn:l}" != *.dll ]]; then - if [ -f "$fn" ] && [[ "${fn:l}" != *.nls ]]; then - # trim cygwin .exe/.cmd/.bat postfix - if [[ "$fn" == *.exe ]]; then - fn=${fn/%.exe/} - elif [[ "$fn" == *.cmd ]]; then - fn=${fn/%.cmd/} - elif [[ "$fn" == *.bat ]]; then - fn=${fn/%.bat/} - fi - if [[ ${#fn} -gt 1 ]]; then - suggests+=$fn - fi - fi - fi - done + [ ! -d "$p" ] && continue + cd "$p" + local files=("${(@f)$(ls -la | awk -F ' ' '{print $9}')}") + for fn in ${files}; do + if [ -x "$fn" ] && [[ "${fn:l}" != *.dll ]]; then + if [ -f "$fn" ] && [[ "${fn:l}" != *.nls ]]; then + # trim cygwin .exe/.cmd/.bat postfix + if [[ "$fn" == *.exe ]]; then + fn=${fn/%.exe/} + elif [[ "$fn" == *.cmd ]]; then + fn=${fn/%.cmd/} + elif [[ "$fn" == *.bat ]]; then + fn=${fn/%.bat/} + fi + if [[ ${#fn} -gt 1 ]]; then + suggests+=$fn + fi + fi + fi + done done cd "${pwd}" - # TODO: generate command parameters from completion database - - print -l $suggests >> "$ptemp" + # TODO: generate command parameters from completion database + + print -l $suggests >> "$ptemp" - # atomic change file name - mv -f "$ptemp" "$pname" + # atomic change file name + mv -f "$ptemp" "$pname" } @@ -73,16 +73,16 @@ _zsh_autosuggest_strategy_predefined() { setopt EXTENDED_GLOB local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}" - # search the history at first + # search the history at first local result="${history[(r)${prefix}*]}" - # search the predefine files if nothing found in history + # search the predefine files if nothing found in history if [[ -z "$result" ]]; then if (( ! ${+_ZSH_AUTOSUGGEST_PREDEFINE} )); then - # _zsh_autosuggest_predefined_generate + # _zsh_autosuggest_predefined_generate typeset -g _ZSH_AUTOSUGGEST_PREDEFINE=() - local pbase="$_zsh_autosuggest_data_home" - local pname="$pbase/predefined" + local pbase="$_zsh_autosuggest_data_home" + local pname="$pbase/predefined" local names="${ZSH_AUTOSUGGEST_PREDEFINE_PATH};$pname" local array=() for i ("${(s:;:)names}"); do @@ -102,6 +102,6 @@ _zsh_autosuggest_strategy_predefined() { _zsh_autosuggest_predefined_generate -# vim: set ts=4 sw=4 tw=0 noet : +# vim: set ts=4 sw=4 tw=0 et : diff --git a/zsh-autosuggestions.zsh b/zsh-autosuggestions.zsh index 020d386..c592eb4 100644 --- a/zsh-autosuggestions.zsh +++ b/zsh-autosuggestions.zsh @@ -582,55 +582,55 @@ _zsh_autosuggest_script_path="${0:A:h}" _zsh_autosuggest_data_home="${XDG_DATA_HOME:-$HOME/.local/share}/zsh_autosuggest" _zsh_autosuggest_predefined_generate() { - local pbase="$_zsh_autosuggest_data_home" + local pbase="$_zsh_autosuggest_data_home" local pname="$pbase/predefined" - local ptemp="$pbase/predefined.$[RANDOM]" + local ptemp="$pbase/predefined.$[RANDOM]" local suggests=() local pwd=$(pwd) - [ ! -d "$pbase" ] && mkdir -p "$pbase" 2> /dev/null - - # skip when ~/.zsh_autosuggest exists - [ -f "$pname" ] && return + [ ! -d "$pbase" ] && mkdir -p "$pbase" 2> /dev/null + + # skip when ~/.zsh_autosuggest exists + [ -f "$pname" ] && return - echo "autosuggestions is generating: $pname" + echo "autosuggestions is generating: $pname" - # copy builtin predefine database - local txt="${_zsh_autosuggest_script_path}/predefined.txt" + # copy builtin predefine database + local txt="${_zsh_autosuggest_script_path}/predefined.txt" - [ -f "$txt" ] && cat "$txt" > "$ptemp" + [ -f "$txt" ] && cat "$txt" > "$ptemp" - # enumerate commands in $PATH and add them to ~/.zsh_autosuggest + # enumerate commands in $PATH and add them to ~/.zsh_autosuggest for p ("${(@s/:/)PATH}"); do - [ ! -d "$p" ] && continue - cd "$p" - local files=("${(@f)$(ls -la | awk -F ' ' '{print $9}')}") - for fn in ${files}; do - if [ -x "$fn" ] && [[ "${fn:l}" != *.dll ]]; then - if [ -f "$fn" ] && [[ "${fn:l}" != *.nls ]]; then - # trim cygwin .exe/.cmd/.bat postfix - if [[ "$fn" == *.exe ]]; then - fn=${fn/%.exe/} - elif [[ "$fn" == *.cmd ]]; then - fn=${fn/%.cmd/} - elif [[ "$fn" == *.bat ]]; then - fn=${fn/%.bat/} - fi - if [[ ${#fn} -gt 1 ]]; then - suggests+=$fn - fi - fi - fi - done + [ ! -d "$p" ] && continue + cd "$p" + local files=("${(@f)$(ls -la | awk -F ' ' '{print $9}')}") + for fn in ${files}; do + if [ -x "$fn" ] && [[ "${fn:l}" != *.dll ]]; then + if [ -f "$fn" ] && [[ "${fn:l}" != *.nls ]]; then + # trim cygwin .exe/.cmd/.bat postfix + if [[ "$fn" == *.exe ]]; then + fn=${fn/%.exe/} + elif [[ "$fn" == *.cmd ]]; then + fn=${fn/%.cmd/} + elif [[ "$fn" == *.bat ]]; then + fn=${fn/%.bat/} + fi + if [[ ${#fn} -gt 1 ]]; then + suggests+=$fn + fi + fi + fi + done done cd "${pwd}" - # TODO: generate command parameters from completion database - - print -l $suggests >> "$ptemp" + # TODO: generate command parameters from completion database + + print -l $suggests >> "$ptemp" - # atomic change file name - mv -f "$ptemp" "$pname" + # atomic change file name + mv -f "$ptemp" "$pname" } @@ -639,16 +639,16 @@ _zsh_autosuggest_strategy_predefined() { setopt EXTENDED_GLOB local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}" - # search the history at first + # search the history at first local result="${history[(r)${prefix}*]}" - # search the predefine files if nothing found in history + # search the predefine files if nothing found in history if [[ -z "$result" ]]; then if (( ! ${+_ZSH_AUTOSUGGEST_PREDEFINE} )); then - # _zsh_autosuggest_predefined_generate + # _zsh_autosuggest_predefined_generate typeset -g _ZSH_AUTOSUGGEST_PREDEFINE=() - local pbase="$_zsh_autosuggest_data_home" - local pname="$pbase/predefined" + local pbase="$_zsh_autosuggest_data_home" + local pname="$pbase/predefined" local names="${ZSH_AUTOSUGGEST_PREDEFINE_PATH};$pname" local array=() for i ("${(s:;:)names}"); do @@ -668,7 +668,7 @@ _zsh_autosuggest_strategy_predefined() { _zsh_autosuggest_predefined_generate -# vim: set ts=4 sw=4 tw=0 noet : +# vim: set ts=4 sw=4 tw=0 et :