summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/golang/golang.plugin.zsh9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 4e6ca0a99..1ce3cea58 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -55,8 +55,13 @@ __go_tool_complete() {
'-tags[list of build tags to consider satisfied]:tags'
)
__go_packages() {
- _path_files -W "$(go env GOROOT)/src" -/
- _path_files -W "$(go env GOPATH)/src" -/
+ local gopaths
+ declare -a gopaths
+ gopaths=("${(s/:/)$(go env GOPATH)}")
+ gopaths+=("$(go env GOROOT)")
+ for p in $gopaths; do
+ _path_files -W "$p/src" -/
+ done
}
__go_identifiers() {
compadd $(godoc -templates $ZSH/plugins/golang/templates ${words[-2]} 2> /dev/null)