Skip to content

project_panel: Fix appending copy marker for directory at wrong position#48845

Merged
smitbarmase merged 4 commits intozed-industries:mainfrom
pigletfly:fix-dir-copy-dot
Mar 19, 2026
Merged

project_panel: Fix appending copy marker for directory at wrong position#48845
smitbarmase merged 4 commits intozed-industries:mainfrom
pigletfly:fix-dir-copy-dot

Conversation

@pigletfly
Copy link
Copy Markdown
Contributor

@pigletfly pigletfly commented Feb 10, 2026

Closes #48765

Release Notes:

  • Fixed appends copy marker for copied file in the wrong position of filename

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 10, 2026
@pigletfly pigletfly changed the title Fix duplicate name for dotted directories Fixed appends copy marker for copied file in the wrong position of filename Feb 10, 2026
@maxdeviant maxdeviant changed the title Fixed appends copy marker for copied file in the wrong position of filename Fix appending copy marker for copied file in the wrong position of filename Feb 10, 2026
Copy link
Copy Markdown
Member

@smitbarmase smitbarmase 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 fixing this, I added some comments.

pigletfly and others added 4 commits March 19, 2026 12:19
Treat directory names as having no extension when adding the ' copy' suffix.

Adds a regression test for duplicating '1.20'.
Copy link
Copy Markdown
Member

@smitbarmase smitbarmase left a comment

Choose a reason for hiding this comment

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

I updated it. Thanks!

@smitbarmase smitbarmase changed the title Fix appending copy marker for copied file in the wrong position of filename project_panel: Fix appending copy marker for directory at wrong position Mar 19, 2026
@smitbarmase smitbarmase merged commit 927cc30 into zed-industries:main Mar 19, 2026
31 checks passed
AmaanBilwar pushed a commit to AmaanBilwar/zed that referenced this pull request Mar 20, 2026
…ion (zed-industries#48845)

Closes zed-industries#48765 


Release Notes:

- Fixed appends copy marker for copied file in the wrong position of
filename

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
toshmukhamedov pushed a commit to toshmukhamedov/zed that referenced this pull request Mar 20, 2026
…ion (zed-industries#48845)

Closes zed-industries#48765 


Release Notes:

- Fixed appends copy marker for copied file in the wrong position of
filename

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
AmaanBilwar pushed a commit to AmaanBilwar/zed that referenced this pull request Mar 23, 2026
…ion (zed-industries#48845)

Closes zed-industries#48765 


Release Notes:

- Fixed appends copy marker for copied file in the wrong position of
filename

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
@pigletfly pigletfly deleted the fix-dir-copy-dot branch April 2, 2026 02:34
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.

Zed appends copy marker for copied file in the wrong position of filename

3 participants