Skip to content

editor: Cancel blame popover task when opening modal#52525

Merged
dinocosta merged 5 commits intozed-industries:mainfrom
timvermeulen:modal-cancels-blame-popover-task
Apr 20, 2026
Merged

editor: Cancel blame popover task when opening modal#52525
dinocosta merged 5 commits intozed-industries:mainfrom
timvermeulen:modal-cancels-blame-popover-task

Conversation

@timvermeulen
Copy link
Copy Markdown
Contributor

Fixes a bug that causes the inline blame popover to appear after opening a modal, if that modal is opened immediately after hovering over the blame annotation.

Before:

before.mov

After:

after.mov

Self-Review Checklist

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • Fixed the inline Git blame popover sometimes appearing after opening a modal.

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Mar 26, 2026
@github-actions github-actions Bot added the community champion Issues filed by our amazing community champions! 🫶 label Mar 26, 2026
@zed-codeowner-coordinator zed-codeowner-coordinator Bot requested review from a team, as-cii and dinocosta and removed request for a team March 26, 2026 19:32
* Update the `Editor::hide_blame_popover` method implementation to avoid
  spawning a task in the foreground executor in case the timeout is to
  be ignored, that way we're not only sure that the popover is dismissed
  immediatelly, as the foreground executor can be busy with a
  long-running non-async task that will make the dismissal end up being
  delayed, and we avoid the overhead of spawning the task.
* Update the `Editor::hide_blame_popover` method's documentation.
* Simplify the `test_hide_pending_blame_popover_when_modal_opens` test,
  as it appears it was only passing because of the change in
  `Editor::selections_did_change` and not actually because the modal was
  being opened .
Copy link
Copy Markdown
Member

@dinocosta dinocosta left a comment

Choose a reason for hiding this comment

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

Thanks @timvermeulen ! 🙂

@dinocosta dinocosta enabled auto-merge (squash) April 20, 2026 12:26
@dinocosta dinocosta merged commit 34dae65 into zed-industries:main Apr 20, 2026
31 checks passed
@timvermeulen timvermeulen deleted the modal-cancels-blame-popover-task branch April 20, 2026 18:51
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 community champion Issues filed by our amazing community champions! 🫶

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants