From 60021c1e6394e20b33c58a587141eb86c11db5c9 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 22 May 2018 16:28:52 +0200
Subject: [PATCH] Library search now works also for headers (.h) provided by
 libraries

Fixes #7604
---
 .../libraries/ui/LibrariesIndexTableModel.java            | 8 ++++++--
 .../contributions/libraries/ContributedLibrary.java       | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
index aa6f2b6e1..ceed4562f 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
@@ -145,8 +145,12 @@ public class LibrariesIndexTableModel
     }
 
     ContributedLibrary latest = lib.getLatest();
-    String compoundTargetSearchText = latest.getName() + "\n" + latest.getParagraph()
-                                      + "\n" + latest.getSentence();
+    String compoundTargetSearchText = latest.getName() + " "
+                                      + latest.getParagraph() + " "
+                                      + latest.getSentence();
+    if (latest.getProvidesIncludes() != null) {
+      compoundTargetSearchText += " " + latest.getProvidesIncludes();
+    }
     if (!stringContainsAll(compoundTargetSearchText, selectedFilters)) {
       return false;
     }
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
index acffd02ef..3aa119888 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
@@ -65,6 +65,8 @@ public abstract class ContributedLibrary extends DownloadableContribution {
 
   public abstract List<ContributedLibraryReference> getRequires();
 
+  public abstract List<String> getProvidesIncludes();
+
   public static final Comparator<ContributedLibrary> CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName());
 
   private Optional<UserLibrary> installedLib = Optional.empty();