From 475579835c652c437887970ad576adf275bbaf19 Mon Sep 17 00:00:00 2001
From: Giganzo <158825920+Giganzo@users.noreply.github.com>
Date: Mon, 2 Mar 2026 22:19:22 +0100
Subject: [PATCH] Fix replace button highlight next occurrence

---
 editor/gui/code_editor.cpp | 7 ++++++-
 editor/gui/code_editor.h   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/editor/gui/code_editor.cpp b/editor/gui/code_editor.cpp
index 3b99d3b436..cfb7923ea3 100644
--- a/editor/gui/code_editor.cpp
+++ b/editor/gui/code_editor.cpp
@@ -698,6 +698,11 @@ void FindReplaceBar::_replace_text_submitted(const String &p_text) {
 	}
 }
 
+void FindReplaceBar::_replace_button_pressed() {
+	_replace();
+	search_next();
+}
+
 void FindReplaceBar::_toggle_replace_pressed() {
 	bool replace_visible = replace_text->is_visible_in_tree();
 	replace_visible ? popup_search(true) : popup_replace();
@@ -841,7 +846,7 @@ FindReplaceBar::FindReplaceBar() {
 	replace = memnew(Button);
 	hbc_button_replace->add_child(replace);
 	replace->set_text(TTRC("Replace"));
-	replace->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_replace));
+	replace->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_replace_button_pressed));
 
 	replace_all = memnew(Button);
 	hbc_button_replace->add_child(replace_all);
diff --git a/editor/gui/code_editor.h b/editor/gui/code_editor.h
index 7f99820216..8b630c132e 100644
--- a/editor/gui/code_editor.h
+++ b/editor/gui/code_editor.h
@@ -117,6 +117,7 @@ class FindReplaceBar : public HBoxContainer {
 	void _search_text_changed(const String &p_text);
 	void _search_text_submitted(const String &p_text);
 	void _replace_text_submitted(const String &p_text);
+	void _replace_button_pressed();
 	void _toggle_replace_pressed();
 
 protected: