summaryrefslogtreecommitdiffstats
path: root/pkg/gui/presentation
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2024-05-04 12:35:57 +0200
committerStefan Haller <stefan@haller-berlin.de>2024-06-03 13:02:46 +0200
commit19d0048cc486b087ca938a14ce2be91ea0f0a3ae (patch)
tree2ea12130e8ca41c6a85d35b2a337255d322964f3 /pkg/gui/presentation
parent7c51ec21bf0f787c6f2d0079e920f3d5f566c9f0 (diff)
More explicit test of status panel content
Use Equals instead of Contains for asserting the status view content. This solves the problem that we might assert Contains("↓2 repo"), but what it really shows is "↑1↓2 repo", and the test still succeeds. At best this is confusing. Also, this way we don't have to use the awkward DoesNotContain to check that it really doesn't show a checkmark. To do this, we need to fix two whitespace problems: - there was always a space at the end for no reason. Simply remove it. It was added in efb51eee96, but from looking at that diff it seems it was added accidentally. - there was a space at the beginning if the branch status was empty. This is actually a cosmetic problem, for branches without a status the text was indented by once space. Change this so that the space is added conditionally. It's a bit awkward that we have to use Decolorise here, but this will go away again later in this branch.
Diffstat (limited to 'pkg/gui/presentation')
-rw-r--r--pkg/gui/presentation/status.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/gui/presentation/status.go b/pkg/gui/presentation/status.go
index d3686510e..5ac591c48 100644
--- a/pkg/gui/presentation/status.go
+++ b/pkg/gui/presentation/status.go
@@ -10,6 +10,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/i18n"
+ "github.com/jesseduffield/lazygit/pkg/utils"
)
func FormatStatus(
@@ -24,7 +25,10 @@ func FormatStatus(
status := ""
if currentBranch.IsRealBranch() {
- status += ColoredBranchStatus(currentBranch, itemOperation, tr, userConfig) + " "
+ status += ColoredBranchStatus(currentBranch, itemOperation, tr, userConfig)
+ if utils.Decolorise(status) != "" {
+ status += " "
+ }
}
if workingTreeState != enums.REBASE_MODE_NONE {
@@ -40,7 +44,7 @@ func FormatStatus(
}
repoName = fmt.Sprintf("%s(%s%s)", repoName, icon, style.FgCyan.Sprint(linkedWorktreeName))
}
- status += fmt.Sprintf("%s → %s ", repoName, name)
+ status += fmt.Sprintf("%s → %s", repoName, name)
return status
}