diff options
| author | dana <dana@dana.is> | 2026-06-14 04:07:37 +0000 |
|---|---|---|
| committer | dana <dana@dana.is> | 2026-06-20 19:27:09 -0500 |
| commit | 74fa2341401ce9157df7d062b5811f92097a6bf1 (patch) | |
| tree | a283dae8c677991e3c7c332e43e8c8d124c0eb17 /Completion/Base | |
| parent | 54767: zformat: replace -qn by spec quoting indicator syntax (diff) | |
| download | zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar.gz zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar.bz2 zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar.lz zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar.xz zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.tar.zst zsh-74fa2341401ce9157df7d062b5811f92097a6bf1.zip | |
54768: completion: use `zformat -q` for formatting
Diffstat (limited to 'Completion/Base')
| -rw-r--r-- | Completion/Base/Core/_description | 2 | ||||
| -rw-r--r-- | Completion/Base/Core/_main_complete | 2 | ||||
| -rw-r--r-- | Completion/Base/Core/_message | 2 | ||||
| -rw-r--r-- | Completion/Base/Utility/_numbers | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Completion/Base/Core/_description b/Completion/Base/Core/_description index 368b41ee2..586b1590d 100644 --- a/Completion/Base/Core/_description +++ b/Completion/Base/Core/_description @@ -86,7 +86,7 @@ elif [[ -n "$format" ]]; then [[ -n $match[3] ]] && argv+=( o:$match[3] ) fi - zformat -F format "$format" "d:$1" "${(@)argv[2,-1]}" + zformat -Fq format "$format" "d:$1" "${(@)argv[2,-1]}" fi if [[ -n "$gname" ]]; then diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete index 408a66ee3..11b7972de 100644 --- a/Completion/Base/Core/_main_complete +++ b/Completion/Base/Core/_main_complete @@ -366,7 +366,7 @@ elif [[ nm -eq 0 && -z "$_comp_mesg" && esac _setup warnings - zformat -f mesg "$format" "d:$str" "D:${(F)${(@)_lastdescr:#}}" + zformat -fq mesg "$format" "d:$str" "D:${(F)${(@)_lastdescr:#}}" compadd -x "$mesg" fi diff --git a/Completion/Base/Core/_message b/Completion/Base/Core/_message index dbeed4a88..b80aa4237 100644 --- a/Completion/Base/Core/_message +++ b/Completion/Base/Core/_message @@ -39,7 +39,7 @@ else fi if [[ -n "$format$raw" ]]; then - [[ -z "$raw" ]] && zformat -F format "$format" "d:$1" "${(@)argv[2,-1]}" + [[ -z "$raw" ]] && zformat -Fq format "$format" "d:$1" "${(@)argv[2,-1]}" builtin compadd "$gopt[@]" -x "$format" _comp_mesg=yes fi diff --git a/Completion/Base/Utility/_numbers b/Completion/Base/Utility/_numbers index 257e267a8..1ddace15a 100644 --- a/Completion/Base/Utility/_numbers +++ b/Completion/Base/Utility/_numbers @@ -73,12 +73,13 @@ elif [[ -prefix $~pat || $PREFIX = $~partial ]]; then zstyle -s ":completion:${curcontext}:unit-suffixes" format suffixfmt || \ suffixfmt='%(d.%U.)%x%(d.%u.)%(r..|)' for ((i=0;i<$#;i++)); do - zformat -f suffix "$suffixfmt" "x:${${${argv[i+1]#:}%%:*}//\%/%%}" \ - "X:${${${argv[i+1]#:}#*:}//\%/%%}" "d:${#${argv[i+1]}[1]#:}" \ + zformat -fq suffix "$suffixfmt" "x:${${argv[i+1]#:}%%:*}" \ + "X:${${argv[i+1]#:}#*:}" "d:${#${argv[i+1]}[1]#:}" \ i:i r:$(( $# - i - 1)) suffixes+=$suffix done - [[ -n $suffixes ]] && formats+=( x:$suffixes ) + # don't quote %x so we can pass formatting through + [[ -n $suffixes ]] && formats+=( %%x:$suffixes ) _comp_mesg=yes _description -x $tag expl "$desc" $formats |