Repository navigation
Fix browser omnibar typing lag with many workspaces #3422
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,251 @@ | ||
| import AppKit | ||
| import Foundation | ||
|
|
||
| struct BrowserOpenTabSuggestionSnapshot: Equatable { | ||
| let workspaceId: UUID | ||
| let panelId: UUID | ||
| let url: String | ||
| let title: String? | ||
| let lowercasedURL: String | ||
| let lowercasedTitle: String | ||
|
|
||
| init?(workspaceId: UUID, panelId: UUID, url: String?, title: String?) { | ||
| guard let normalizedURL = url?.trimmingCharacters(in: .whitespacesAndNewlines), | ||
| !normalizedURL.isEmpty else { return nil } | ||
| let normalizedTitle = title?.trimmingCharacters(in: .whitespacesAndNewlines) | ||
| self.workspaceId = workspaceId | ||
| self.panelId = panelId | ||
| self.url = normalizedURL | ||
| self.title = normalizedTitle?.isEmpty == false ? normalizedTitle : nil | ||
| self.lowercasedURL = normalizedURL.lowercased() | ||
| self.lowercasedTitle = self.title?.lowercased() ?? "" | ||
| } | ||
| } | ||
|
|
||
| struct OmnibarOpenTabMatch: Equatable { | ||
| let tabId: UUID | ||
| let panelId: UUID | ||
| let url: String | ||
| let title: String? | ||
| let isKnownOpenTab: Bool | ||
|
|
||
| init(tabId: UUID, panelId: UUID, url: String, title: String?, isKnownOpenTab: Bool = true) { | ||
| self.tabId = tabId | ||
| self.panelId = panelId | ||
| self.url = url | ||
| self.title = title | ||
| self.isKnownOpenTab = isKnownOpenTab | ||
| } | ||
| } | ||
|
|
||
| extension BrowserHistoryStore { | ||
| static func uiTestSeedEntriesIfConfigured() -> [Entry]? { | ||
| let env = ProcessInfo.processInfo.environment | ||
| guard env["CMUX_UI_TEST_MODE"] == "1", | ||
| let rawSeed = env["CMUX_UI_TEST_BROWSER_HISTORY_JSON"], | ||
| let data = rawSeed.data(using: .utf8) else { | ||
| return nil | ||
| } | ||
| return try? JSONDecoder().decode([Entry].self, from: data) | ||
| } | ||
| } | ||
|
|
||
| final class BrowserOpenTabSuggestionIndex { | ||
| private var suggestionsByPanelId: [UUID: BrowserOpenTabSuggestionSnapshot] = [:] | ||
| private var suggestionOrder: [UUID] = [] | ||
| private var isSeeded = false | ||
|
|
||
| func upsert(_ snapshot: BrowserOpenTabSuggestionSnapshot) { | ||
| let existing = suggestionsByPanelId[snapshot.panelId] | ||
| guard existing != snapshot else { return } | ||
| suggestionsByPanelId[snapshot.panelId] = snapshot | ||
| if existing == nil { | ||
| suggestionOrder.append(snapshot.panelId) | ||
| } | ||
| } | ||
|
|
||
| func remove(panelId: UUID) { | ||
| guard suggestionsByPanelId.removeValue(forKey: panelId) != nil else { return } | ||
| suggestionOrder.removeAll { $0 == panelId } | ||
| } | ||
|
|
||
| func matching( | ||
| for query: String, | ||
| currentWorkspaceId: UUID, | ||
| currentPanelId: UUID, | ||
| currentPanelSnapshot: BrowserOpenTabSuggestionSnapshot?, | ||
| includeCurrentPanelForSingleCharacterQuery: Bool, | ||
| limit: Int, | ||
| seedSnapshots: () -> [BrowserOpenTabSuggestionSnapshot] | ||
| ) -> [OmnibarOpenTabMatch] { | ||
| let trimmedQuery = query.trimmingCharacters(in: .whitespacesAndNewlines) | ||
| guard !trimmedQuery.isEmpty, limit > 0 else { return [] } | ||
|
|
||
| seedIfNeeded(seedSnapshots) | ||
|
|
||
| let loweredQuery = trimmedQuery.lowercased() | ||
| let singleCharacterQuery = omnibarSingleCharacterQuery(for: trimmedQuery) | ||
| var matches: [OmnibarOpenTabMatch] = [] | ||
| matches.reserveCapacity(min(limit, suggestionOrder.count + 1)) | ||
| var seenKeys = Set<String>() | ||
|
|
||
| func snapshotMatches(_ snapshot: BrowserOpenTabSuggestionSnapshot) -> Bool { | ||
| if let singleCharacterQuery { | ||
| return omnibarHasSingleCharacterPrefixMatch( | ||
| query: singleCharacterQuery, | ||
| url: snapshot.url, | ||
| title: snapshot.title | ||
| ) | ||
| } | ||
| return snapshot.lowercasedURL.contains(loweredQuery) || | ||
| snapshot.lowercasedTitle.contains(loweredQuery) | ||
| } | ||
|
|
||
| func append(_ snapshot: BrowserOpenTabSuggestionSnapshot, isKnownOpenTab: Bool) { | ||
| guard matches.count < limit else { return } | ||
| let key = [ | ||
| snapshot.workspaceId.uuidString.lowercased(), | ||
| snapshot.panelId.uuidString.lowercased(), | ||
| snapshot.lowercasedURL, | ||
| ].joined(separator: "|") | ||
| guard snapshotMatches(snapshot) else { return } | ||
| guard seenKeys.insert(key).inserted else { return } | ||
| matches.append( | ||
| OmnibarOpenTabMatch( | ||
| tabId: snapshot.workspaceId, | ||
| panelId: snapshot.panelId, | ||
| url: snapshot.url, | ||
| title: snapshot.title, | ||
| isKnownOpenTab: isKnownOpenTab | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| if includeCurrentPanelForSingleCharacterQuery, let currentPanelSnapshot { | ||
| append(currentPanelSnapshot, isKnownOpenTab: true) | ||
| } | ||
|
|
||
| for panelId in suggestionOrder { | ||
| guard matches.count < limit else { break } | ||
| guard let snapshot = suggestionsByPanelId[panelId] else { continue } | ||
| let isCurrentPanel = snapshot.workspaceId == currentWorkspaceId && snapshot.panelId == currentPanelId | ||
| if isCurrentPanel && !includeCurrentPanelForSingleCharacterQuery { | ||
| continue | ||
| } | ||
| append(snapshot, isKnownOpenTab: true) | ||
| } | ||
|
|
||
| return matches | ||
| } | ||
|
|
||
| private func seedIfNeeded(_ snapshots: () -> [BrowserOpenTabSuggestionSnapshot]) { | ||
| guard !isSeeded else { return } | ||
| isSeeded = true | ||
| suggestionsByPanelId.removeAll(keepingCapacity: true) | ||
| suggestionOrder.removeAll(keepingCapacity: true) | ||
| for snapshot in snapshots() { | ||
| suggestionsByPanelId[snapshot.panelId] = snapshot | ||
| suggestionOrder.append(snapshot.panelId) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var browserOpenTabSuggestionIndexesByManagerId: [ObjectIdentifier: BrowserOpenTabSuggestionIndex] = [:] | ||
|
|
||
| extension TabManager { | ||
| private var browserOpenTabSuggestionIndex: BrowserOpenTabSuggestionIndex { | ||
| let managerId = ObjectIdentifier(self) | ||
| if let index = browserOpenTabSuggestionIndexesByManagerId[managerId] { | ||
| return index | ||
| } | ||
| let index = BrowserOpenTabSuggestionIndex() | ||
| browserOpenTabSuggestionIndexesByManagerId[managerId] = index | ||
| return index | ||
|
Comment on lines
+153
to
+163
There was a problem hiding this comment. 🧩 Analysis chain🌐 Web query:
💡 Result: Yes, ObjectIdentifier is guaranteed to be unique only during the lifetime of the object. The same identifier can be reused after the object is deallocated, as it is based on the object's memory address, which can be recycled by the runtime. Citations:
🏁 Script executed: find . -type f -name "BrowserOmnibarPerformanceSupport.swift" | head -5Repository: manaflow-ai/cmux Length of output: 116 🏁 Script executed: wc -l Sources/Panels/BrowserOmnibarPerformanceSupport.swiftRepository: manaflow-ai/cmux Length of output: 118 🏁 Script executed: cat -n Sources/Panels/BrowserOmnibarPerformanceSupport.swiftRepository: manaflow-ai/cmux Length of output: 10563 🏁 Script executed: find . -type f -name "*.swift" | xargs rg "class TabManager" -A 5 | head -30Repository: manaflow-ai/cmux Length of output: 2540 🏁 Script executed: rg "browserOpenTabSuggestionIndexesByManagerId" --type swiftRepository: manaflow-ai/cmux Length of output: 483 🏁 Script executed: find . -type f -name "*.swift" | xargs rg "^class TabManager" -A 30 | head -50Repository: manaflow-ai/cmux Length of output: 1790 🏁 Script executed: rg "deinit" Sources -A 5 | grep -A 5 "TabManager\|browserOpenTab" | head -30Repository: manaflow-ai/cmux Length of output: 679 🏁 Script executed: sed -n '1,200p' Sources/TabManager.swift | tail -100Repository: manaflow-ai/cmux Length of output: 3163 🏁 Script executed: rg "deinit" Sources/TabManager.swift -A 20Repository: manaflow-ai/cmux Length of output: 1010 🏁 Script executed: rg "browserOpenTabSuggestionIndexesByManagerId\[" Sources -B 3 -A 3Repository: manaflow-ai/cmux Length of output: 1067 🏁 Script executed: rg "removeValue\|removeAll\|removeValue.*browserOpenTab" Sources -B 5 -A 5Repository: manaflow-ai/cmux Length of output: 42 🏁 Script executed: rg "ObjectIdentifier" Sources -B 2 -A 2Repository: manaflow-ai/cmux Length of output: 50372 🏁 Script executed: grep -r "browserOpenTabSuggestion" Sources --include="*.swift" | grep -v "BrowserOmnibarPerformanceSupport"Repository: manaflow-ai/cmux Length of output: 42 Add cleanup in The global 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| func upsertBrowserOpenTabSuggestion(_ snapshot: BrowserOpenTabSuggestionSnapshot) { | ||
| browserOpenTabSuggestionIndex.upsert(snapshot) | ||
| } | ||
|
|
||
| func removeBrowserOpenTabSuggestion(panelId: UUID) { | ||
| browserOpenTabSuggestionIndex.remove(panelId: panelId) | ||
| } | ||
|
|
||
| func matchingOpenBrowserTabSuggestions( | ||
| for query: String, | ||
| currentWorkspaceId: UUID, | ||
| currentPanelId: UUID, | ||
| currentPanelSnapshot: BrowserOpenTabSuggestionSnapshot?, | ||
| includeCurrentPanelForSingleCharacterQuery: Bool, | ||
| limit: Int | ||
| ) -> [OmnibarOpenTabMatch] { | ||
| browserOpenTabSuggestionIndex.matching( | ||
| for: query, | ||
| currentWorkspaceId: currentWorkspaceId, | ||
| currentPanelId: currentPanelId, | ||
| currentPanelSnapshot: currentPanelSnapshot, | ||
| includeCurrentPanelForSingleCharacterQuery: includeCurrentPanelForSingleCharacterQuery, | ||
| limit: limit, | ||
| seedSnapshots: browserOpenTabSuggestionSeedSnapshots | ||
| ) | ||
| } | ||
|
|
||
| private func browserOpenTabSuggestionSeedSnapshots() -> [BrowserOpenTabSuggestionSnapshot] { | ||
| tabs.flatMap { workspace in | ||
| workspace.panels.compactMap { _, panel in | ||
| guard let browserPanel = panel as? BrowserPanel else { return nil } | ||
| return BrowserOpenTabSuggestionSnapshot( | ||
| workspaceId: workspace.id, | ||
| panelId: browserPanel.id, | ||
| url: browserPanel.preferredURLStringForOmnibar(), | ||
| title: browserPanel.pageTitle | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension Workspace { | ||
| func publishBrowserOpenTabSuggestion(for browserPanel: BrowserPanel) { | ||
| guard let snapshot = BrowserOpenTabSuggestionSnapshot( | ||
| workspaceId: id, | ||
| panelId: browserPanel.id, | ||
| url: browserPanel.preferredURLStringForOmnibar(), | ||
| title: browserPanel.pageTitle | ||
| ) else { | ||
| owningTabManager?.removeBrowserOpenTabSuggestion(panelId: browserPanel.id) | ||
| return | ||
| } | ||
| owningTabManager?.upsertBrowserOpenTabSuggestion(snapshot) | ||
| } | ||
|
|
||
| func removeBrowserOpenTabSuggestion(panelId: UUID) { | ||
| owningTabManager?.removeBrowserOpenTabSuggestion(panelId: panelId) | ||
| } | ||
|
|
||
| func removeBrowserOpenTabSuggestionIfNeeded(panel: (any Panel)?, panelId: UUID) { | ||
| guard panel is BrowserPanel else { return } | ||
| removeBrowserOpenTabSuggestion(panelId: panelId) | ||
| } | ||
| } | ||
|
|
||
| extension Notification.Name { | ||
| static let commandPaletteVisibilityDidChange = Notification.Name("cmux.commandPaletteVisibilityDidChange") | ||
| } | ||
|
|
||
| func postCommandPaletteVisibilityDidChangeIfNeeded( | ||
| wasVisible: Bool, | ||
| visible: Bool, | ||
| window: NSWindow, | ||
| windowId: UUID | ||
| ) { | ||
| guard wasVisible != visible else { return } | ||
| NotificationCenter.default.post( | ||
| name: .commandPaletteVisibilityDidChange, | ||
| object: window, | ||
| userInfo: [ | ||
| "windowId": windowId, | ||
| "visible": visible, | ||
| ] | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.