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

Stop the searching of find in files in folders that have .gdignore #85943

Merged
merged 1 commit into from
Jan 3, 2024

Conversation

kuruk-mm
Copy link
Contributor

@kuruk-mm kuruk-mm commented Dec 8, 2023

Fixes #85935
Fixes #79375

When a .gdignore is detected. It cleans everything that was in the queue to be scanned (in the current dir) and stops the scan.

This is very helpful when you are developing for Android. The Find in files enters the res://android/build, and you get many unwanted results.

Test project:
MinimalSearchInFiles.zip

Tree files of the test project:
image

Before (with the bug):
image

After (fixed):
image

@kuruk-mm
Copy link
Contributor Author

kuruk-mm commented Dec 9, 2023

@AThousandShips i would prefer to remove the 'discussion' tag.

It's a bug.

@AThousandShips
Copy link
Member

I'd say it's important to discuss, the fact that the code existed might be evaluated, I'll keep it until we decide what path to take

Copy link
Contributor

@m4gr3d m4gr3d left a comment

Choose a reason for hiding this comment

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

The changes look good to me!

If the editor doesn't show and allow to edit / access directories with a .gdignore file, then IMO they shouldn't be shown in the search interface as well.

@m4gr3d m4gr3d modified the milestones: 4.x, 4.3 Dec 21, 2023
@m4gr3d m4gr3d requested a review from YuriSizov December 21, 2023 01:06
@YuriSizov YuriSizov requested a review from a team December 21, 2023 13:49
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Makes sense to me.

@akien-mga akien-mga merged commit 6665a62 into godotengine:master Jan 3, 2024
15 checks passed
@akien-mga
Copy link
Member

Thanks!

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