Merge pull request #5756 from Benehiko/completion-descriptions

Benehiko · web-flow · commit 1f3615e756c8 · 2025-01-20T12:00:12.000+01:00
cmd/docker: enable cobra completion descriptions
diff --git a/cli-plugins/plugin/plugin.go b/cli-plugins/plugin/plugin.go
@@ -158,7 +158,7 @@ func newPluginCommand(dockerCli *command.DockerCli, plugin *cobra.Command, meta
 		CompletionOptions: cobra.CompletionOptions{
 			DisableDefaultCmd:   false,
 			HiddenDefaultCmd:    true,
-			DisableDescriptions: true,
+			DisableDescriptions: os.Getenv("DOCKER_CLI_DISABLE_COMPLETION_DESCRIPTION") != "",
 		},
 	}
 	opts, _ := cli.SetupPluginRootCommand(cmd)
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -92,7 +92,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cli.TopLevelCommand {
 		CompletionOptions: cobra.CompletionOptions{
 			DisableDefaultCmd:   false,
 			HiddenDefaultCmd:    true,
-			DisableDescriptions: true,
+			DisableDescriptions: os.Getenv("DOCKER_CLI_DISABLE_COMPLETION_DESCRIPTION") != "",
 		},
 	}
 	cmd.SetIn(dockerCli.In())

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func newPluginCommand(dockerCli command.DockerCli, plugin cobra.Command, meta`
`158`	`158`	`CompletionOptions: cobra.CompletionOptions{`
`159`	`159`	`DisableDefaultCmd: false,`
`160`	`160`	`HiddenDefaultCmd: true,`
`161`		`- DisableDescriptions: true,`
	`161`	`+ DisableDescriptions: os.Getenv("DOCKER_CLI_DISABLE_COMPLETION_DESCRIPTION") != "",`
`162`	`162`	`},`
`163`	`163`	`}`
`164`	`164`	`opts, _ := cli.SetupPluginRootCommand(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func newDockerCommand(dockerCli command.DockerCli) cli.TopLevelCommand {`
`92`	`92`	`CompletionOptions: cobra.CompletionOptions{`
`93`	`93`	`DisableDefaultCmd: false,`
`94`	`94`	`HiddenDefaultCmd: true,`
`95`		`- DisableDescriptions: true,`
	`95`	`+ DisableDescriptions: os.Getenv("DOCKER_CLI_DISABLE_COMPLETION_DESCRIPTION") != "",`
`96`	`96`	`},`
`97`	`97`	`}`
`98`	`98`	`cmd.SetIn(dockerCli.In())`