Merge 3524cc20f0 into 6e564503f1

Remove redundant quotes from comparisons and
variable expansions where they are not needed.

Also add style nits to comments and code.

init.zsh

@@ -17,6 +17,20 @@ if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
 fi
 unset min_zsh_version
 
+# Change the resolution of the SECONDS variable to be more useful for debugging.
+typeset -F SECONDS
+
+# logging convenience, mostly meant for debugging performance issues.
+function pdebuglog {
+  if ! zstyle -t ":prezto" debug; then
+    return
+  fi
+
+  local format="$1"
+  shift
+  printf "[%f] $format\n" $SECONDS "$@"
+}
+
 # zprezto convenience updater
 # The function is surrounded by ( ) instead of { } so it starts in a subshell
 # and won't affect the environment of the calling shell
@@ -94,7 +108,9 @@ function pmodload {
 
   # Load Prezto modules.
   for pmodule in "$pmodules[@]"; do
+    pdebuglog "Started loading %q" $pmodule
     if zstyle -t ":prezto:module:$pmodule" loaded 'yes' 'no'; then
+      pdebuglog "Module %q already loaded" $pmodule
       continue
     else
       locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)})
@@ -134,6 +150,7 @@ function pmodload {
 
       if (( $? == 0 )); then
         zstyle ":prezto:module:$pmodule" loaded 'yes'
+        pdebuglog "Module %q loaded" $pmodule
       else
         # Remove the $fpath entry.
         fpath[(r)${pmodule_location}/functions]=()
@@ -151,6 +168,7 @@ function pmodload {
           done
         }
 
+        pdebuglog "Module %q failed to load" $pmodule
         zstyle ":prezto:module:$pmodule" loaded 'no'
       fi
     fi
@@ -173,7 +191,7 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
 fi
 
 # Disable color and theme in dumb terminals.
-if [[ "$TERM" == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   zstyle ':prezto:*:*' color 'no'
   zstyle ':prezto:module:prompt' theme 'off'
 fi

modules/autosuggestions/external

@@ -1 +1 @@
-Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
+Subproject commit e52ee8ca55bcc56a17c828767a3f98f22a68d4eb

modules/completion/external

@@ -1 +1 @@
-Subproject commit 978e79e12c44b5b1d3e1e2920c537002087b82c2
+Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96

modules/completion/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ $TERM == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   return 1
 fi
 

modules/environment/init.zsh

@@ -14,7 +14,7 @@
 # paste had a regression. Additionally, 5.2 added bracketed-paste-url-magic
 # which is generally better than url-quote-magic so we load that when possible.
 autoload -Uz is-at-least
-if [[ ${ZSH_VERSION} != 5.1.1 && ${TERM} != "dumb" ]]; then
+if [[ $ZSH_VERSION != 5.1.1 && $TERM != dumb ]]; then
   if is-at-least 5.2; then
     autoload -Uz bracketed-paste-url-magic
     zle -N bracketed-paste bracketed-paste-url-magic
@@ -34,7 +34,8 @@ setopt COMBINING_CHARS      # Combine zero-length punctuation characters (accent
                             # with the base character.
 setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.
 setopt RC_QUOTES            # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
-unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has been accessed.
+unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has
+                            # been accessed.
 
 # Allow mapping Ctrl+S and Ctrl+Q shortcuts
 [[ -r ${TTY:-} && -w ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY
@@ -43,23 +44,23 @@ unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has b
 # Jobs
 #
 
-setopt LONG_LIST_JOBS     # List jobs in the long format by default.
-setopt AUTO_RESUME        # Attempt to resume existing job before creating a new process.
-setopt NOTIFY             # Report status of background jobs immediately.
-unsetopt BG_NICE          # Don't run all background jobs at a lower priority.
-unsetopt HUP              # Don't kill jobs on shell exit.
-unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
+setopt LONG_LIST_JOBS       # List jobs in the long format by default.
+setopt AUTO_RESUME          # Attempt to resume existing job before creating a new process.
+setopt NOTIFY               # Report status of background jobs immediately.
+unsetopt BG_NICE            # Don't run all background jobs at a lower priority.
+unsetopt HUP                # Don't kill jobs on shell exit.
+unsetopt CHECK_JOBS         # Don't report on jobs when shell exit.
 
 #
 # Termcap
 #
 
 if zstyle -t ':prezto:environment:termcap' color; then
-  export LESS_TERMCAP_mb=$'\E[01;31m'      # Begins blinking.
-  export LESS_TERMCAP_md=$'\E[01;31m'      # Begins bold.
-  export LESS_TERMCAP_me=$'\E[0m'          # Ends mode.
-  export LESS_TERMCAP_se=$'\E[0m'          # Ends standout-mode.
-  export LESS_TERMCAP_so=$'\E[00;47;30m'   # Begins standout-mode.
-  export LESS_TERMCAP_ue=$'\E[0m'          # Ends underline.
-  export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
+  export LESS_TERMCAP_mb=$'\E[01;31m'       # Begins blinking.
+  export LESS_TERMCAP_md=$'\E[01;31m'       # Begins bold.
+  export LESS_TERMCAP_me=$'\E[0m'           # Ends mode.
+  export LESS_TERMCAP_se=$'\E[0m'           # Ends standout-mode.
+  export LESS_TERMCAP_so=$'\E[00;47;30m'    # Begins standout-mode.
+  export LESS_TERMCAP_ue=$'\E[0m'           # Ends underline.
+  export LESS_TERMCAP_us=$'\E[01;32m'       # Begins underline.
 fi

modules/history-substring-search/external

@@ -1 +1 @@
-Subproject commit 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
+Subproject commit 87ce96b1862928d84b1afe7c173316614b30e301

modules/spectrum/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ "$TERM" == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   return 1
 fi
 

modules/terminal/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ "$TERM" == (dumb|linux|*bsd*|eterm*) ]]; then
+if [[ $TERM == (dumb|linux|*bsd*|eterm*) ]]; then
   return 1
 fi
 
@@ -60,7 +60,7 @@ function _terminal-set-titles-with-command {
     local truncated_cmd="${cmd/(#m)?(#c15,)/${MATCH[1,12]}...}"
     unset MATCH
 
-    if [[ "$TERM" == screen* ]]; then
+    if [[ $TERM == screen* ]]; then
       set-multiplexer-title "$truncated_cmd"
     fi
     set-tab-title "$truncated_cmd"
@@ -78,7 +78,7 @@ function _terminal-set-titles-with-path {
   local truncated_path="${abbreviated_path/(#m)?(#c15,)/...${MATCH[-12,-1]}}"
   unset MATCH
 
-  if [[ "$TERM" == screen* ]]; then
+  if [[ $TERM == screen* ]]; then
     set-multiplexer-title "$truncated_path"
   fi
   set-tab-title "$truncated_path"
@@ -89,7 +89,7 @@ function _terminal-set-titles-with-path {
 autoload -Uz add-zsh-hook
 
 # Set up the Apple Terminal.
-if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] \
+if [[ $TERM_PROGRAM == Apple_Terminal ]] \
   && ( ! [[ -n "$STY" || -n "$TMUX" || -n "$DVTM" ]] )
 then
   # Sets the Terminal.app current working directory before the prompt is

modules/tmux/init.zsh

@@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
   _tmux_iterm_integration='-CC'
 fi
 
-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_RESOLVING_ENVIRONMENT" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then

runcoms/zlogout

@@ -14,6 +14,6 @@ SAYINGS=(
 )
 
 # Print a randomly-chosen message:
-echo $SAYINGS[$(($RANDOM % ${#SAYINGS} + 1))]
+echo $SAYINGS[$(($RANDOM % $#SAYINGS + 1))]
 
 } >&2