Skip to content

Commit 689380b

Browse files
refactor: Rename AvailableTools() to AvailableToolsets()
The function returns toolset metadata, not tools. Renamed for clarity and simplified the toolset collection code per staticcheck suggestion.
1 parent 6ce742d commit 689380b

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

pkg/github/tools.go

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ var (
134134
}
135135
)
136136

137-
func AvailableTools() []toolsets.ToolsetMetadata {
137+
func AvailableToolsets() []toolsets.ToolsetMetadata {
138138
return []toolsets.ToolsetMetadata{
139139
ToolsetMetadataContext,
140140
ToolsetMetadataRepos,
@@ -153,15 +153,14 @@ func AvailableTools() []toolsets.ToolsetMetadata {
153153
ToolsetMetadataSecurityAdvisories,
154154
ToolsetMetadataProjects,
155155
ToolsetMetadataStargazers,
156-
ToolsetMetadataDynamic,
157156
ToolsetLabels,
158157
}
159158
}
160159

161160
// GetValidToolsetIDs returns a map of all valid toolset IDs for quick lookup
162161
func GetValidToolsetIDs() map[string]bool {
163162
validIDs := make(map[string]bool)
164-
for _, tool := range AvailableTools() {
163+
for _, tool := range AvailableToolsets() {
165164
validIDs[tool.ID] = true
166165
}
167166
// Add special keywords
@@ -316,13 +315,8 @@ func NewDefaultToolsetRegistry(getClient GetClientFn, getGQLClient GetGQLClientF
316315
toolsets.NewServerTool(LabelWrite(getGQLClient, t)),
317316
}
318317

319-
// Convert AvailableTools to toolsets.ToolsetMetadata slice
320-
toolsetMetadatas := make([]toolsets.ToolsetMetadata, 0, len(AvailableTools())+1)
321-
for _, tm := range AvailableTools() {
322-
toolsetMetadatas = append(toolsetMetadatas, tm)
323-
}
324-
// Add experiments toolset (even though it has no tools, it needs to exist)
325-
toolsetMetadatas = append(toolsetMetadatas, ToolsetMetadataExperiments)
318+
// Include all available toolsets plus experiments (which has no tools but needs to exist)
319+
toolsetMetadatas := append(AvailableToolsets(), ToolsetMetadataExperiments)
326320

327321
return toolsets.NewToolsetRegistry(toolsetMetadatas, tools)
328322
}
@@ -404,30 +398,30 @@ func GenerateToolsetsHelp() string {
404398
defaultTools := strings.Join(GetDefaultToolsetIDs(), ", ")
405399

406400
// Format available tools with line breaks for better readability
407-
allTools := AvailableTools()
408-
var availableToolsLines []string
401+
allToolsets := AvailableToolsets()
402+
var availableToolsetsLines []string
409403
const maxLineLength = 70
410404
currentLine := ""
411405

412-
for i, tool := range allTools {
406+
for i, toolset := range allToolsets {
413407
switch {
414408
case i == 0:
415-
currentLine = tool.ID
416-
case len(currentLine)+len(tool.ID)+2 <= maxLineLength:
417-
currentLine += ", " + tool.ID
409+
currentLine = toolset.ID
410+
case len(currentLine)+len(toolset.ID)+2 <= maxLineLength:
411+
currentLine += ", " + toolset.ID
418412
default:
419-
availableToolsLines = append(availableToolsLines, currentLine)
420-
currentLine = tool.ID
413+
availableToolsetsLines = append(availableToolsetsLines, currentLine)
414+
currentLine = toolset.ID
421415
}
422416
}
423417
if currentLine != "" {
424-
availableToolsLines = append(availableToolsLines, currentLine)
418+
availableToolsetsLines = append(availableToolsetsLines, currentLine)
425419
}
426420

427-
availableTools := strings.Join(availableToolsLines, ",\n\t ")
421+
availableToolsets := strings.Join(availableToolsetsLines, ",\n\t ")
428422

429423
toolsetsHelp := fmt.Sprintf("Comma-separated list of tool groups to enable (no spaces).\n"+
430-
"Available: %s\n", availableTools) +
424+
"Available: %s\n", availableToolsets) +
431425
"Special toolset keywords:\n" +
432426
" - all: Enables all available toolsets\n" +
433427
fmt.Sprintf(" - default: Enables the default toolset configuration of:\n\t %s\n", defaultTools) +

0 commit comments

Comments
 (0)