8000 feature(completion): `ng completion` made more robust by catull · Pull Request #2286 · angular/angular-cli · GitHub
[go: up one dir, main page]
Skip to content

feature(completion): ng completion made more robust #2286

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

feature(completion): ng completion made more robust #2286

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0562df9
Made the shell detection depending on `type` builtin function. The sc…
catull Sep 21, 2016
b59a80f
Report an error in case neither complete nor compctl are identified a…
catull Oct 2, 2016
9666104
Reworded error on modified builtin command.
catull Oct 3, 2016
6eb4b26
Merge branch 'master' into issue-2284-ng-completion-more-robust
catull Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/angular-cli/utilities/completion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set_opts='--global -g'
test_opts='--browsers --colors --config-file --environment --filter --host --launch --log-level --module --path --port --query --reporter --server --silent --test-page --test-port --watch -H -c -cf -e -f -m -r -s -tp -w'
version_opts='--verbose'

if type complete &>/dev/null; then
if test ".$(type -t complete 2>/dev/null || true)" = ".builtin"; then
_ng_completion() {
local cword pword opts

Expand Down Expand Up @@ -46,7 +46,7 @@ if type complete &>/dev/null; then
}

complete -o default -F _ng_completion ng
elif type compctl &>/dev/null; then
elif test ".$(type -w compctl 2>/dev/null || true)" = ".compctl: builtin" ; then
_ng_completion () {
local words cword opts
read -Ac words
Expand All @@ -73,6 +73,9 @@ elif type compctl &>/dev/null; then
}

compctl -K _ng_completion ng
else
echo "Sorry mate, can't find working builtin shell command complete / compctl.'"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can you remove the mate bit and just leave Sorry,?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reworded the error.

return 1
fi

###-end-ng-completion###
0