diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
| commit | 49edbf438ed690c76e6b2af80368c59404cf0167 (patch) | |
| tree | 129b3adb2f5f39a1329a426a3b7d51ed2c2290c1 /plugins/rust | |
| parent | 1bc186dabe12b3d01b2257e82f3a104c48b8b3c7 (diff) | |
| parent | 78c91ccbf99c77bd4d9cdb74279a40776721f66d (diff) | |
| download | zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.gz zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.bz2 zsh-49edbf438ed690c76e6b2af80368c59404cf0167.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/rust')
| -rw-r--r-- | plugins/rust/README.md | 2 | ||||
| -rw-r--r-- | plugins/rust/_rustc (renamed from plugins/rust/_rust) | 0 | ||||
| -rw-r--r-- | plugins/rust/rust.plugin.zsh | 31 |
3 files changed, 32 insertions, 1 deletions
diff --git a/plugins/rust/README.md b/plugins/rust/README.md index 83d7d91ba..e05364474 100644 --- a/plugins/rust/README.md +++ b/plugins/rust/README.md @@ -1,6 +1,6 @@ # rust -This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language. +This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language, as well as for `rustup` and `cargo` if you have the Rust toolchain installed. To use it, add `rust` to the plugins array in your zshrc file: diff --git a/plugins/rust/_rust b/plugins/rust/_rustc index 6e3f344cd..6e3f344cd 100644 --- a/plugins/rust/_rust +++ b/plugins/rust/_rustc diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh new file mode 100644 index 000000000..014c73b3b --- /dev/null +++ b/plugins/rust/rust.plugin.zsh @@ -0,0 +1,31 @@ +if ! (( $+commands[rustup] && $+commands[cargo] )); then + return +fi + +# Add completions folder in $ZSH_CACHE_DIR +# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh +command mkdir -p "$ZSH_CACHE_DIR/completions" +(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath) + +# If the completion file doesn't exist yet, we need to autoload it and +# bind it to `cargo`. Otherwise, compinit will have already done that +if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then + autoload -Uz _cargo + declare -A _comps + _comps[cargo]=_cargo +fi + +# If the completion file doesn't exist yet, we need to autoload it and +# bind it to `rustup`. Otherwise, compinit will have already done that +if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then + autoload -Uz _rustup + declare -A _comps + _comps[rustup]=_rustup +fi + +# Generate completion files in the background +rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &| +cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF' +#compdef cargo +source $(rustc +${${(z)$(rustup default)}[1]} --print sysroot)/share/zsh/site-functions/_cargo +EOF |