Support authors and tags in custom command suggestions preset

jesseduffield · Jun 7, 2023 · a694c45 · a694c45
1 parent ced773a
commit a694c45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/docs/Custom_Command_Keybindings.md b/docs/Custom_Command_Keybindings.md
@@ -101,7 +101,7 @@ These fields are applicable to all prompts.
 The permitted suggestions fields are:
 | _field_ | _description_ | _required_ |
 |-----------------|----------------------|-|
-| preset | Uses built-in logic to obtain the suggestions. One of 'files', 'branches', 'remotes', 'remoteBranches', 'refs' | no |
+| preset | Uses built-in logic to obtain the suggestions. One of 'authors', 'branches', 'files', 'refs', 'remotes', 'remoteBranches', 'tags' | no |
 | command | Command to run such that each line in the output becomes a suggestion. Mutually exclusive with 'preset' field. | no |
 
 Here's an example of passing a preset:

diff --git a/pkg/gui/controllers/helpers/suggestions_helper.go b/pkg/gui/controllers/helpers/suggestions_helper.go
@@ -157,6 +157,12 @@ func (self *SuggestionsHelper) getTagNames() []string {
  })
 }
 
+func (self *SuggestionsHelper) GetTagsSuggestionsFunc() func(string) []*types.Suggestion {
+ tagNames := self.getTagNames()
+
+ return FuzzySearchFunc(tagNames)
+}
+
 func (self *SuggestionsHelper) GetRefsSuggestionsFunc() func(string) []*types.Suggestion {
  remoteBranchNames := self.getRemoteBranchNames("/")
  localBranchNames := self.getBranchNames()

diff --git a/pkg/gui/services/custom_commands/handler_creator.go b/pkg/gui/services/custom_commands/handler_creator.go
@@ -161,16 +161,20 @@ func (self *HandlerCreator) getCommandSuggestionsFn(command string) (func(string
 
 func (self *HandlerCreator) getPresetSuggestionsFn(preset string) (func(string) []*types.Suggestion, error) {
  switch preset {
- case "files":
- return self.suggestionsHelper.GetFilePathSuggestionsFunc(), nil
+ case "authors":
+ return self.suggestionsHelper.GetAuthorsSuggestionsFunc(), nil
  case "branches":
  return self.suggestionsHelper.GetBranchNameSuggestionsFunc(), nil
+ case "files":
+ return self.suggestionsHelper.GetFilePathSuggestionsFunc(), nil
+ case "refs":
+ return self.suggestionsHelper.GetRefsSuggestionsFunc(), nil
  case "remotes":
  return self.suggestionsHelper.GetRemoteSuggestionsFunc(), nil
  case "remoteBranches":
  return self.suggestionsHelper.GetRemoteBranchesSuggestionsFunc("/"), nil
- case "refs":
- return self.suggestionsHelper.GetRefsSuggestionsFunc(), nil
+ case "tags":
+ return self.suggestionsHelper.GetTagsSuggestionsFunc(), nil
  default:
  return nil, fmt.Errorf("Unknown value for suggestionsPreset in custom command: %s. Valid values: files, branches, remotes, remoteBranches, refs", preset)
  }