Change the search behaviour

Author: mojganii

ios/MullvadVPN/View controllers/SelectLocation/DataSource/LocationDataSourceProtocol.swift

@@ -77,30 +77,19 @@ extension SearchableLocationDataSource {
     private func flattenResults(_ result: NodeResult) -> [NodeResult] {
         let children = result.matchedChildren
         let totalChildren = result.node.children.count
-        let hasMatchingChildren = !children.isEmpty
-
-        // If the current node matches:
-        // - If children also match AND a child has a better match then show children instead
-        // - Otherwise → show the parent
-        if result.matchedSelf {
-            if hasMatchingChildren, !result.bestMatchIsSelf {
-                // Collapse if ALL children matched
-                if totalChildren > 1, children.count == totalChildren {
-                    return [result]
-                }
-                return children.flatMap(flattenResults)
-            }
+        
+        // Show the parent only if it matches AND it is the best match in its subtree
+        if result.matchedSelf, result.bestMatchIsSelf {
             return [result]
         }
 
-        // If only one child AND parent doesn't match then skip parent
-        if result.node.children.count == 1 && !result.matchedSelf {
-            return flattenResults(children.first!)
-        }
-
-        // Collapse if ALL children matched
-        if !children.isEmpty && children.count == totalChildren {
-            return [result]
+        if !result.bestMatchIsSelf {
+            let matchedChildren = children.filter({ $0.score == result.score })
+            // Collapse if ALL children matched
+            if matchedChildren.count > 1 && matchedChildren.count == totalChildren {
+                return [result]
+            }
+            return matchedChildren.flatMap(flattenResults)
         }
 
         // Repopulate node