-
Notifications
You must be signed in to change notification settings - Fork 130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: optimize and re-format usage message #534
base: main
Are you sure you want to change the base?
Conversation
1e022e3
to
68adee8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤔
Should it be Zinit or zinit?
Is it Zsh, zsh, or ZSH?
979635e
to
4aaa113
Compare
abd968b
to
06c16cd
Compare
5c2c63f
to
0e691c0
Compare
Makefile
Outdated
# Run ctags to generate Emacs and Vim's format tag file. | ||
tags: tags/emacs tags/vim | ||
|
||
tags/emacs: ## Build Emacs-style ctags file | ||
@if type ctags >/dev/null 2>&1; then \ | ||
if ctags --version | grep >/dev/null 2>&1 "Universal Ctags"; then \ | ||
ctags -e -R --options=share/zsh.ctags --languages=zsh \ | ||
--pattern-length-limit=250 --maxdepth=1; \ | ||
else \ | ||
ctags -e -R --languages=sh --langmap=sh:.zsh; \ | ||
fi; \ | ||
printf "Created the Emacs \`TAGS\` file.\\n"; \ | ||
else \ | ||
printf 'Error: Please install a Ctags (e.g.: either the Exuberant or Universal %b' \ | ||
'version) utility first.\n'; \ | ||
fi | ||
|
||
tags/vim: ## Build the Vim-style ctags file | ||
@if type ctags >/dev/null 2>&1; then \ | ||
if ctags --version | grep >/dev/null 2>&1 "Universal Ctags"; then \ | ||
ctags --languages=zsh --maxdepth=1 --options=share/zsh.ctags --pattern-length-limit=250 -R; \ | ||
else \ | ||
ctags -R --languages=sh --langmap=sh:.zsh; \ | ||
fi; \ | ||
printf "Created the Vim's style \`tags\` file.\\n"; \ | ||
else \ | ||
printf 'Error: Please install a ctags first.\n'; \ | ||
fi | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems unrelated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- lists available ices via `zi ice [-h/-help]` - remove verbiage in `zi help` to improve readability - fix broken formatting of `times` in `zi help` - sort commands alphabetically in `zi help` message Signed-off-by: Doster, Vladislav <[email protected]>
8f96443
to
d0d5a81
Compare
@test 'completions-ignored' { | ||
# only the _valid file should be installed as a completion | ||
run zinit as"null" id-as"test/ignored_completions" atclone"touch __init__.py _valid" completions for zdharma-continuum/null | ||
assert $state equals 0 | ||
assert "$ZPLUGINS/test---ignored_completions/_valid" is_file | ||
assert "$ZPLUGINS/test---ignored_completions/__init__.py" is_file | ||
assert "$ZINIT[COMPLETIONS_DIR]/_valid" is_file | ||
COMPS=( "$ZINIT[COMPLETIONS_DIR]"/_* ) | ||
assert __init__.py is_not_value_in $COMPS | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vladdoster please re-add that :)
This is from #528
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you rebase on an old version of main perhaps?
completions=( "${plugin}"/**/_[^_.]*~*(*.zwc|*.html|*.txt|*.png|*.jpg|*.jpeg|*.js|*.md|*.yml|*.yaml|*.py|*.ri|_zsh_highlight*|/zsdoc/*|*.ps1)(DN^/) ) || \ | ||
completions=( "${ZINIT[PLUGINS_DIR]}/${id_as//\//---}"/**/_[^_.]*~*(*.zwc|*.html|*.txt|*.png|*.jpg|*.jpeg|*.js|*.md|*.yml|*.yaml|*.py|*.ri|_zsh_highlight*|/zsdoc/*|*.ps1)(DN^/) ) | ||
completions=( "${plugin}"/**/_[^_.]*~*(*.zwc|*.html|*.txt|*.png|*.jpg|*.jpeg|*.js|*.md|*.yml|*.ri|_zsh_highlight*|/zsdoc/*|*.ps1)(DN^/) ) || \ | ||
completions=( "${ZINIT[PLUGINS_DIR]}/${id_as//\//---}"/**/_[^_.]*~*(*.zwc|*.html|*.txt|*.png|*.jpg|*.jpeg|*.js|*.md|*.yml|*.ri|_zsh_highlight*|/zsdoc/*|*.ps1)(DN^/) ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SAme here. This is from PR #528
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rebase.
Description
zinit --help
ice
command usage.-h|--help|help
first instead of last--help
toice
commandzinit
usage messagelist
,clist
,ls
)Related Issue(s)
N/A
Motivation and Context
Usage examples
before
after
How Has This Been Tested?
Types of changes
Checklist: