Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c2898a5
Unify Files and Find in right sidebar
austinywang Jul 14, 2026
0352030
Add regressions for unified Files and Find state
austinywang Jul 14, 2026
0ffbde4
Preserve unified Files and Find activation state
austinywang Jul 14, 2026
9fe8aa0
Add regressions for unified activation synchronization
austinywang Jul 14, 2026
9bab30e
Synchronize unified file explorer activation
austinywang Jul 14, 2026
683a28e
Add regressions for unified search handoff
austinywang Jul 14, 2026
a145c38
Pause hidden file search work
austinywang Jul 14, 2026
93a5129
Add regressions for no-focus and search accessibility
austinywang Jul 14, 2026
93705d6
Preserve no-focus and search accessibility
austinywang Jul 14, 2026
e8c5c8f
Add regression for preserved completed search
austinywang Jul 14, 2026
79af32e
Reuse completed unified search snapshots
austinywang Jul 14, 2026
9dab4a3
Add regression for typed unified search activation
austinywang Jul 14, 2026
b39ee55
Synchronize typed unified search activation
austinywang Jul 14, 2026
3d22f6b
Restore unified search test defaults
austinywang Jul 14, 2026
9a0f161
Avoid repeated unified search focus publication
austinywang Jul 14, 2026
4ba429d
Add regression for visible no-focus responder
austinywang Jul 14, 2026
f815a17
Cover authoritative no-focus refocus target
austinywang Jul 14, 2026
fd30f4b
Keep no-focus explorer responder visible
austinywang Jul 14, 2026
68fc515
Add regressions for grouped results and hidden chrome
austinywang Jul 14, 2026
02cf47b
Harden unified search grouping and hidden layout
austinywang Jul 14, 2026
b299b74
Fix unified explorer project file identity
austinywang Jul 14, 2026
0ff9d0d
Add regression for regrouped search selection
austinywang Jul 14, 2026
3a0e78e
Preserve regrouped search selection identity
austinywang Jul 14, 2026
d8ae997
Unify file and content search in one pane
austinywang Jul 14, 2026
25abfb3
Merge remote-tracking branch 'origin/main' into issue-8011-unified-fi…
austinywang Jul 14, 2026
fa85d97
Fix unified search tests and cover nested expansion
austinywang Jul 14, 2026
8464c27
Fix unified search focus and filtering regressions
austinywang Jul 14, 2026
614c3ec
Route the Files shortcut to the file viewer
austinywang Jul 14, 2026
c653a35
Debounce name filtering and stabilize result menus
austinywang Jul 14, 2026
b848b29
Add regression for original unified explorer chrome
austinywang Jul 14, 2026
a7a4304
Restore the original Files and Finder presentations
austinywang Jul 14, 2026
172d2c7
Add regressions for unified explorer focus and navigation
austinywang Jul 14, 2026
4a76a93
Fix unified explorer focus and filtered disclosure
austinywang Jul 14, 2026
436503c
Add regression for hidden Files filter refresh
austinywang Jul 14, 2026
81c64d7
Defer hidden Files filter refreshes
austinywang Jul 14, 2026
8fc3372
Add regressions for unified explorer mode and filtering
austinywang Jul 14, 2026
75d4bb8
Cover filtered metadata refresh stability
austinywang Jul 14, 2026
7f95034
Unify explorer mode and filter update ownership
austinywang Jul 14, 2026
e3861a8
Isolate unified explorer test preferences
austinywang Jul 14, 2026
cb99759
Cover pending filter double-click routing
austinywang Jul 14, 2026
697bae6
Move filename filtering off the main actor
austinywang Jul 14, 2026
0e1c13f
Cover passive unified explorer mode changes
austinywang Jul 14, 2026
57e3ad2
Cover hidden filename filter cancellation
austinywang Jul 14, 2026
324d8d1
Bound unified explorer filter lifecycle
austinywang Jul 14, 2026
c714c2a
Cover real arrow events during filename filtering
austinywang Jul 14, 2026
70240ff
Bound filename filter projection work
austinywang Jul 14, 2026
e5b929d
Cover unified explorer state reconciliation
austinywang Jul 14, 2026
30cbd1d
Reconcile unified explorer filter state
austinywang Jul 14, 2026
f73ff28
Cover filtered expansion style reloads
austinywang Jul 14, 2026
ef12447
Reuse in-flight filename filter work
austinywang Jul 14, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -105124,13 +105124,13 @@
"en": {
"stringUnit": {
"state": "translated",
"value": "Search files"
"value": "Find in files"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "ファイルを検索"
"value": "ファイル内を検索"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/ContentView+RightSidebarCommandPalette.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extension ContentView {
{ _ in value }
}

return RightSidebarMode.availableModes().map { mode in
return RightSidebarMode.availableActivationModes().map { mode in
let title = mode.shortcutAction?.label ?? mode.label
return CommandPaletteCommandContribution(
commandId: Self.commandPaletteRightSidebarModeCommandID(mode),
Expand Down Expand Up @@ -224,7 +224,7 @@ extension ContentView {
private static func commandPaletteRightSidebarModeShortcutAction(
forCommandID commandID: String
) -> KeyboardShortcutSettings.Action? {
guard let mode = RightSidebarMode.availableModes().first(where: { mode in
guard let mode = RightSidebarMode.availableActivationModes().first(where: { mode in
Self.commandPaletteRightSidebarModeCommandID(mode) == commandID
}) else {
return nil
Expand Down
5 changes: 5 additions & 0 deletions Sources/FileExplorerPanelPlacement.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// Location hosting a file explorer panel.
enum FileExplorerPanelPlacement: Equatable {
case rightSidebar
case pane
}
17 changes: 17 additions & 0 deletions Sources/FileExplorerPanelPresentation.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/// Visual presentation of the shared file explorer host.
enum FileExplorerPanelPresentation: Equatable {
case unified
case files
case find

var rightSidebarMode: RightSidebarMode {
switch self {
case .unified, .files: .files
case .find: .find
}
}

var keepsSearchFieldVisible: Bool {
self == .unified
}
}
27 changes: 22 additions & 5 deletions Sources/FileExplorerSearchResultCellView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ import CmuxFoundation
final class FileExplorerSearchResultCellView: NSTableCellView {
private let pathLabel = NSTextField(labelWithString: "")
private let previewLabel = NSTextField(labelWithString: "")
private var previewBelowPathConstraint: NSLayoutConstraint!
private var previewAtTopConstraint: NSLayoutConstraint!

static var preferredRowHeight: CGFloat {
max(
preferredRowHeight(startsFileGroup: true)
}

static func preferredRowHeight(startsFileGroup: Bool) -> CGFloat {
if !startsFileGroup {
return max(26, ceil(10 + lineHeight(for: GlobalFontMagnification.monospacedSystemFont(ofSize: 11, weight: .regular))))
}
return max(
46,
ceil(
13 +
Expand Down Expand Up @@ -39,22 +49,29 @@ final class FileExplorerSearchResultCellView: NSTableCellView {
addSubview(pathLabel)
addSubview(previewLabel)

previewBelowPathConstraint = previewLabel.topAnchor.constraint(equalTo: pathLabel.bottomAnchor, constant: 2)
previewAtTopConstraint = previewLabel.topAnchor.constraint(equalTo: topAnchor, constant: 5)

NSLayoutConstraint.activate([
pathLabel.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 6),
pathLabel.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -4),
pathLabel.topAnchor.constraint(equalTo: topAnchor, constant: 5),

previewLabel.leadingAnchor.constraint(equalTo: pathLabel.leadingAnchor),
previewLabel.trailingAnchor.constraint(equalTo: pathLabel.trailingAnchor),
previewLabel.topAnchor.constraint(equalTo: pathLabel.bottomAnchor, constant: 2),
previewBelowPathConstraint,
])
}

func configure(with result: FileSearchResult) {
func configure(with result: FileSearchResult, startsFileGroup: Bool) {
pathLabel.font = GlobalFontMagnification.systemFont(ofSize: 12, weight: .semibold)
previewLabel.font = GlobalFontMagnification.monospacedSystemFont(ofSize: 11, weight: .regular)
pathLabel.stringValue = "\(result.relativePath):\(result.lineNumber)"
previewLabel.stringValue = result.preview.isEmpty ? " " : result.preview
pathLabel.isHidden = !startsFileGroup
NSLayoutConstraint.deactivate([previewBelowPathConstraint, previewAtTopConstraint])
(startsFileGroup ? previewBelowPathConstraint : previewAtTopConstraint).isActive = true
pathLabel.stringValue = result.relativePath
let preview = result.preview.isEmpty ? " " : result.preview
previewLabel.stringValue = "\(result.lineNumber): \(preview)"
toolTip = "\(result.path):\(result.lineNumber):\(result.columnNumber)"
}

Expand Down
7 changes: 4 additions & 3 deletions Sources/FileExplorerState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ final class FileExplorerState: ObservableObject {
/// persisted).
@Published var rightSidebarOwnsInputFocus: Bool = false

/// Active mode for the right sidebar (file tree, search, sessions, or enabled beta modes).
/// Active registered tool for the right sidebar.
var mode: RightSidebarMode {
get { storedMode }
set { setMode(newValue) }
Expand Down Expand Up @@ -115,9 +115,10 @@ final class FileExplorerState: ObservableObject {
_ mode: RightSidebarMode,
defaults: UserDefaults
) -> RightSidebarMode {
if mode == .customSidebar {
let registeredMode = mode.registeredToolMode
if registeredMode == .customSidebar {
return .files
}
return mode.isAvailable(defaults: defaults) ? mode : .files
return registeredMode.isAvailable(defaults: defaults) ? registeredMode : .files
}
}
Loading
Loading