Improve fuzzy search and fix test

Author: parttimenerd

cf_cli_java_plugin.go

@@ -22,10 +22,8 @@ import (
 
 	"utils"
 
-	"github.com/lithammer/fuzzysearch/fuzzy"
 	guuid "github.com/satori/go.uuid"
 	"github.com/simonleung8/flags"
-	"sort"
 )
 
 // The JavaPlugin is a cf cli plugin that supports taking heap and thread dumps on demand
@@ -414,18 +412,8 @@ func (c *JavaPlugin) execute(commandExecutor cmd.CommandExecutor, uuidGenerator
 		for _, command := range commands {
 			avCommands = append(avCommands, command.Name)
 		}
-		matches := fuzzy.RankFind(commandName, avCommands)
-		sort.Sort(matches)
-		matchedCommands := make([]string, 0, 3)
-		// first three matches
-		for i := 0; i < 3 && i < len(matches); i++ {
-			matchedCommands = append(matchedCommands, matches[i].Target)
-		}
-		// concat with or at the end
-		if len(matchedCommands) > 1 {
-			matchedCommands[len(matchedCommands)-1] = "or " + matchedCommands[len(matchedCommands)-1]
-		}
-		return "", &InvalidUsageError{message: fmt.Sprintf("Unrecognized command %q, did you mean: %s?", commandName, strings.Join(matchedCommands, ", "))}
+		matches := utils.FuzzySearch(commandName, avCommands, 3)
+		return "", &InvalidUsageError{message: fmt.Sprintf("Unrecognized command %q, did you mean: %s?", commandName, utils.JoinWithOr(matches))}
 	}
 
 	command := commands[index]

cf_cli_java_plugin_test.go

@@ -117,8 +117,8 @@ var _ = Describe("CfJavaPlugin", func() {
 				})
 
 				Expect(output).To(BeEmpty())
-				Expect(err.Error()).To(ContainSubstring("Unrecognized command \"UNKNOWN_COMMAND\": supported commands"))
-				Expect(cliOutput).To(ContainSubstring("Unrecognized command \"UNKNOWN_COMMAND\": supported commands"))
+				Expect(err.Error()).To(ContainSubstring("Unrecognized command \"UNKNOWN_COMMAND\", did you mean:"))
+				Expect(cliOutput).To(ContainSubstring("Unrecognized command \"UNKNOWN_COMMAND\", did you mean:"))
 
 				Expect(commandExecutor.ExecuteCallCount()).To(Equal(1))
 				Expect(commandExecutor.ExecuteArgsForCall(0)).To(Equal([]string{"help", "java"}))

utils/cfutils.go

@@ -8,8 +8,6 @@ import (
 	"os/exec"
 	"strings"
 	"slices"
-	"sort"
-	"github.com/lithammer/fuzzysearch/fuzzy"
 )
 
 type CfJavaPluginUtilImpl struct {
@@ -118,9 +116,8 @@ func (checker CfJavaPluginUtilImpl) FindReasonForAccessError(app string) string
 	if slices.Contains(appNames, app) {
 		return "Problems accessing the app " + app
 	}
-	matches := fuzzy.RankFind(app, appNames)
-	sort.Sort(matches)
-	return "Could not find " + app + ". Did you mean " + matches[0].Target + "?"
+	matches := FuzzySearch(app, appNames, 1)
+	return "Could not find " + app + ". Did you mean " + matches[0] + "?"
 }
 func (checker CfJavaPluginUtilImpl) CheckRequiredTools(app string) (bool, error) {
 	guid, err := exec.Command("cf", "app", app, "--guid").Output()