Skip to content

Fix auto-completion logic for APIs that end with 'y' #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pearl1594 wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −8
Open

Fix auto-completion logic for APIs that end with 'y' #194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5dbe1a
Fix auto-completion logic for APIs that end with 'y'
Pearl1594 Sep 2, 2025
f18def8
xtract shared pluralizeNoun helper for autocomplete heuristics
Pearl1594 Aug 21, 2026
07b129f
omit already plural apis
Pearl1594 Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions cli/completer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,22 @@ func findAPI(apiMap map[string][]*config.API, relatedNoun string) *config.API {
return autocompleteAPI
}

// pluralizeNoun applies simple English pluralization rules used by the
// autocomplete heuristics below (e.g., policy -> policies, disk -> disks).
func pluralizeNoun(noun string) string {
switch {
case strings.HasSuffix(noun, "ies"):
return noun
case strings.HasSuffix(noun, "y") && len(noun) > 1 && !strings.ContainsAny(string(noun[len(noun)-2]), "aeiou"):
// Handle words ending in consonant + y (e.g., policy -> policies)
return noun[:len(noun)-1] + "ies"
case strings.HasSuffix(noun, "s") || strings.HasSuffix(noun, "x") || strings.HasSuffix(noun, "z") || strings.HasSuffix(noun, "ch") || strings.HasSuffix(noun, "sh"):
return noun + "es"
default:
return noun + "s"
}
}

func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap map[string][]*config.API) *config.API {
if arg.Type == "map" {
return nil
Expand All @@ -220,8 +236,9 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap map[st
case argName == "id" || argName == "ids":
// Heuristic: user is trying to autocomplete for id/ids arg for a list API
relatedNoun = apiFound.Noun
if apiFound.Verb != "list" {
relatedNoun += "s"
if apiFound.Verb != "list" && findAPI(apiMap, relatedNoun) == nil {
// Noun may already be plural (e.g. bulk ops like deleteAlerts)
relatedNoun = pluralizeNoun(relatedNoun)
}
Comment thread
Pearl1594 marked this conversation as resolved.
case argName == "account":
// Heuristic: user is trying to autocomplete for accounts
Expand Down Expand Up @@ -249,12 +266,7 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap map[st
}
}
}
// Handle common cases where base ends with a vowel and needs "es"
if strings.HasSuffix(base, "s") || strings.HasSuffix(base, "x") || strings.HasSuffix(base, "z") || strings.HasSuffix(base, "ch") || strings.HasSuffix(base, "sh") {
relatedNoun = base + "es"
} else {
relatedNoun = base + "s"
}
relatedNoun = pluralizeNoun(base)
}

config.Debug("Possible related noun for the arg: ", relatedNoun, " and type: ", arg.Type)
Expand Down
Loading