Merge pull request #2269 from rsteube/diff-empty-arg

carapace: diff - use macro format without argument
carapace-sh · Feb 24, 2024 · 77ee113 · 77ee113
2 parents 4cb09a5 + b389370
commit 77ee113
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/carapace/cmd/diff.go b/cmd/carapace/cmd/diff.go
@@ -70,10 +70,10 @@ var diffCmd = &cobra.Command{
 			_bridge = "zsh"
 
 		}
-		joined := shlex.Join(args[1:])
+		joined := shlex.Join(args)
 		fmt.Printf("diff --git a/%v b/carapace\n", _bridge)
-		fmt.Printf("--- a/%v/carapace --macro '%v([%v])' %v\n", _bridge, macro, command, joined) // TODO macro by _bridge
-		fmt.Printf("+++ b/carapace/carapace %v export %v %v\n", command, command, joined)
+		fmt.Printf("--- a/%v/carapace --macro %v %v\n", _bridge, macro, joined) // TODO macro by _bridge
+		fmt.Printf("+++ b/carapace/carapace %v export %v\n", command, joined)
 		for _, v := range export.Values {
 			s := v.Value
 			if v.Description != "" {

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/pelletier/go-toml v1.9.5
 	github.com/rsteube/carapace v0.50.1
-	github.com/rsteube/carapace-bridge v0.2.14
+	github.com/rsteube/carapace-bridge v0.2.15
 	github.com/rsteube/carapace-shlex v0.1.2
 	github.com/rsteube/carapace-spec v0.15.0
 	github.com/spf13/cobra v1.8.0

diff --git a/go.sum b/go.sum
@@ -18,8 +18,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rsteube/carapace v0.50.1 h1:UShTOwM08wSvFuniKtqZvmBQ3pSDuoS6QrCu2w7TLU4=
 github.com/rsteube/carapace v0.50.1/go.mod h1:syVOvI8e2rEEK/9aMZxfWuHvcnQK/EcnTV4roClEnLE=
-github.com/rsteube/carapace-bridge v0.2.14 h1:yl4/7PRdNdXUK2wt/jyi9J24GoLdwjTnH4GYkNxPgj4=
-github.com/rsteube/carapace-bridge v0.2.14/go.mod h1:CrqtRDd1D8uT9woDXnEuer7tq8IfvR9MFAr3PuFKV7E=
+github.com/rsteube/carapace-bridge v0.2.15 h1:B90M1g28iXOfuER89P2zhwRKEafV7uxyF3BepvWoubA=
+github.com/rsteube/carapace-bridge v0.2.15/go.mod h1:CrqtRDd1D8uT9woDXnEuer7tq8IfvR9MFAr3PuFKV7E=
 github.com/rsteube/carapace-pflag v0.2.0 h1:EYqFO9Haib3NDCPqKu0VxOGi9YQBkXk1IzlHdT0M0vw=
 github.com/rsteube/carapace-pflag v0.2.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/rsteube/carapace-shlex v0.1.2 h1:ZKjhIfXoCkEnzensMglTaLbkNOaLkmM8SCRshpJKx6s=