Skip to content
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

Revert "Add support of auto folded directories" #8476

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

as-cii
Copy link
Member

@as-cii as-cii commented Feb 27, 2024

Reverts #7674

@ABckh: reverting this as it introduced a significant performance slowdown, most likely caused by iterating through all the snapshot entries to determine whether a directory is foldable/unfoldable/omitted. It would be great if you could open a new PR that reverts this revert and addresses the performance issues. Thank you!

/cc: @maxbrunsfeld

Release notes:

  • N/A

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 27, 2024
Copy link

Warnings
⚠️

This PR is missing release notes.

Please add a "Release Notes" section that describes the change:

Release Notes:

- (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).

If your change is not user-facing, you can use "N/A" for the entry:

Release Notes:

- N/A

Generated by 🚫 dangerJS against 2b0b908

@as-cii as-cii merged commit 7cbdea2 into main Feb 27, 2024
9 checks passed
@as-cii as-cii deleted the revert-7674-auto-folded-dirs branch February 27, 2024 10:26
@ABckh
Copy link
Contributor

ABckh commented Feb 27, 2024

Reverts #7674

@ABckh: reverting this as it introduced a significant performance slowdown, most likely caused by iterating through all the snapshot entries to determine whether a directory is foldable/unfoldable/omitted. It would be great if you could open a new PR that reverts this revert and addresses the performance issues. Thank you!

/cc: @maxbrunsfeld

Release notes:

  • N/A

Hello @as-cii, I am really sorry for such inconvenience. I have tested it on a small project where it worked smoothly, this was my mistake. Will try to find a way to not iterate over all entries

@maxbrunsfeld
Copy link
Collaborator

No worries, @ABckh. I should have caught that performance issue in my review.

mikayla-maki added a commit that referenced this pull request Apr 12, 2024
Fixed auto folded dirs which caused significant performance issues #8476
(#7674)

Moved from iterating over snapshot entries to use `child_entries`
function from `worktree.rs` by making it public

@maxbrunsfeld 

Release Notes:

- Fixed a bug where project panel settings changes would not be applied
immediately.
- Added a `project_panel.auto_fold_dirs` setting which collapses the
nesting in the project panel when there is a chain of folders containing
a single folder.
<img width="288" alt="Screenshot 2024-04-12 at 11 10 58 AM"
src="https://github.com/zed-industries/zed/assets/2280405/efd61e75-026c-464d-ba4d-90db5f68bad3">

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
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.

3 participants