Boards manager: when filtering result using text field, consider both core name AND supported boards names

Author: Federico Fissore

app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java

@@ -232,7 +232,9 @@ private void applyFilterToLibrary(ContributedLibrary lib) {
     if (selectedCategoryFilter != null && !selectedCategoryFilter.test(lib)) {
       return;
     }
-    if (!stringContainsAll(lib.getName(), selectedFilters) && !stringContainsAll(lib.getParagraph(), selectedFilters) && !stringContainsAll(lib.getSentence(), selectedFilters)) {
+
+    String compoundTargetSearchText = lib.getName() + "\n" + lib.getParagraph() + "\n" + lib.getSentence();
+    if (!stringContainsAll(compoundTargetSearchText, selectedFilters)) {
       return;
     }
     addContribution(lib);

app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java

@@ -31,6 +31,7 @@
 
 import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
 import cc.arduino.contributions.filters.InstalledPredicate;
+import cc.arduino.contributions.packages.ContributedBoard;
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionsIndexer;
@@ -120,15 +121,16 @@ public void setIndexer(ContributionsIndexer indexer) {
     this.indexer = indexer;
   }
 
-  public void updateIndexFilter(String filters[], Stream<Predicate<ContributedPlatform>> additionalFilters) {
+  public void updateIndexFilter(String[] filters, Stream<Predicate<ContributedPlatform>> additionalFilters) {
     contributions.clear();
     Predicate<ContributedPlatform> filter = additionalFilters.reduce(Predicate::and).get();
     for (ContributedPackage pack : indexer.getPackages()) {
       for (ContributedPlatform platform : pack.getPlatforms()) {
+        String compoundTargetSearchText = platform.getName() + "\n" + platform.getBoards().stream().map(ContributedBoard::getName).collect(Collectors.joining(" "));
         if (!filter.test(platform)) {
           continue;
         }
-        if (!stringContainsAll(platform.getName(), filters))
+        if (!stringContainsAll(compoundTargetSearchText, filters))
           continue;
         addContribution(platform);
       }