Support keeping results in results of `Find in Files` and `Replace in Files` by jinyangcruise · Pull Request #104676 · godotengine/godot

jinyangcruise · 2025-03-27T02:09:08Z

Closes godotengine/godot-proposals#11923

Support keeping multiple searching/replacing results.

before	after

arkology · 2025-03-27T04:11:34Z

I feel like all these 3 text buttons in future could be replaced with just 3 icons.
Lock/refresh/close is really common and easy recognizable actions to represent as icons.

editor/find_in_files.cpp

editor/find_in_files.h

editor/find_in_files.cpp

editor/find_in_files.h

editor/find_in_files.cpp

editor/find_in_files.h

lodetrick

Beyond some small things, it looks good! A note for future reviewers, the artifact in the top right is fixed in a separate PR (#107395):

editor/find_in_files.h

kitbdev

Can you rebase to fix an unrelated crash that was fixed in master?

Find in Files needs to be refactored since there are a lot of issues like variables with _ prefix, signals, organization, etc. So I'll ignore those problems for now and I'll try to refactor this later.

Functionality works well.

editor/script/find_in_files.h

editor/script/find_in_files.cpp

editor/script/find_in_files.h

editor/script/find_in_files.cpp

editor/script/find_in_files.h

jinyangcruise · 2025-11-08T06:03:38Z

@kitbdev I fixed the issues you have mentioned except the name FindInFilesTab which I'm thinking of a new name FindInFilesContainer but I'm not sure.

kitbdev

Looks good.

editor/script/find_in_files.cpp

editor/script/find_in_files.h

Repiteo · 2025-11-11T16:41:12Z

Thanks! Congratulations on your first merged contribution! 🎉

KoBeWi · 2025-11-12T12:46:39Z

editor/script/find_in_files.cpp

+	const Ref<StyleBox> bottom_panel_style = EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles));
+	if (bottom_panel_style.is_valid()) {
+		add_theme_constant_override("margin_top", -bottom_panel_style->get_margin(SIDE_TOP));
+		add_theme_constant_override("margin_left", -bottom_panel_style->get_margin(SIDE_LEFT));
+		add_theme_constant_override("margin_right", -bottom_panel_style->get_margin(SIDE_RIGHT));
+		add_theme_constant_override("margin_bottom", -bottom_panel_style->get_margin(SIDE_BOTTOM));
+	}


This is unnecessary. NOTIFICATION_THEME_CHANGED already handles it, and it's received automatically when entering tree.

Confirmed. And I also find I should use begin_bulk_theme_override/end_bulk_theme_override before/after add_theme_constant_override for 4 sides margin in _notification, avoiding unnecessary recursions. I will make a PR to fix this.

Could you please review this PR? #112704

jinyangcruise requested a review from a team as a code owner March 27, 2025 02:09

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from 96bb797 to aaaafd8 Compare March 27, 2025 08:37

AThousandShips added enhancement topic:editor labels Mar 27, 2025

AThousandShips added this to the 4.x milestone Mar 27, 2025

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from 84af7d4 to 7e718a8 Compare March 28, 2025 05:40

jinyangcruise force-pushed the find_in_files_keep_results branch from 7e718a8 to 38888c1 Compare June 11, 2025 07:25

lodetrick reviewed Jun 11, 2025

View reviewed changes

editor/find_in_files.cpp Outdated Show resolved Hide resolved

editor/find_in_files.cpp Show resolved Hide resolved

editor/find_in_files.h Outdated Show resolved Hide resolved

editor/find_in_files.cpp Outdated Show resolved Hide resolved

editor/find_in_files.h Outdated Show resolved Hide resolved

lodetrick mentioned this pull request Jun 11, 2025

Fix TabContainer Editor theming and remove Debugger style hacks #107395

Merged

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from 64b3b16 to c0c5fd9 Compare June 12, 2025 01:59

lodetrick reviewed Jun 12, 2025

View reviewed changes

editor/find_in_files.cpp Outdated Show resolved Hide resolved

jinyangcruise force-pushed the find_in_files_keep_results branch from c0c5fd9 to c4178be Compare June 12, 2025 03:29

jinyangcruise requested a review from lodetrick June 12, 2025 05:28

lodetrick reviewed Jun 12, 2025

View reviewed changes

editor/find_in_files.h Outdated Show resolved Hide resolved

editor/find_in_files.h Outdated Show resolved Hide resolved

editor/find_in_files.h Outdated Show resolved Hide resolved

jinyangcruise force-pushed the find_in_files_keep_results branch from c4178be to 9685de0 Compare June 12, 2025 08:06

lodetrick approved these changes Jun 12, 2025

View reviewed changes

editor/find_in_files.h Outdated Show resolved Hide resolved

jinyangcruise force-pushed the find_in_files_keep_results branch from 9685de0 to 1c456bd Compare June 12, 2025 08:31

arkology mentioned this pull request Jun 12, 2025

[Editor] Use Icons for FindInFiles Buttons #107431

Open

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from 05407d3 to 53ddcb4 Compare June 24, 2025 06:39

jinyangcruise force-pushed the find_in_files_keep_results branch from 53ddcb4 to 1565d54 Compare July 18, 2025 03:47

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from e52e35d to 8793058 Compare September 19, 2025 10:43

jinyangcruise force-pushed the find_in_files_keep_results branch 2 times, most recently from 3f00759 to 04dfd7a Compare November 3, 2025 03:14

kitbdev reviewed Nov 7, 2025

View reviewed changes

jinyangcruise force-pushed the find_in_files_keep_results branch from 04dfd7a to 93e1bba Compare November 8, 2025 05:54

jinyangcruise force-pushed the find_in_files_keep_results branch from 93e1bba to adf0a9a Compare November 9, 2025 01:28

AThousandShips changed the title ~~Support keeping results in results of Find in Files and Replacing in Files~~ Support keeping results in results of Find in Files and Replace in Files Nov 9, 2025

kitbdev approved these changes Nov 9, 2025

View reviewed changes

kitbdev modified the milestones: 4.x, 4.6 Nov 9, 2025

Repiteo requested a review from AThousandShips November 10, 2025 13:19

AThousandShips reviewed Nov 10, 2025

View reviewed changes

editor/script/find_in_files.cpp Outdated Show resolved Hide resolved

editor/script/find_in_files.cpp Outdated Show resolved Hide resolved

editor/script/find_in_files.h Outdated Show resolved Hide resolved

Support Keep Results in results of Find in Files

fdd0f32

jinyangcruise force-pushed the find_in_files_keep_results branch from adf0a9a to fdd0f32 Compare November 11, 2025 02:35

AThousandShips approved these changes Nov 11, 2025

View reviewed changes

Repiteo merged commit b83343f into godotengine:master Nov 11, 2025
20 checks passed

jinyangcruise deleted the find_in_files_keep_results branch November 12, 2025 01:56

KoBeWi reviewed Nov 12, 2025

View reviewed changes

This was referenced Nov 13, 2025

Remove unnecessary theme settings when constructing FindInFilesContainer #112704

Merged

Why does changing theme/language trigger find in files re-search? #112706

Closed

Uh oh!

Conversation

jinyangcruise commented Mar 27, 2025

Uh oh!

arkology commented Mar 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lodetrick left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kitbdev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jinyangcruise commented Nov 8, 2025

Uh oh!

kitbdev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Repiteo commented Nov 11, 2025

Uh oh!

KoBeWi Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

jinyangcruise Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

jinyangcruise Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

arkology commented Mar 27, 2025 •

edited

Loading