Skip to content

Enh: multiple completion and bug fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

Enh: multiple completion and bug fix #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7a9b8e
fix: ignore . and ..
wxiwnd Feb 12, 2025
3a07384
fix: patch _comp_compgen_filedir_xspec() for non-builtin cmd
wxiwnd Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions scripts/bash_pinyin_completion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,20 @@ if ! declare -F _comp_compgen_filedir &>/dev/null; then
fi

eval "function __bak_comp_compgen_filedir() { $(declare -f _comp_compgen_filedir | tail -n +2) }"
eval "function __bak_comp_compgen_filedir_xspec() { $(declare -f _comp_compgen_filedir_xspec | tail -n +2) }"

# replace _comp_compgen_filedir
_comp_compgen_filedir() {
__bak_comp_compgen_filedir "$@"
_pinyin_completion "$@"
}

_comp_compgen_filedir_xspec() {
__bak_comp_compgen_filedir_xspec "$@"
_pinyin_completion "$@"
}

_pinyin_completion() {
local cur="${COMP_WORDS[COMP_CWORD]}"

# ignore empty
Expand Down Expand Up @@ -46,15 +55,19 @@ _comp_compgen_filedir() {
if [[ "${compgen_opts[0]}" == -d ]]; then
mapfile -t pinyin_matched < <(
compgen -d -- |
grep -v '^\.\{1,2\}$' | # Exclude . and ..
bash-pinyin-completion-rs "$basepart" 2>/dev/null
)
else
mapfile -t pinyin_matched < <(
compgen -f -- | while IFS= read -r line; do
if [ -d "$line" ]; then
printf "%s/\n" "${line%%/}"
else
printf "%s\n" "$line"
compgen -f -- |
while IFS= read -r line; do
if [[ "$line" != "." && "$line" != ".." ]]; then # Exclude . and ..
if [ -d "$line" ]; then
printf "%s/\n" "${line%%/}"
else
printf "%s\n" "$line"
fi
fi
done | bash-pinyin-completion-rs "$basepart" 2>/dev/null
)
Expand All @@ -71,11 +84,7 @@ _comp_compgen_filedir() {
# merge result
local -a old_candidates=("${COMPREPLY[@]}")
COMPREPLY=("${old_candidates[@]}" "${pinyin_matched[@]}")

# remove dup
IFS=$'\n' read -r -d '' -a COMPREPLY < <(
printf '%s\n' "${COMPREPLY[@]}" | awk '!seen[$0]++' | sort
)
COMPREPLY=($(printf "%s\n" "${COMPREPLY[@]}" | awk '!seen[$0]++'))

# fix space postfix
if ((${#COMPREPLY[@]} == 1)) && [[ ${COMPREPLY[0]} != */ ]]; then
Expand Down