Match parentcategories when searching for a subcategory

NotEnoughUpdates · Nov 16, 2023 · 6742371 · 6742371
1 parent f130789
commit 6742371
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/legacy/src/main/java/io/github/moulberry/moulconfig/gui/MoulConfigEditor.java b/legacy/src/main/java/io/github/moulberry/moulconfig/gui/MoulConfigEditor.java
@@ -168,6 +168,10 @@ public void updateSearchResults(boolean recalculateOptionUniverse) {
             currentlyVisibleOptions = matchingOptionsAndDependencies;
 
             Set<ProcessedCategory> visibleCategories = matchingOptionsAndDependencies.stream().map(it -> it.category).collect(Collectors.toSet());
+            Set<ProcessedCategory> parentCategories = visibleCategories.stream()
+                .filter(it -> it.parent != null).map(it -> processedConfig.getAllCategories().get(it.parent))
+                .filter(Objects::nonNull).collect(Collectors.toSet());
+            visibleCategories.addAll(parentCategories);
             LinkedHashMap<String, ProcessedCategory> matchingCategories = new LinkedHashMap<>(processedConfig.getAllCategories());
             matchingCategories.entrySet().removeIf(stringProcessedCategoryEntry -> !visibleCategories.contains(stringProcessedCategoryEntry.getValue()));
             currentlyVisibleCategories = matchingCategories;

diff --git a/legacy/src/main/java/io/github/moulberry/moulconfig/test/SubCategory.java b/legacy/src/main/java/io/github/moulberry/moulconfig/test/SubCategory.java
@@ -10,4 +10,10 @@ public class SubCategory {
     )
     @ConfigEditorBoolean
     public boolean w = false;
+    @ConfigOption(
+        name = "EICAR",
+        desc = "com"
+    )
+    @ConfigEditorBoolean
+    public boolean we = false;
 }