Tweak filter test ordering

Author: APickledWalrus

src/components/syntaxes/SyntaxDisplayManager.astro

@@ -116,18 +116,45 @@ export interface VersionFilterData {
     let versionFilter: VersionFilterData = {
         versions: [], range: 'strict', type: 'any',
     };
-    let returnTypeFilter: string | null = null;
+    let returnTypeFilter = '';
     let addonFilter = new Set<string>();
 
     let hasSearch = false;
     let searchCache: Map<string, number> = new Map<string, number>();
 
     // get what VirtualItems should actually "exist" based on the filters
     function getFilteredItems(): VirtualItem[] {
+        // Prepare elements
+        let filtered = [...allItems];
+
+        // Addon filter
+        if (addonFilter.size !== 0) {
+            filtered = filtered.filter(item => {
+                const itemAddon = item.element.dataset.syntaxAddon;
+                if (itemAddon) {
+                    return addonFilter.has(itemAddon);
+                }
+                // no addon means it is from Skript
+                return addonFilter.has("Skript");
+            });
+        }
+
         // Type filter
-        let filtered = typeFilter.size === 0 
-            ? [...allItems]
-            : allItems.filter(item => typeFilter.has(item.syntaxType));
+        if (typeFilter.size !== 0) {
+            filtered = filtered.filter(item => typeFilter.has(item.syntaxType));
+        }
+
+        // Return type filter
+        if (returnTypeFilter.length > 0) {
+            filtered = filtered.filter(item => {
+                if (item.element.dataset.syntaxReturns) {
+                    const candidate = (item.element.dataset.syntaxReturns as string).toLowerCase();
+                    // TODO inheritance mapping?
+                    return candidate.includes(returnTypeFilter);
+                }
+                return false;
+            })
+        }
 
         // Version filter
         if (versionFilter.versions.length > 0) {
@@ -169,30 +196,6 @@ export interface VersionFilterData {
             });
         }
 
-        // return type filter
-        if (returnTypeFilter) {
-            const target = returnTypeFilter.toLowerCase();
-            filtered = filtered.filter(item => {
-                if (item.element.dataset.syntaxReturns) {
-                    const candidate = (item.element.dataset.syntaxReturns as string).toLowerCase();
-                    // todo: inheritance mapping?
-                    return candidate.includes(target);
-                }
-                return false;
-            })          
-        }
-
-        if (addonFilter.size != 0) {
-            filtered = filtered.filter(item => {
-                const itemAddon = item.element.dataset.syntaxAddon;
-                if (itemAddon) {
-                    return addonFilter.has(itemAddon);
-                }
-                // no addon means it is from Skript
-                return addonFilter.has("Skript");
-            });
-        }
-
         if (hasSearch) { // need to filter and sort based on search cache
             return filtered
                 .filter(item => searchCache.has(item.syntaxId))
@@ -577,7 +580,7 @@ export interface VersionFilterData {
             fullRender();
         },
         updateReturnTypeFilter: (type: string) => {
-            returnTypeFilter = type;
+            returnTypeFilter = type.toLowerCase();
             fullRender();
         },
         updateAddonFilter: (addons: Set<string>) => {