fix: keep stale pinned repositories visible in menu filters

steipete · steipete · commit 7962ecf17f76 · 2026-06-05T14:12:21.000-07:00
diff --git a/Sources/RepoBar/App/AppState+Visibility.swift b/Sources/RepoBar/App/AppState+Visibility.swift
@@ -153,7 +153,10 @@ extension AppState {
         let uniqueRepos = RepositoryUniquing.byFullName(repos)
         let pinnedSet = Set(options.pinned.map { $0.lowercased() })
         let hiddenSet = Set(options.hidden.map { $0.lowercased() })
-        let filtered = uniqueRepos.filter { !hiddenSet.contains($0.fullName.lowercased()) }
+        let filtered = uniqueRepos.filter {
+            let key = $0.fullName.lowercased()
+            return !hiddenSet.contains(key) || pinnedSet.contains(key)
+        }
         let visible = RepositoryFilter.apply(
             filtered,
             includeForks: options.includeForks,
diff --git a/Sources/RepoBarCore/Support/RepositoryPipeline.swift b/Sources/RepoBarCore/Support/RepositoryPipeline.swift
@@ -68,10 +68,16 @@ public enum RepositoryPipeline {
 
         switch query.scope {
         case .hidden:
-            filtered = filtered.filter { hiddenSet.contains($0.fullName.lowercased()) }
+            filtered = filtered.filter {
+                let key = $0.fullName.lowercased()
+                return hiddenSet.contains(key) && !pinnedSet.contains(key)
+            }
         case .all, .pinned:
             if !hiddenSet.isEmpty {
-                filtered = filtered.filter { !hiddenSet.contains($0.fullName.lowercased()) }
+                filtered = filtered.filter {
+                    let key = $0.fullName.lowercased()
+                    return !hiddenSet.contains(key) || pinnedSet.contains(key)
+                }
             }
         }
 
diff --git a/Tests/RepoBarTests/RepositoryPipelineTests.swift b/Tests/RepoBarTests/RepositoryPipelineTests.swift
@@ -58,6 +58,37 @@ struct RepositoryPipelineTests {
         #expect(result.map(\.fullName) == ["b/two"])
     }
 
+    @Test
+    func `Pinned repository remains visible when stale hidden entry remains`() {
+        let repos = [
+            Self.makeRepo("a/one", issues: 0, pulls: 0),
+            Self.makeRepo("b/two", issues: 0, pulls: 0)
+        ]
+        let query = RepositoryQuery(
+            scope: .all,
+            pinned: ["b/two"],
+            hidden: Set(["b/two"]),
+            pinPriority: true
+        )
+        let result = RepositoryPipeline.apply(repos, query: query)
+        #expect(result.map(\.fullName) == ["b/two", "a/one"])
+    }
+
+    @Test
+    func `Hidden scope excludes repositories that are also pinned`() {
+        let repos = [
+            Self.makeRepo("a/one", issues: 0, pulls: 0),
+            Self.makeRepo("b/two", issues: 0, pulls: 0)
+        ]
+        let query = RepositoryQuery(
+            scope: .hidden,
+            pinned: ["b/two"],
+            hidden: Set(["a/one", "b/two"])
+        )
+        let result = RepositoryPipeline.apply(repos, query: query)
+        #expect(result.map(\.fullName) == ["a/one"])
+    }
+
     @Test
     func `Pinned scope filters to pinned list`() {
         let repos = [
diff --git a/Tests/RepoBarTests/VisibilityTests.swift b/Tests/RepoBarTests/VisibilityTests.swift
@@ -45,6 +45,24 @@ struct VisibilityTests {
         #expect(visible.first?.fullName == "me/a")
     }
 
+    @Test
+    func `keeps pinned repository visible when stale hidden entry remains`() {
+        let repo = makeRepository(id: "1", name: "a")
+        let visible = AppState.selectVisible(
+            all: [repo],
+            options: AppState.VisibleSelectionOptions(
+                pinned: ["me/a"],
+                hidden: Set(["me/a"]),
+                includeForks: false,
+                includeArchived: false,
+                limit: 5,
+                ownerFilter: []
+            )
+        )
+
+        #expect(visible.map(\.fullName) == ["me/a"])
+    }
+
     @Test
     func `applies limit after filtering`() {
         let repos = (0 ..< 10).map { idx in
