1
0
Fork 0

formatting & cleanup

This commit is contained in:
Andrey Orst 2019-07-07 11:27:37 +03:00
parent 1de1082a45
commit 7fef4973e6
8 changed files with 51 additions and 67 deletions

View file

@ -139,16 +139,17 @@ fzf -params .. %{ evaluate-commands %sh{
while [ $# -gt 0 ]; do
case $1 in
-kak-cmd) shift; kakoune_cmd="$1" ;;
-multiple-cmd) shift; multiple_cmd="$1" ;;
-items-cmd) shift; items_cmd="$1 |" ;;
-fzf-impl) shift; fzf_impl="$1" ;;
-fzf-args) shift; fzf_args="$1" ;;
-preview-cmd) shift; preview_cmd="$1" ;;
-preview) preview="true" ;;
-filter) shift; filter="| $1" ;;
-post-action) shift; post_action="$1" ;;
esac; shift
(-kak-cmd) shift; kakoune_cmd="$1" ;;
(-multiple-cmd) shift; multiple_cmd="$1" ;;
(-items-cmd) shift; items_cmd="$1 |" ;;
(-fzf-impl) shift; fzf_impl="$1" ;;
(-fzf-args) shift; fzf_args="$1" ;;
(-preview-cmd) shift; preview_cmd="$1" ;;
(-preview) preview="true" ;;
(-filter) shift; filter="| $1" ;;
(-post-action) shift; post_action="$1" ;;
esac
shift
done
[ -z "$multiple_cmd" ] && multiple_cmd="$kakoune_cmd"
@ -157,11 +158,11 @@ fzf -params .. %{ evaluate-commands %sh{
# bake position option to define them at runtime
[ -n "${kak_client_env_TMUX}" ] && tmux_height="${kak_opt_fzf_preview_tmux_height}"
case ${kak_opt_fzf_preview_pos} in
(top|up) preview_position="pos=top:${kak_opt_fzf_preview_height};" ;;
(top|up) preview_position="pos=top:${kak_opt_fzf_preview_height};" ;;
(bottom|down) preview_position="pos=down:${kak_opt_fzf_preview_height};" ;;
(right) preview_position="pos=right:${kak_opt_fzf_preview_width};" ;;
(left) preview_position="pos=left:${kak_opt_fzf_preview_width};" ;;
(auto|*) preview_position="sleep 0.1; [ \$(tput cols) -gt \$(expr \$(tput lines) \* 2) ] && pos=right:${kak_opt_fzf_preview_width} || pos=top:${kak_opt_fzf_preview_height};"
(right) preview_position="pos=right:${kak_opt_fzf_preview_width};" ;;
(left) preview_position="pos=left:${kak_opt_fzf_preview_width};" ;;
(auto|*) preview_position="sleep 0.1; [ \$(tput cols) -gt \$(expr \$(tput lines) \* 2) ] && pos=right:${kak_opt_fzf_preview_width} || pos=top:${kak_opt_fzf_preview_height};"
esac
# handle preview if not defined explicitly with `-preview-cmd'

View file

@ -25,10 +25,8 @@ define-command -hidden fzf-bzr %{ evaluate-commands %sh{
current_path=$(pwd)
repo_root=$(bzr root)
case $kak_opt_fzf_bzr_command in
bzr)
cmd="bzr ls -R --versioned -0" ;;
bzr*)
cmd=$kak_opt_fzf_bzr_command ;;
(bzr) cmd="bzr ls -R --versioned -0" ;;
(bzr*) cmd=$kak_opt_fzf_bzr_command ;;
esac
[ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect $kak_opt_fzf_vertical_map --expect $kak_opt_fzf_horizontal_map"
printf "%s\n" "fzf -kak-cmd %{cd $repo_root; edit -existing} -items-cmd %{$cmd} -fzf-args %{-m --expect $kak_opt_fzf_window_map $additional_flags} -post-action %{cd $current_path}"

View file

@ -25,10 +25,8 @@ define-command -override -hidden fzf-git %{ evaluate-commands %sh{
current_path=$(pwd)
repo_root=$(git rev-parse --show-toplevel)
case $kak_opt_fzf_git_command in
git)
cmd="git ls-tree --full-tree --name-only -r HEAD" ;;
git*)
cmd=$kak_opt_fzf_git_command ;;
(git) cmd="git ls-tree --full-tree --name-only -r HEAD" ;;
(git*) cmd=$kak_opt_fzf_git_command ;;
esac
[ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect $kak_opt_fzf_vertical_map --expect $kak_opt_fzf_horizontal_map"
printf "%s\n" "fzf -kak-cmd %{cd $repo_root; edit -existing} -items-cmd %{$cmd} -fzf-args %{-m --expect $kak_opt_fzf_window_map $additional_flags} -post-action %{cd $current_path}"

View file

@ -25,10 +25,8 @@ define-command -hidden fzf-hg %{ evaluate-commands %sh{
current_path=$(pwd)
repo_root=$(hg root)
case $kak_opt_fzf_hg_command in
hg)
cmd="hg locate -f -0 -I .hg locate -f -0 -I ." ;;
hg*)
cmd=$kak_opt_fzf_hg_command ;;
(hg) cmd="hg locate -f -0 -I .hg locate -f -0 -I ." ;;
(hg*) cmd=$kak_opt_fzf_hg_command ;;
esac
[ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect $kak_opt_fzf_vertical_map --expect $kak_opt_fzf_horizontal_map"
printf "%s\n" "fzf -kak-cmd %{cd $repo_root; edit -existing} -items-cmd %{$cmd} -fzf-args %{-m --expect $kak_opt_fzf_window_map $additional_flags} -post-action %{cd $current_path}"

View file

@ -25,10 +25,8 @@ define-command -hidden fzf-svn %{ evaluate-commands %sh{
current_path=$(pwd)
repo_root=$(svn info | awk -F': ' '/Working Copy Root Path: .*/ {print $2}')
case $kak_opt_fzf_svn_command in
svn)
cmd="svn list -R $repo_root | grep -v '$/'" ;;
svn*)
cmd=$kak_opt_fzf_svn_command ;;
(svn) cmd="svn list -R $repo_root | grep -v '$/'" ;;
(svn*) cmd=$kak_opt_fzf_svn_command ;;
esac
[ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect $kak_opt_fzf_vertical_map --expect $kak_opt_fzf_horizontal_map"
printf "%s\n" "fzf -kak-cmd %{cd $repo_root; edit -existing} -items-cmd %{$cmd} -fzf-args %{-m --expect $kak_opt_fzf_window_map $additional_flags} -post-action %{cd $current_path}"

View file

@ -37,12 +37,9 @@ define-command -hidden fzf-cd %{ evaluate-commands %sh{
tmux_height=$kak_opt_fzf_tmux_height
printf '%s\n' "info -title %{fzf change directory} %{Change the server's working directory
current path: $(pwd)}"
case $kak_opt_fzf_cd_command in
find)
items_command="(echo .. && find . \( -path '*/.svn*' -o -path '*/.git*' \) -prune -o -type d -print)" ;;
*)
items_command=$kak_opt_fzf_cd_command ;;
(find) items_command="(echo .. && find . \( -path '*/.svn*' -o -path '*/.git*' \) -prune -o -type d -print)" ;;
(*) items_command=$kak_opt_fzf_cd_command ;;
esac
if [ "$kak_opt_fzf_cd_preview" = "true" ]; then
preview_flag="-preview"

View file

@ -34,20 +34,14 @@ define-command -hidden fzf-file %{ evaluate-commands %sh{
kak_opt_fzf_file_command="find"
fi
case $kak_opt_fzf_file_command in
find)
cmd="find -L . -type f" ;;
ag)
cmd="ag -l -f --hidden --one-device . " ;;
rg)
cmd="rg -L --hidden --files" ;;
fd)
cmd="fd --type f --follow" ;;
find*|ag*|rg*|fd*)
cmd=$kak_opt_fzf_file_command ;;
*)
items_executable=$(printf "%s\n" "$kak_opt_fzf_file_command" | grep -o -E "[[:alpha:]]+" | head -1)
printf "%s\n" "echo -markup '{Information}'Warning: '$executable'' is not supported by fzf.kak.'"
cmd=$kak_opt_fzf_file_command ;;
(find) cmd="find -L . -type f" ;;
(ag) cmd="ag -l -f --hidden --one-device . " ;;
(rg) cmd="rg -L --hidden --files" ;;
(fd) cmd="fd --type f --follow" ;;
(find*|ag*|rg*|fd*) cmd=$kak_opt_fzf_file_command ;;
(*) items_executable=$(printf "%s\n" "$kak_opt_fzf_file_command" | grep -o -E "[[:alpha:]]+" | head -1)
printf "%s\n" "echo -markup '{Information}'Warning: '$executable'' is not supported by fzf.kak.'"
cmd=$kak_opt_fzf_file_command ;;
esac
cmd="$cmd 2>/dev/null"

View file

@ -49,16 +49,16 @@ define-command -hidden fzf-save-path-as-project-no-prompt %{ evaluate-commands %
mkdir -p "${kak_opt_fzf_project_file%/*}"
# portable version of `basename'
base() {
filename=$1
filename="$1"
case "$filename" in
*/*[!/]*)
trail=${filename##*[!/]}
filename=${filename%%"$trail"}
base=${filename##*/} ;;
*[!/]*)
trail=${filename##*[!/]}
base=${filename%%"$trail"} ;;
*) base="/" ;;
(*/*[!/]*)
trail=${filename##*[!/]}
filename=${filename%%"$trail"}
base=${filename##*/} ;;
(*[!/]*)
trail=${filename##*[!/]}
base=${filename%%"$trail"} ;;
(*) base="/" ;;
esac
printf "%s\n" "${base}"
}
@ -84,16 +84,16 @@ fzf-add-project -file-completion -params 1..2 %{ evaluate-commands %sh{
fi
# portable version of `basename'
base() {
filename=$1
filename="$1"
case "$filename" in
*/*[!/]*)
trail=${filename##*[!/]}
filename=${filename%%"$trail"}
base=${filename##*/} ;;
*[!/]*)
trail=${filename##*[!/]}
base=${filename%%"$trail"} ;;
*) base="/" ;;
(*/*[!/]*)
trail=${filename##*[!/]}
filename=${filename%%"$trail"}
base=${filename##*/} ;;
(*[!/]*)
trail=${filename##*[!/]}
base=${filename%%"$trail"} ;;
(*) base="/" ;;
esac
printf "%s\n" "${base}"
}