diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Base/Utility/_store_cache | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4191a9198..47c3c8d1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ Back out 34485, an alternate solution needs to be worked out. (Tweaked to keep the unrelated hunk of the E01 test.) + * 34476: Completion/Base/Utility/_store_cache: change the + assignment format to avoid potentially expensive lexical + analysis of the array values + 2015-02-11 Peter Stephenson <p.stephenson@samsung.com> * users/19850: Doc/Zsh/params.yo, Src/watch.c: watch variable diff --git a/Completion/Base/Utility/_store_cache b/Completion/Base/Utility/_store_cache index 86e72e9a9..8feaee6f7 100644 --- a/Completion/Base/Utility/_store_cache +++ b/Completion/Base/Utility/_store_cache @@ -46,8 +46,15 @@ if zstyle -t ":completion:${curcontext}:" use-cache; then for var; do case ${(Pt)var} in (*readonly*) ;; - (*(association|array)*) print -r "$var=( ${(kv@Pqq)^^var} )";; - (*) print -r "$var=${(Pqq)^^var}";; + (*(association|array)*) + # Dump the array as a here-document to reduce parsing overhead + # when reloading the cache with "source" from _retrieve_cache + print -r "$var=( "'"${(zQ)$(<<\EO:'"$var" + print -r "${(kv@Pqq)^^var}" + print -r "EO:$var" + print -r ')}" )' + ;; + (*) print -r "$var=${(Pqq)^^var}";; esac done >! "$_cache_dir/$_cache_ident" else |