@@ -19,11 +19,7 @@ var completePredictModuleSource = complete.PredictAnything
 type completePredictSequence []complete.Predictor
 
 func (s completePredictSequence) Predict(a complete.Args) []string {
-	// Only one level of command is stripped off the prefix of a.Completed
-	// here, so nested subcommands like "workspace new" will need to provide
-	// dummy entries (e.g. complete.PredictNothing) as placeholders for
-	// all but the first subcommand. For example, "workspace new" needs
-	// one placeholder for the argument "new".
+	// Nested subcommands do not require any placeholder entry for their subcommand name.
 	idx := len(a.Completed)
 	if idx >= len(s) {
 		return nil
 
@@ -190,7 +190,6 @@ func (c *WorkspaceDeleteCommand) Run(args []string) int {
 
 func (c *WorkspaceDeleteCommand) AutocompleteArgs() complete.Predictor {
 	return completePredictSequence{
-		complete.PredictNothing, // the "select" subcommand itself (already matched)
 		c.completePredictWorkspaceName(),
 		complete.PredictDirs(""),
 	}
 
@@ -167,7 +167,6 @@ func (c *WorkspaceNewCommand) Run(args []string) int {
 
 func (c *WorkspaceNewCommand) AutocompleteArgs() complete.Predictor {
 	return completePredictSequence{
-		complete.PredictNothing, // the "new" subcommand itself (already matched)
 		complete.PredictAnything,
 		complete.PredictDirs(""),
 	}
 
@@ -117,7 +117,6 @@ func (c *WorkspaceSelectCommand) Run(args []string) int {
 
 func (c *WorkspaceSelectCommand) AutocompleteArgs() complete.Predictor {
 	return completePredictSequence{
-		complete.PredictNothing, // the "select" subcommand itself (already matched)
 		c.completePredictWorkspaceName(),
 		complete.PredictDirs(""),
 	}
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,6 @@ func (c *WorkspaceDeleteCommand) Run(args []string) int {`
`190`	`190`
`191`	`191`	`func (c *WorkspaceDeleteCommand) AutocompleteArgs() complete.Predictor {`
`192`	`192`	`return completePredictSequence{`
`193`		`- complete.PredictNothing, // the "select" subcommand itself (already matched)`
`194`	`193`	`c.completePredictWorkspaceName(),`
`195`	`194`	`complete.PredictDirs(""),`
`196`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,6 @@ func (c *WorkspaceNewCommand) Run(args []string) int {`
`167`	`167`
`168`	`168`	`func (c *WorkspaceNewCommand) AutocompleteArgs() complete.Predictor {`
`169`	`169`	`return completePredictSequence{`
`170`		`- complete.PredictNothing, // the "new" subcommand itself (already matched)`
`171`	`170`	`complete.PredictAnything,`
`172`	`171`	`complete.PredictDirs(""),`
`173`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ func (c *WorkspaceSelectCommand) Run(args []string) int {`
`117`	`117`
`118`	`118`	`func (c *WorkspaceSelectCommand) AutocompleteArgs() complete.Predictor {`
`119`	`119`	`return completePredictSequence{`
`120`		`- complete.PredictNothing, // the "select" subcommand itself (already matched)`
`121`	`120`	`c.completePredictWorkspaceName(),`
`122`	`121`	`complete.PredictDirs(""),`
`123`	`122`	`}`