editor: Make the multiline comment folding more robust - #54102
Merged
tomhoule merged 3 commits intoApr 22, 2026
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
guild
zed-codeowner-coordinator
Bot
requested review from
a team,
cameron1024 and
dinocosta
and removed request for
a team
April 16, 2026 17:31
Contributor
|
@zed-zippy autofix |
Contributor
|
There is a rustfmt check failure, but the substance of the PR is good. Once that's fixed I think we can merge. Thank you for the contribution! |
Collaborator
Author
|
should be fixed now. (well I ran |
zed-zippy
Bot
added
the
PR state:needs review
|
Thank you so much, I really appreciate it :) |
Collaborator
Author
|
@machin3io of course! your bug report made it so easy I had to do it. |
Member
|
@zed-industries/approved |
zed-zippy
Bot
removed
the
PR state:needs review
Contributor
|
@bennetbo thanks, I forgot to approve before merging 🙈 |
kathbigra
pushed a commit
to kathbigra/zed
that referenced
this pull request
May 10, 2026
…s#54102) Basically just applied the suggested fix as described in zed-industries#53606 , I also experimented with a hackier soln. that used the same logic as the code this is replacing, but it seemed solidly worse than this version. The original issue extremely clear with what is going on / what needed to be fixed. heres a video: https://github.com/user-attachments/assets/e7fc60f7-0a8c-403c-877f-93f58f370b00 Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#53606 Release Notes: - editor: Fixed incorrect inclusion of comments into folds
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…s#54102) Basically just applied the suggested fix as described in zed-industries#53606 , I also experimented with a hackier soln. that used the same logic as the code this is replacing, but it seemed solidly worse than this version. The original issue extremely clear with what is going on / what needed to be fixed. heres a video: https://github.com/user-attachments/assets/e7fc60f7-0a8c-403c-877f-93f58f370b00 Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#53606 Release Notes: - editor: Fixed incorrect inclusion of comments into folds
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Basically just applied the suggested fix as described in #53606 , I also experimented with a hackier soln. that used the same logic as the code this is replacing, but it seemed solidly worse than this version.
The original issue extremely clear with what is going on / what needed to be fixed.
heres a video:
https://github.com/user-attachments/assets/e7fc60f7-0a8c-403c-877f-93f58f370b00
Self-Review Checklist:
Closes #53606
Release Notes: