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

Improve consistency in file order #37796

Merged
merged 1 commit into from
May 18, 2021
Merged

Conversation

Gogsi
Copy link
Contributor

@Gogsi Gogsi commented Apr 11, 2020

Fixes #37721 by ensuring that files in EditorFileSystem and ScriptEditor are sorted using NaturalNoCaseComparator. Since EditorFileSystem will always be correctly sorted, no additional sorting is required in i.e. FileSystemDock

@Calinou Calinou added cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:editor and removed topic:editor labels Apr 11, 2020
@Calinou Calinou added this to the 4.0 milestone Apr 11, 2020
@akien-mga
Copy link
Member

akien-mga commented Apr 16, 2020

Could you squash the commits into one? The temporary showing of the reload button is not relevant to the git history.

@Gogsi
Copy link
Contributor Author

Gogsi commented Apr 16, 2020

Ok, I did it!

Copy link
Member

@KoBeWi KoBeWi left a comment

Choose a reason for hiding this comment

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

Seems fine, but needs rebase. Here's a rebased patch, just use git apply:
0001-Improve-consistency-in-file-order.patch.txt

@Gogsi Gogsi requested review from a team as code owners May 18, 2021 08:42
@akien-mga
Copy link
Member

I pushed a rebased commit to Gogsi:master so it should be ready to merge.

@akien-mga akien-mga merged commit 35edb77 into godotengine:master May 18, 2021
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistent file sort order in editor
4 participants