From e70bee54f31fbfd716b98fa43d69528c722f4318 Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Thu, 24 May 2018 20:37:16 -0500 Subject: [PATCH] [completion] Update init.zsh and README.md and use local string variable instead of "hardcoding" the string inside `${}`. --- modules/completion/README.md | 2 +- modules/completion/init.zsh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/completion/README.md b/modules/completion/README.md index d8cb6cf..8cd2581 100644 --- a/modules/completion/README.md +++ b/modules/completion/README.md @@ -1,4 +1,4 @@ -Completion +completion ========== Enables and configures smart and extensive tab completion. diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh index 5e0d05a..12b2023 100644 --- a/modules/completion/init.zsh +++ b/modules/completion/init.zsh @@ -59,11 +59,11 @@ zstyle ':completion:*' verbose yes zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' '+r:|?=**' # directories -if (( ${+LS_COLORS} )); then - zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -else - zstyle ':completion:*:default' list-colors ${(s.:.)di=1;34:ln=35:so=32:pi=33:ex=31:bd=1;36:cd=1;33:su=30;41:sg=30;46:tw=30;42:ow=30;43} +if (( ! ${+LS_COLORS} )); then + # Locally use same LS_COLORS definition from utility module, in case it was not set + local LS_COLORS='di=1;34:ln=35:so=32:pi=33:ex=31:bd=1;36:cd=1;33:su=30;41:sg=30;46:tw=30;42:ow=30;43' fi +zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories zstyle ':completion:*:*:cd:*:directory-stack' menu yes select zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'expand'