Merge pull request #487 from rsteube/git-show-complete-tree

git: complete tree in show

Author: rsteube

completers/git_completer/cmd/remote_add.go

@@ -28,10 +28,18 @@ func init() {
 	carapace.Gen(remote_addCmd).FlagCompletion(carapace.ActionMap{
 		"mirror": carapace.ActionValues("push", "fetch"),
 		"master": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return git.ActionLsRemoteRefs(c.Args[1], git.LsRemoteRefOption{Branches: true})
+			if len(c.Args) > 1 {
+				return git.ActionLsRemoteRefs(c.Args[1], git.LsRemoteRefOption{Branches: true})
+			} else {
+				return carapace.ActionValues()
+			}
 		}),
 		"track": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return git.ActionLsRemoteRefs(c.Args[1], git.LsRemoteRefOption{Branches: true})
+			if len(c.Args) > 1 {
+				return git.ActionLsRemoteRefs(c.Args[1], git.LsRemoteRefOption{Branches: true})
+			} else {
+				return carapace.ActionValues()
+			}
 		}),
 	})
 

completers/git_completer/cmd/show.go

@@ -37,8 +37,15 @@ func init() {
 	})
 
 	carapace.Gen(showCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return git.ActionRefs(git.RefOptionDefault).Invoke(c).Filter(c.Args).ToA()
+		carapace.ActionMultiParts(":", func(c carapace.Context) carapace.Action {
+			switch len(c.Parts) {
+			case 0:
+				return git.ActionRefs(git.RefOptionDefault)
+			case 1:
+				return git.ActionRefFiles(c.Parts[0])
+			default:
+				return carapace.ActionFiles()
+			}
 		}),
 	)
 }

pkg/actions/git/ls.go

@@ -0,0 +1,64 @@
+package git
+
+import (
+	"path/filepath"
+	"strings"
+
+	"github.com/rsteube/carapace"
+)
+
+type LsRemoteRefOption struct {
+	Branches bool
+	Tags     bool
+}
+
+// ActionLsRemoteRefs lists branches and tags for a remote url
+//   gh-pages (da4528d0a57ad71417336f0e96fa65ece2fad45a)
+//   master (3fbdef3c6a10094812a15cba8e825898b757dfb3)
+func ActionLsRemoteRefs(url string, opts LsRemoteRefOption) carapace.Action {
+	return carapace.ActionExecCommand("git", "ls-remote", "--refs", "--tags", "--heads", url)(func(output []byte) carapace.Action {
+		lines := strings.Split(string(output), "\n")
+
+		vals := make([]string, 0)
+		for _, line := range lines[:len(lines)-1] {
+			fields := strings.Fields(line)
+			if opts.Branches && strings.HasPrefix(fields[1], "refs/heads/") {
+				vals = append(vals, strings.TrimPrefix(fields[1], "refs/heads/"), fields[0])
+			} else if opts.Tags && strings.HasPrefix(fields[1], "refs/tags/") {
+				vals = append(vals, strings.TrimPrefix(fields[1], "refs/tags/"), fields[0])
+			}
+		}
+		return carapace.ActionValuesDescribed(vals...)
+	})
+}
+
+// ActionRefFiles lists files of a reference
+//   go.mod
+//   pkg/
+func ActionRefFiles(ref string) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		args := []string{"ls-tree", "--name-only", "--full-tree", ref}
+		if dir := filepath.Dir(c.CallbackValue); dir != "." {
+			args = append(args, dir+"/")
+		}
+		return carapace.ActionExecCommand("git", args...)(func(output []byte) carapace.Action {
+			lines := strings.Split(string(output), "\n")
+			files := lines[:len(lines)-1]
+
+			args = append(args, "-d") // only directories
+			return carapace.ActionExecCommand("git", args...)(func(output []byte) carapace.Action {
+				lines := strings.Split(string(output), "\n")
+				directories := lines[:len(lines)-1]
+
+				filesA := carapace.ActionValues(files...).Invoke(c).Filter(directories)
+
+				for index, dir := range directories {
+					directories[index] = dir + "/"
+				}
+				directoriesA := carapace.ActionValues(directories...).Invoke(c)
+
+				return filesA.Merge(directoriesA).ToA()
+			})
+		})
+	})
+}