ModuleSearcher: Fix menu search

frauzufall · frauzufall · commit 2cd582429330 · 2019-05-15T15:28:31.000+02:00
diff --git a/src/main/java/org/scijava/search/module/ModuleSearcher.java b/src/main/java/org/scijava/search/module/ModuleSearcher.java
@@ -88,12 +88,12 @@ public List<SearchResult> search(final String text, final boolean fuzzy) {
 
 		// Next, add modules where title has text inside somewhere.
 		modules.stream() //
-			.filter(info -> hasSubstring(info, textLower)) //
+			.filter(info -> hasSubstringInTitle(info, textLower)) //
 			.forEach(matches::add);
 
 		// Finally, add modules where menu path has text inside somewhere.
 		modules.stream() //
-			.filter(info -> hasSubstring(info, textLower)) //
+			.filter(info -> hasSubstringInMenu(info, textLower)) //
 			.forEach(matches::add);
 
 		// Wrap each matching ModuleInfo in a ModuleSearchResult.
@@ -160,11 +160,19 @@ private boolean startsWith(final ModuleInfo info, final String desiredLower) {
 		return title != null && title.toLowerCase().startsWith(desiredLower);
 	}
 
-	private boolean hasSubstring(final ModuleInfo info,
-		final String desiredLower)
+	private boolean hasSubstringInTitle(final ModuleInfo info,
+	                                    final String desiredLower)
 	{
 		final String title = title(info);
 		return title != null && //
 			title.toLowerCase().matches(".*" + desiredLower + ".*");
 	}
+
+	private boolean hasSubstringInMenu(final ModuleInfo info,
+	                                    final String desiredLower)
+	{
+		MenuPath menuPath = info.getMenuPath();
+		if(menuPath == null) return false;
+		return menuPath.stream().anyMatch(entry -> entry.getName().toLowerCase().contains(desiredLower));
+	}
 }
