Skip to content

Fix macOS find query seeding#56681

Merged
ChristopherBiscardi merged 1 commit into
mainfrom
fix-macos-find-query-seeding
May 13, 2026
Merged

Fix macOS find query seeding#56681
ChristopherBiscardi merged 1 commit into
mainfrom
fix-macos-find-query-seeding

Conversation

@nathansobo

@nathansobo nathansobo commented May 13, 2026

Copy link
Copy Markdown
Contributor

Closes #55619

Summary

  • Route buffer_search::UseSelectionForFind through BufferSearchBar::deploy instead of updating the query editor directly.
  • Add an explicit seed-query override to deploy, so the Cmd-E action can force SeedQuerySetting::Always while regular deploy callers continue to pass None and respect the user’s seed_search_query_from_cursor setting.
  • By going through deploy, Cmd-E now also runs the search path that keeps buffer-search navigation state in sync:
    • shows/initializes the search bar for the active searchable item
    • applies the seeded query via search_suggested
    • calls search, which updates the query editor, search options, active search query, search history, and macOS find pasteboard
    • refreshes searchable_items_with_matches and active_match_index
    • activates the current match after the search completes
  • This ensures the subsequent Cmd-G action has the expected active query, match list, search token, and active match index to select the next result.
  • Add a macOS-only end-to-end regression test using the default macOS keymap with simulate_keystrokes("cmd-e") and simulate_keystrokes("cmd-g").

Validation

  • cargo test -p search test_cmd_e_then_cmd_g_uses_selection_for_find
  • cargo fmt --check --package search --package zed_actions
  • ./script/check-keymaps
  • cargo check -p search
  • cargo check -p workspace
  • cargo check -p vim

Release Notes:

  • Fixed macOS Cmd-E/Cmd-G find behavior so Cmd-E seeds find from the cursor or selection and Cmd-G advances through the newly seeded matches.

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 13, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label May 13, 2026
@nathansobo nathansobo force-pushed the fix-macos-find-query-seeding branch from 9b129b0 to 385a3ec Compare May 13, 2026 20:40

@ChristopherBiscardi ChristopherBiscardi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works as intended. Search bar now shows every time when using Cmd+E, which seems to be an intentional change.

@ChristopherBiscardi ChristopherBiscardi added this pull request to the merge queue May 13, 2026
Merged via the queue into main with commit 3a8d012 May 13, 2026
33 checks passed
@ChristopherBiscardi ChristopherBiscardi deleted the fix-macos-find-query-seeding branch May 13, 2026 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cmd-e/cmd-g behaviour is broken

2 participants