refactor(toolbar): hoist Return-to-activate and extract testable connection-switcher selection (#1350)

Author: datlechin

TablePro/Views/Toolbar/ConnectionSwitcherPopover.swift

@@ -18,6 +18,15 @@ enum ConnectionSwitcherFilter {
     }
 }
 
+enum ConnectionSwitcherSelection {
+    static func moved(in ids: [UUID], from current: UUID?, by offset: Int) -> UUID? {
+        guard !ids.isEmpty else { return nil }
+        let currentIndex = current.flatMap { ids.firstIndex(of: $0) } ?? 0
+        let newIndex = max(0, min(ids.count - 1, currentIndex + offset))
+        return ids[newIndex]
+    }
+}
+
 struct ConnectionSwitcherPopover: View {
     @Environment(\.dismiss) private var dismiss
 
@@ -82,6 +91,10 @@ struct ConnectionSwitcherPopover: View {
             if let id = selectedConnectionId, ids.contains(id) { return }
             selectedConnectionId = ids.first
         }
+        .onKeyPress(.return) {
+            activateSelected()
+            return .handled
+        }
     }
 
     private var searchField: some View {
@@ -281,11 +294,9 @@ struct ConnectionSwitcherPopover: View {
     // MARK: - Selection
 
     private func moveSelection(by offset: Int) {
-        let ids = orderedIds
-        guard !ids.isEmpty else { return }
-        let currentIndex = selectedConnectionId.flatMap { ids.firstIndex(of: $0) } ?? 0
-        let newIndex = max(0, min(ids.count - 1, currentIndex + offset))
-        selectedConnectionId = ids[newIndex]
+        if let next = ConnectionSwitcherSelection.moved(in: orderedIds, from: selectedConnectionId, by: offset) {
+            selectedConnectionId = next
+        }
     }
 
     private func activateSelected() {

TableProTests/Views/Toolbar/ConnectionSwitcherFilterTests.swift

@@ -30,9 +30,48 @@ struct ConnectionSwitcherFilterTests {
         #expect(ConnectionSwitcherFilter.matches(connection, query: "analy"))
     }
 
+    @Test("Host is searched")
+    func hostMatch() {
+        let connection = TestFixtures.makeConnection(name: "Primary", database: "analytics")
+        #expect(ConnectionSwitcherFilter.matches(connection, query: "localhost"))
+    }
+
     @Test("Non-matching query returns false")
     func noMatch() {
         let connection = TestFixtures.makeConnection(name: "Primary", database: "analytics")
         #expect(!ConnectionSwitcherFilter.matches(connection, query: "zzz"))
     }
 }
+
+@Suite("Connection Switcher Selection")
+struct ConnectionSwitcherSelectionTests {
+    @Test("Empty list yields no selection")
+    func emptyList() {
+        #expect(ConnectionSwitcherSelection.moved(in: [], from: nil, by: 1) == nil)
+    }
+
+    @Test("Moving down advances to the next id")
+    func movesDown() {
+        let (a, b, c) = (UUID(), UUID(), UUID())
+        #expect(ConnectionSwitcherSelection.moved(in: [a, b, c], from: a, by: 1) == b)
+        #expect(ConnectionSwitcherSelection.moved(in: [a, b, c], from: b, by: 1) == c)
+    }
+
+    @Test("Moving up retreats to the previous id")
+    func movesUp() {
+        let (a, b, c) = (UUID(), UUID(), UUID())
+        #expect(ConnectionSwitcherSelection.moved(in: [a, b, c], from: c, by: -1) == b)
+    }
+
+    @Test("Moving past the top clamps to the first id")
+    func clampsAtTop() {
+        let (a, b, c) = (UUID(), UUID(), UUID())
+        #expect(ConnectionSwitcherSelection.moved(in: [a, b, c], from: a, by: -1) == a)
+    }
+
+    @Test("Moving past the bottom clamps to the last id")
+    func clampsAtBottom() {
+        let (a, b, c) = (UUID(), UUID(), UUID())
+        #expect(ConnectionSwitcherSelection.moved(in: [a, b, c], from: c, by: 1) == c)
+    }
+}