Skip to content

Fix diff indicators not restored when reopening remote project #31384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 17, 2025

Conversation

feeiyu
Copy link
Contributor

@feeiyu feeiyu commented May 25, 2025

Closes #30917

Release Notes:

  • Fix diff indicators not restored when reopening remote project

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label May 25, 2025
Copy link
Collaborator

@maxbrunsfeld maxbrunsfeld left a comment

Choose a reason for hiding this comment

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

Thanks for the investigation and fix @feeiyu. Nice work. Would you be open to adding a test to cover this fix, and prevent regressions? I think it's important for this fix, to help to make sure it's possible to refactor this without breaking it.

I think the best place for the test would be in remote_editing_tests.rs, similar to an existing test, test_remote_git_diffs.

@feeiyu
Copy link
Contributor Author

feeiyu commented May 27, 2025

Thank you for the review! I'll try to add test cases for these changes.

@feeiyu feeiyu requested a review from maxbrunsfeld June 2, 2025 16:45
@cole-miller cole-miller force-pushed the fix_diff_indicator branch from a4523bf to b3833e2 Compare June 6, 2025 17:54
@cole-miller cole-miller requested review from cole-miller and removed request for maxbrunsfeld June 17, 2025 14:03
@cole-miller cole-miller dismissed maxbrunsfeld’s stale review June 17, 2025 14:05

The requested test has been added and I've checked that it fails when the original patch is reverted, so I think this is good to go.

Copy link
Contributor

@cole-miller cole-miller left a comment

Choose a reason for hiding this comment

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

Thanks @feeiyu!

@cole-miller cole-miller merged commit c766f52 into zed-industries:main Jun 17, 2025
21 checks passed
@feeiyu feeiyu deleted the fix_diff_indicator branch June 19, 2025 11:08
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Diff indicators not restored when reopening remote project
3 participants