Merge pull request #2551 from carapace-sh/git-actionchanges

git: ActionChanges - small refactor
carapace-sh · Oct 15, 2024 · 0f40dfe · 0f40dfe
2 parents 5a307ed + a6bf867
commit 0f40dfe
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/pkg/actions/tools/git/change.go b/pkg/actions/tools/git/change.go
@@ -36,30 +36,35 @@ func ActionChanges(opts ChangeOpts) carapace.Action {
 			if root, err := rootDir(c); err != nil {
 				return carapace.ActionMessage(err.Error())
 			} else {
+				evaluatedDir, err := filepath.EvalSymlinks(c.Dir)
+				if err != nil {
+					return carapace.ActionMessage(err.Error())
+				}
+
 				untracked := make([]string, 0)
 				for _, line := range strings.Split(string(output), "\n") {
-					if len(line) > 3 {
-						if (opts.Staged && line[1] == ' ') ||
-							(opts.Unstaged && line[1] != ' ' && line[1] != '!') ||
-							(opts.Ignored && line[1] == '!') {
-							path := line[3:]
-							if splitted := strings.SplitN(path, " -> ", 2); len(splitted) > 1 { // renamed
-								path = splitted[1]
-							}
+					switch {
+					case len(line) < 4:
+						// skip
+					case opts.Staged && line[1] == ' ',
+						opts.Unstaged && line[1] != ' ' && line[1] != '!',
+						opts.Ignored && line[1] == '!':
+
+						path := line[3:]
+						if splitted := strings.SplitN(path, " -> ", 2); len(splitted) > 1 { // renamed
+							path = splitted[1]
+						}
+
+						relativePath, err := filepath.Rel(evaluatedDir, root+"/"+path)
+						if err != nil {
+							return carapace.ActionMessage(err.Error())
+						}
 
-							evaluatedDir, err := filepath.EvalSymlinks(c.Dir)
-							if err != nil {
-								return carapace.ActionMessage(err.Error())
-							}
-							if relativePath, err := filepath.Rel(evaluatedDir, root+"/"+path); err != nil {
-								return carapace.ActionMessage(err.Error())
-							} else {
-								if status := line[:2]; strings.Contains(status, "D") { // deleted
-									untracked = append(untracked, relativePath, status, style.ForPathExt(relativePath, c))
-								} else {
-									untracked = append(untracked, relativePath, status, style.ForPath(relativePath, c))
-								}
-							}
+						switch status := line[:2]; {
+						case strings.Contains(status, "D"): // deleted
+							untracked = append(untracked, relativePath, status, style.ForPathExt(relativePath, c))
+						default:
+							untracked = append(untracked, relativePath, status, style.ForPath(relativePath, c))
 						}
 					}
 				}