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

workspace: Fix inconsistent paths order serialization #19232

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

eth0net
Copy link
Contributor

@eth0net eth0net commented Oct 15, 2024

Release Notes:

  • Fixed inconsistent serialization of workspace paths order

@maxdeviant maxdeviant changed the title fix(workspace): inconsistent paths order serialisation workspace: Fix inconsistent paths order serialization Oct 15, 2024
Copy link
Member

@mrnugget mrnugget left a comment

Choose a reason for hiding this comment

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

Looks good to me! I tried it out locally and it works!

Comment on lines +1129 to +1131
// todo: should probably move this logic to a method on the SerializedWorkspaceLocation
// it's only valid for Local and would be more clear there and be able to be tested
// and reused elsewhere
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I agree with that. Either move it onto the type, or move it into the and_then block above there.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I'm working on a follow-up PR to tidy things up, just wanted to get the fix in for now! ^^

@mrnugget mrnugget merged commit 398d039 into zed-industries:main Oct 17, 2024
11 checks passed
@eth0net eth0net deleted the fix-worktree-ordering branch October 17, 2024 17:14
noaccOS pushed a commit to noaccOS/zed that referenced this pull request Oct 19, 2024
…#19232)

Release Notes:

- Fixed inconsistent serialization of workspace paths order
osiewicz pushed a commit that referenced this pull request Oct 22, 2024
Release Notes:

- Fixed inconsistent serialization of workspace paths order
@notpeter notpeter added the cla-signed The user has signed the Contributor License Agreement label Nov 22, 2024
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