Allows custom plugins to pop in completion with standalone projects

nkakouros · nkakouros · commit 1bf433a4d5b8 · 2019-02-16T14:27:54.000+01:00
diff --git a/lib/internal/complete b/lib/internal/complete
@@ -6,7 +6,8 @@ _@go.complete_top_level_commands() {
     _@go.source_builtin 'commands'
   else
     printf 'help\n'
-    _@go.source_builtin 'commands' "$_GO_SCRIPTS_DIR"
+    IFS=':' eval "plugin_paths='${_GO_PLUGINS_PATHS[*]}'"
+    _@go.source_builtin 'commands' "$_GO_SCRIPTS_DIR:$plugin_paths"
   fi
 }
 
diff --git a/tests/complete.bats b/tests/complete.bats
@@ -45,13 +45,13 @@ teardown() {
   assert_failure ''
 }
 
-@test "$SUITE: _GO_STANDALONE only completes 'help' and project scripts" {
+@test "$SUITE: _GO_STANDALONE only completes 'help' and custom scripts/plugins" {
   @go.create_test_command_script 'foo'
   @go.create_test_command_script 'bar'
   @go.create_test_command_script 'plugins/baz/bin/baz'
 
   _GO_STANDALONE='true' run "$TEST_GO_SCRIPT" complete 0
-  assert_success 'help' 'bar' 'foo'
+  assert_success 'help' 'bar' 'baz' 'foo'
 }
 
 @test "$SUITE: cd and pushd complete directories" {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ _@go.complete_top_level_commands() {`
`6`	`6`	`_@go.source_builtin 'commands'`
`7`	`7`	`else`
`8`	`8`	`printf 'help\n'`
`9`		`- _@go.source_builtin 'commands' "$_GO_SCRIPTS_DIR"`
	`9`	`+ IFS=':' eval "plugin_paths='${_GO_PLUGINS_PATHS[*]}'"`
	`10`	`+ _@go.source_builtin 'commands' "$_GO_SCRIPTS_DIR:$plugin_paths"`
`10`	`11`	`fi`
`11`	`12`	`}`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ teardown() {`
`45`	`45`	`assert_failure ''`
`46`	`46`	`}`
`47`	`47`
`48`		`-@test "$SUITE: _GO_STANDALONE only completes 'help' and project scripts" {`
	`48`	`+@test "$SUITE: _GO_STANDALONE only completes 'help' and custom scripts/plugins" {`
`49`	`49`	`@go.create_test_command_script 'foo'`
`50`	`50`	`@go.create_test_command_script 'bar'`
`51`	`51`	`@go.create_test_command_script 'plugins/baz/bin/baz'`
`52`	`52`
`53`	`53`	`_GO_STANDALONE='true' run "$TEST_GO_SCRIPT" complete 0`
`54`		`- assert_success 'help' 'bar' 'foo'`
	`54`	`+ assert_success 'help' 'bar' 'baz' 'foo'`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@test "$SUITE: cd and pushd complete directories" {`