zsh-workers
 help / color / Atom feed
* PATCH: compinit: add -w to explain why compdump runs
@ 2020-07-28 16:12 Mikael Magnusson
  0 siblings, 0 replies; only message in thread
From: Mikael Magnusson @ 2020-07-28 16:12 UTC (permalink / raw)
  To: zsh-workers

Sometimes people have trouble with compinit taking a long time, and
having them add -w would be a lot faster than doing a bunch of manual
checks to see if compdump runs again.

---
 Completion/compinit | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/Completion/compinit b/Completion/compinit
index f0f8421df8..6166d8ae26 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -71,9 +71,9 @@ emulate -L zsh
 setopt extendedglob
 
 typeset _i_dumpfile _i_files _i_line _i_done _i_dir _i_autodump=1
-typeset _i_tag _i_file _i_addfiles _i_fail=ask _i_check=yes _i_name
+typeset _i_tag _i_file _i_addfiles _i_fail=ask _i_check=yes _i_name _i_why
 
-while [[ $# -gt 0 && $1 = -[dDiuC] ]]; do
+while [[ $# -gt 0 && $1 = -[dDiuCw] ]]; do
   case "$1" in
   -d)
     _i_autodump=1
@@ -99,6 +99,10 @@ while [[ $# -gt 0 && $1 = -[dDiuC] ]]; do
     _i_check=
     shift
     ;;
+  -w)
+    _i_why=1
+    shift
+    ;;
   esac
 done
 
@@ -484,11 +488,28 @@ if [[ -f "$_comp_dumpfile" ]]; then
     then
       builtin . "$_comp_dumpfile"
       _i_done=yes
+    elif [[ _i_why -eq 1 ]]; then
+      print -nu2 "Loading dump file skipped, regenerating"
+      local pre=" because: "
+      if [[ _i_autodump -ne 1 ]]; then
+        print -nu2 $pre"-D flag given"
+        pre=", "
+      fi
+      if [[ $_i_line[2] -ne $#_i_files ]]; then
+        print -nu2 $pre"number of files in dump $_i_line[2] differ from files found in \$fpath $#_i_files"
+        pre=", "
+      fi
+      if [[ $ZSH_VERSION != $_i_line[4] ]]; then
+        print -nu2 $pre"zsh version changed from $_i_line[4] to $ZSH_VERSION"
+      fi
+      print -u2
     fi
   else
     builtin . "$_comp_dumpfile"
     _i_done=yes
   fi
+elif [[ _i_why -eq 1 ]]; then
+  print -u2 "No existing compdump file found, regenerating"
 fi
 if [[ -z "$_i_done" ]]; then
   typeset -A _i_test
-- 
2.15.1


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 16:12 PATCH: compinit: add -w to explain why compdump runs Mikael Magnusson

zsh-workers

Archives are clonable: git clone --mirror http://inbox.vuxu.org/zsh-workers

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.zsh.workers


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git