Remove fuzzy logic from board listall command

Author: silvanocerza

commands/board/listall.go

@@ -20,9 +20,9 @@ import (
 	"errors"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/utils"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
-	"github.com/lithammer/fuzzysearch/fuzzy"
 )
 
 // maximumSearchDistance is the maximum Levenshtein distance accepted when using fuzzy search.
@@ -36,18 +36,26 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllRe
 		return nil, errors.New("invalid instance")
 	}
 
-	searchArgs := strings.Join(req.SearchArgs, " ")
+	searchArgs := []string{}
+	for _, s := range req.SearchArgs {
+		searchArgs = append(searchArgs, strings.Trim(s, " "))
+	}
 
-	match := func(toTest []string) bool {
+	match := func(toTest []string) (bool, error) {
 		if len(searchArgs) == 0 {
-			return true
+			return true, nil
 		}
-		for _, rank := range fuzzy.RankFindNormalizedFold(searchArgs, toTest) {
-			if rank.Distance < maximumSearchDistance {
-				return true
+
+		for _, t := range toTest {
+			matches, err := utils.Match(t, searchArgs)
+			if err != nil {
+				return false, err
+			}
+			if matches {
+				return matches, nil
 			}
 		}
-		return false
+		return false, nil
 	}
 
 	list := &rpc.BoardListAllResp{Boards: []*rpc.BoardListItem{}}
@@ -90,10 +98,11 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllRe
 					continue
 				}
 
-				toTest := toTest
-				toTest = append(toTest, strings.Split(board.Name(), " ")...)
+				toTest := append(toTest, board.Name())
 				toTest = append(toTest, board.FQBN())
-				if !match(toTest) {
+				if ok, err := match(toTest); err != nil {
+					return nil, err
+				} else if !ok {
 					continue
 				}
 

test/test_board.py

@@ -455,34 +455,6 @@ def test_board_listall_with_manually_installed_platform(run_command, data_dir):
     assert "Arduino SAMD (32-bits ARM Cortex-M0+) Boards" == platform["Name"]
 
 
-def test_board_listall_fuzzy_search(run_command, data_dir):
-    assert run_command("update")
-
-    # Install from platform manager
-    assert run_command("core install arduino:[email protected]")
-
-    # Manually installs a core in sketchbooks hardware folder
-    git_url = "https://github.com/arduino/ArduinoCore-samd.git"
-    repo_dir = Path(data_dir, "hardware", "arduino-beta-development", "samd")
-    assert Repo.clone_from(git_url, repo_dir, multi_options=["-b 1.8.11"])
-
-    res = run_command("board listall --format json samd")
-    assert res.ok
-    data = json.loads(res.stdout)
-    boards = {b["FQBN"]: b for b in data["boards"]}
-    assert len(boards) == 17
-    assert "arduino-beta-development:samd:mkr1000" in boards
-    assert "arduino:avr:uno" not in boards
-
-    res = run_command("board listall --format json avr")
-    assert res.ok
-    data = json.loads(res.stdout)
-    boards = {b["FQBN"]: b for b in data["boards"]}
-    assert len(boards) == 26
-    assert "arduino:avr:uno" in boards
-    assert "arduino-beta-development:samd:mkr1000" not in boards
-
-
 def test_board_details(run_command):
     run_command("core update-index")
     # Download samd core pinned to 1.8.6