diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 19:53:39 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 20:48:17 +1100 |
commit | be404068ffeda8eb43246db77f67573aae3079f3 (patch) | |
tree | cd6496b4f044124f90c1af22d415cf8e6f06ed8f /pkg/gui/editors.go | |
parent | 5671ec5f5867c3c2b083563bac309c8616b322ae (diff) |
support labels for suggestions which are distinct from values
Diffstat (limited to 'pkg/gui/editors.go')
-rw-r--r-- | pkg/gui/editors.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkg/gui/editors.go b/pkg/gui/editors.go index baffd19a3..2e4cdd78c 100644 --- a/pkg/gui/editors.go +++ b/pkg/gui/editors.go @@ -2,6 +2,8 @@ package gui import ( "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/presentation" + "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -78,7 +80,16 @@ func (gui *Gui) editorWithCallback(v *gocui.View, key gocui.Key, ch rune, mod go input := v.Buffer() branchNames := gui.getBranchNames() - suggestions := utils.FuzzySearch(input, branchNames) + matchingBranchNames := utils.FuzzySearch(input, branchNames) + + suggestions := make([]*types.Suggestion, len(matchingBranchNames)) + for i, branchName := range matchingBranchNames { + suggestions[i] = &types.Suggestion{ + Value: branchName, + Label: utils.ColoredString(branchName, presentation.GetBranchColor(branchName)), + } + } + gui.setSuggestions(suggestions) } |