From fea517b1dfd334ba465673749866c992a15ab84b Mon Sep 17 00:00:00 2001
From: Cronos87 <cronos87@hotmail.fr>
Date: Thu, 22 Aug 2024 18:10:00 +0200
Subject: [PATCH 1/5] Autofill comment when inserting a new line while being on
 a documentation comment line

---
 core/object/script_language.h             |   1 +
 core/object/script_language_extension.cpp |   1 +
 core/object/script_language_extension.h   |  14 +++
 doc/classes/ScriptLanguageExtension.xml   |   5 ++
 editor/plugins/script_text_editor.cpp     | 102 ++++++++++++++++++++++
 editor/plugins/script_text_editor.h       |   2 +
 modules/gdscript/gdscript.h               |   1 +
 modules/gdscript/gdscript_editor.cpp      |   9 ++
 modules/mono/csharp_script.cpp            |  15 ++++
 modules/mono/csharp_script.h              |   1 +
 scene/gui/code_edit.cpp                   |  10 +++
 scene/gui/code_edit.h                     |   3 +
 12 files changed, 164 insertions(+)

diff --git a/core/object/script_language.h b/core/object/script_language.h
index 6ceeb4287512..3487c35c38ae 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -263,6 +263,7 @@ class ScriptLanguage : public Object {
 	virtual bool is_control_flow_keyword(const String &p_string) const = 0;
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0;
 	virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const = 0;
+	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const = 0;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const = 0;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const { return Ref<Script>(); }
 	virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) { return Vector<ScriptTemplate>(); }
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index 336f980dc9b8..ddc6ee42607b 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -97,6 +97,7 @@ void ScriptLanguageExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_is_control_flow_keyword, "keyword");
 	GDVIRTUAL_BIND(_get_comment_delimiters);
 	GDVIRTUAL_BIND(_get_doc_comment_delimiters);
+	GDVIRTUAL_BIND(_get_doc_comment_block_delimiters);
 	GDVIRTUAL_BIND(_get_string_delimiters);
 	GDVIRTUAL_BIND(_make_template, "template", "class_name", "base_class_name");
 	GDVIRTUAL_BIND(_get_built_in_templates, "object");
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index 09c395e71e8d..29ed72ecff7f 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -271,6 +271,20 @@ class ScriptLanguageExtension : public ScriptLanguage {
 		}
 	}
 
+	GDVIRTUAL0RC(Vector<String>, _get_doc_comment_block_delimiters)
+
+	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_words) const override {
+		Vector<String> ret;
+		GDVIRTUAL_CALL(_get_doc_comment_block_delimiters, ret);
+		for (const String &delimiter : ret) {
+			HashMap<String, String> word;
+			word["delimiter_begin"] = delimiter;
+			word["delimiter_block"] = "";
+			word["delimiter_end"] = "";
+			p_words->push_back(word);
+		}
+	}
+
 	GDVIRTUAL0RC_REQUIRED(Vector<String>, _get_string_delimiters)
 
 	virtual void get_string_delimiters(List<String> *p_words) const override {
diff --git a/doc/classes/ScriptLanguageExtension.xml b/doc/classes/ScriptLanguageExtension.xml
index 40e56478c51c..726fc01d55e3 100644
--- a/doc/classes/ScriptLanguageExtension.xml
+++ b/doc/classes/ScriptLanguageExtension.xml
@@ -153,6 +153,11 @@
 			<description>
 			</description>
 		</method>
+		<method name="_get_doc_comment_block_delimiters" qualifiers="virtual const">
+			<return type="PackedStringArray" />
+			<description>
+			</description>
+		</method>
 		<method name="_get_doc_comment_delimiters" qualifiers="virtual const">
 			<return type="PackedStringArray" />
 			<description>
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index ac8b4a414c79..e06a22aa15c1 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1420,6 +1420,107 @@ void ScriptTextEditor::_gutter_clicked(int p_line, int p_gutter) {
 	}
 }
 
+void ScriptTextEditor::_auto_fill_doc_comments(bool p_above) {
+	CodeEdit *tx = code_editor->get_text_editor();
+
+	if (tx->get_comment_delimiters().is_empty()) {
+		return;
+	}
+
+	List<HashMap<String, String>> doc_comments_block;
+	script->get_language()->get_doc_comment_block_delimiters(&doc_comments_block);
+
+	// Store the operations to apply, as complex operations need to be used only if comments are added.
+	List<Vector<Variant>> operations;
+
+	for (int i = 0; i < tx->get_caret_count(); i++) {
+		if (tx->multicaret_edit_ignore_caret(i)) {
+			continue;
+		}
+
+		const int cl = p_above ? (tx->get_caret_line(i) + 1) : (tx->get_caret_line(i) - 1);
+		const String line = tx->get_line(cl);
+
+		if (tx->is_in_comment(cl) != -1) {
+			for (const HashMap<String, String> &doc_comment_block : doc_comments_block) {
+				const String delimiter_begin = doc_comment_block["delimiter_begin"];
+				const String delimiter_block = doc_comment_block["delimiter_block"];
+				const String delimiter_end = doc_comment_block["delimiter_end"];
+				const bool is_inline_delimiter = delimiter_end.is_empty();
+				String line_strip = line.strip_edges();
+
+				// Case for inline comments.
+				if (is_inline_delimiter) {
+					if (line_strip.begins_with(delimiter_begin)) {
+						operations.push_back({ i, delimiter_begin });
+						break;
+					}
+
+					continue;
+				}
+
+				// Case when the caret is on the same line as a block comment.
+				if (!p_above && line_strip.begins_with(delimiter_begin)) {
+					const String next_line = tx->get_line(cl + 1);
+
+					if (next_line.ends_with(delimiter_end.strip_edges())) {
+						const int non_whitespace_column = tx->get_first_non_whitespace_column(cl);
+						const String indent = line.substr(0, non_whitespace_column);
+
+						operations.push_back({ i, vformat("%s \n%s", delimiter_block, indent), cl + 1 });
+						break;
+					}
+
+					operations.push_back({ i, delimiter_block });
+					break;
+				}
+
+				// Case when the caret is on the same line as the end delimiter.
+				if (p_above && line_strip.ends_with(delimiter_end)) {
+					operations.push_back({ i, delimiter_block });
+					break;
+				}
+
+				// Case when the caret is in a block comment; needs to go up to
+				// find the beginning of the current doc comment.
+				for (int j = cl - 1; j >= 0; --j) {
+					line_strip = tx->get_line(j).strip_edges();
+
+					if (tx->is_in_comment(j) == -1) {
+						break;
+					}
+
+					if (line_strip.begins_with(delimiter_begin)) {
+						operations.push_back({ i, delimiter_block });
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!operations.is_empty()) {
+		tx->begin_complex_operation();
+
+		for (const Vector<Variant> &op : operations) {
+			const int caret = op[0];
+			const String delimiter = op[1].operator String();
+
+			tx->insert_text_at_caret(delimiter + " ", caret);
+
+			if (op.size() == 3) {
+				const int line_to_move_on = op[2];
+				const int line_length = tx->get_line(line_to_move_on).length();
+				tx->set_caret_line(line_to_move_on, false, true, -1, caret);
+				tx->set_caret_column(line_length, false, caret);
+			}
+		}
+
+		tx->merge_overlapping_carets();
+		tx->end_complex_operation();
+	}
+}
+
 void ScriptTextEditor::_edit_option(int p_op) {
 	CodeEdit *tx = code_editor->get_text_editor();
 	tx->apply_ime();
@@ -2484,6 +2585,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	code_editor->get_text_editor()->set_draw_executing_lines_gutter(true);
 	code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
 	code_editor->get_text_editor()->connect("caret_changed", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
+	code_editor->get_text_editor()->add_new_line_actions(callable_mp(this, &ScriptTextEditor::_auto_fill_doc_comments));
 	code_editor->connect("navigation_preview_ended", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
 
 	connection_gutter = 1;
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 0b81490d39a4..81020e557dc1 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -101,6 +101,8 @@ class ScriptTextEditor : public ScriptEditorBase {
 	Color folded_code_region_color = Color(1, 1, 1);
 	int previous_line = 0;
 
+	void _auto_fill_doc_comments(bool p_above);
+
 	PopupPanel *color_panel = nullptr;
 	ColorPicker *color_picker = nullptr;
 	Vector2 color_position;
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index ed04482f4811..a471240cf0b3 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -576,6 +576,7 @@ class GDScriptLanguage : public ScriptLanguage {
 	virtual bool is_control_flow_keyword(const String &p_keywords) const override;
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const override;
 	virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
+	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const override;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const override;
 	virtual bool is_using_templates() override;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index c20c17f34860..4d39418a769d 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -59,6 +59,15 @@ void GDScriptLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) co
 	p_delimiters->push_back("##");
 }
 
+void GDScriptLanguage::get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const {
+	HashMap<String, String> first;
+	first["delimiter_begin"] = "##";
+	first["delimiter_block"] = "";
+	first["delimiter_end"] = "";
+
+	p_delimiters->push_back(first);
+}
+
 void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
 	p_delimiters->push_back("\" \"");
 	p_delimiters->push_back("' '");
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index b908fe9df853..de150b09ee47 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -341,6 +341,21 @@ void CSharpLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) cons
 	p_delimiters->push_back("/** */"); // delimited doc comment
 }
 
+void CSharpLanguage::get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const {
+	HashMap<String, String> first;
+	first["delimiter_begin"] = "///";
+	first["delimiter_block"] = "";
+	first["delimiter_end"] = "";
+
+	HashMap<String, String> second;
+	second["delimiter_begin"] = "/**";
+	second["delimiter_block"] = " *";
+	second["delimiter_end"] = "*/";
+
+	p_delimiters->push_back(first);
+	p_delimiters->push_back(second);
+}
+
 void CSharpLanguage::get_string_delimiters(List<String> *p_delimiters) const {
 	p_delimiters->push_back("' '"); // character literal
 	p_delimiters->push_back("\" \""); // regular string literal
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 525357a4c413..0c105c334cc6 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -504,6 +504,7 @@ class CSharpLanguage : public ScriptLanguage {
 	bool is_control_flow_keyword(const String &p_keyword) const override;
 	void get_comment_delimiters(List<String> *p_delimiters) const override;
 	void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
+	void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const override;
 	void get_string_delimiters(List<String> *p_delimiters) const override;
 	bool is_using_templates() override;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index 8e8d5774263f..1fac512687ac 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -1196,6 +1196,16 @@ void CodeEdit::_new_line(bool p_split_current_line, bool p_above) {
 
 	end_multicaret_edit();
 	end_complex_operation();
+
+	if (new_lines_actions.size() > 0) {
+		for (Callable &action : new_lines_actions) {
+			action.call_deferred(p_above);
+		}
+	}
+}
+
+void CodeEdit::add_new_line_actions(const Callable &p_action) {
+	new_lines_actions.push_back(p_action);
 }
 
 /* Auto brace completion */
diff --git a/scene/gui/code_edit.h b/scene/gui/code_edit.h
index dbba5c23ded1..ca9e3d2b23f9 100644
--- a/scene/gui/code_edit.h
+++ b/scene/gui/code_edit.h
@@ -311,6 +311,7 @@ class CodeEdit : public TextEdit {
 	void _text_changed();
 
 	void _apply_project_settings();
+	Vector<Callable> new_lines_actions;
 
 protected:
 	void _notification(int p_what);
@@ -516,6 +517,8 @@ class CodeEdit : public TextEdit {
 	void duplicate_selection();
 	void duplicate_lines();
 
+	void add_new_line_actions(const Callable &p_action);
+
 	CodeEdit();
 	~CodeEdit();
 };

From 84545f95a7962e607937de0d9d114617830d3e7c Mon Sep 17 00:00:00 2001
From: Cronos87 <cronos87@hotmail.fr>
Date: Sun, 6 Oct 2024 01:40:38 +0200
Subject: [PATCH 2/5] Move behavior into CodeEdit

---
 core/object/script_language.h             |   2 +-
 core/object/script_language_extension.cpp |   2 +-
 core/object/script_language_extension.h   |  12 +--
 doc/classes/ScriptLanguageExtension.xml   |  10 +-
 editor/plugins/script_text_editor.cpp     | 106 +---------------------
 editor/plugins/script_text_editor.h       |   2 -
 modules/gdscript/gdscript.h               |   2 +-
 modules/gdscript/gdscript_editor.cpp      |  10 +-
 modules/mono/csharp_script.cpp            |  17 +---
 modules/mono/csharp_script.h              |   2 +-
 scene/gui/code_edit.cpp                   |  88 ++++++++++++++++--
 scene/gui/code_edit.h                     |   8 +-
 12 files changed, 112 insertions(+), 149 deletions(-)

diff --git a/core/object/script_language.h b/core/object/script_language.h
index 3487c35c38ae..ae7eca803934 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -263,7 +263,7 @@ class ScriptLanguage : public Object {
 	virtual bool is_control_flow_keyword(const String &p_string) const = 0;
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0;
 	virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const = 0;
-	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const = 0;
+	virtual void get_block_key_delimiters(List<String> *p_delimiters) const = 0;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const = 0;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const { return Ref<Script>(); }
 	virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) { return Vector<ScriptTemplate>(); }
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index ddc6ee42607b..0ecc8014e127 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -97,7 +97,7 @@ void ScriptLanguageExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_is_control_flow_keyword, "keyword");
 	GDVIRTUAL_BIND(_get_comment_delimiters);
 	GDVIRTUAL_BIND(_get_doc_comment_delimiters);
-	GDVIRTUAL_BIND(_get_doc_comment_block_delimiters);
+	GDVIRTUAL_BIND(_get_block_key_delimiters);
 	GDVIRTUAL_BIND(_get_string_delimiters);
 	GDVIRTUAL_BIND(_make_template, "template", "class_name", "base_class_name");
 	GDVIRTUAL_BIND(_get_built_in_templates, "object");
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index 29ed72ecff7f..cf134765c323 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -271,17 +271,13 @@ class ScriptLanguageExtension : public ScriptLanguage {
 		}
 	}
 
-	GDVIRTUAL0RC(Vector<String>, _get_doc_comment_block_delimiters)
+	GDVIRTUAL0RC(Vector<String>, _get_block_key_delimiters)
 
-	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_words) const override {
+	virtual void get_block_key_delimiters(List<String> *p_words) const override {
 		Vector<String> ret;
-		GDVIRTUAL_CALL(_get_doc_comment_block_delimiters, ret);
+		GDVIRTUAL_CALL(_get_block_key_delimiters, ret);
 		for (const String &delimiter : ret) {
-			HashMap<String, String> word;
-			word["delimiter_begin"] = delimiter;
-			word["delimiter_block"] = "";
-			word["delimiter_end"] = "";
-			p_words->push_back(word);
+			p_words->push_back(delimiter);
 		}
 	}
 
diff --git a/doc/classes/ScriptLanguageExtension.xml b/doc/classes/ScriptLanguageExtension.xml
index 726fc01d55e3..21cd3a7e7969 100644
--- a/doc/classes/ScriptLanguageExtension.xml
+++ b/doc/classes/ScriptLanguageExtension.xml
@@ -142,6 +142,11 @@
 			<description>
 			</description>
 		</method>
+		<method name="_get_block_key_delimiters" qualifiers="virtual const">
+			<return type="PackedStringArray" />
+			<description>
+			</description>
+		</method>
 		<method name="_get_built_in_templates" qualifiers="virtual const">
 			<return type="Dictionary[]" />
 			<param index="0" name="object" type="StringName" />
@@ -153,11 +158,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="_get_doc_comment_block_delimiters" qualifiers="virtual const">
-			<return type="PackedStringArray" />
-			<description>
-			</description>
-		</method>
 		<method name="_get_doc_comment_delimiters" qualifiers="virtual const">
 			<return type="PackedStringArray" />
 			<description>
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index e06a22aa15c1..35ab770476f4 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -263,6 +263,11 @@ void ScriptTextEditor::_set_theme_for_script() {
 			text_edit->add_auto_brace_completion_pair(beg, end);
 		}
 	}
+
+	List<String> block_key_delimiters;
+	script->get_language()->get_block_key_delimiters(&block_key_delimiters);
+
+	text_edit->set_block_key_delimiters(&block_key_delimiters);
 }
 
 void ScriptTextEditor::_show_errors_panel(bool p_show) {
@@ -1420,107 +1425,6 @@ void ScriptTextEditor::_gutter_clicked(int p_line, int p_gutter) {
 	}
 }
 
-void ScriptTextEditor::_auto_fill_doc_comments(bool p_above) {
-	CodeEdit *tx = code_editor->get_text_editor();
-
-	if (tx->get_comment_delimiters().is_empty()) {
-		return;
-	}
-
-	List<HashMap<String, String>> doc_comments_block;
-	script->get_language()->get_doc_comment_block_delimiters(&doc_comments_block);
-
-	// Store the operations to apply, as complex operations need to be used only if comments are added.
-	List<Vector<Variant>> operations;
-
-	for (int i = 0; i < tx->get_caret_count(); i++) {
-		if (tx->multicaret_edit_ignore_caret(i)) {
-			continue;
-		}
-
-		const int cl = p_above ? (tx->get_caret_line(i) + 1) : (tx->get_caret_line(i) - 1);
-		const String line = tx->get_line(cl);
-
-		if (tx->is_in_comment(cl) != -1) {
-			for (const HashMap<String, String> &doc_comment_block : doc_comments_block) {
-				const String delimiter_begin = doc_comment_block["delimiter_begin"];
-				const String delimiter_block = doc_comment_block["delimiter_block"];
-				const String delimiter_end = doc_comment_block["delimiter_end"];
-				const bool is_inline_delimiter = delimiter_end.is_empty();
-				String line_strip = line.strip_edges();
-
-				// Case for inline comments.
-				if (is_inline_delimiter) {
-					if (line_strip.begins_with(delimiter_begin)) {
-						operations.push_back({ i, delimiter_begin });
-						break;
-					}
-
-					continue;
-				}
-
-				// Case when the caret is on the same line as a block comment.
-				if (!p_above && line_strip.begins_with(delimiter_begin)) {
-					const String next_line = tx->get_line(cl + 1);
-
-					if (next_line.ends_with(delimiter_end.strip_edges())) {
-						const int non_whitespace_column = tx->get_first_non_whitespace_column(cl);
-						const String indent = line.substr(0, non_whitespace_column);
-
-						operations.push_back({ i, vformat("%s \n%s", delimiter_block, indent), cl + 1 });
-						break;
-					}
-
-					operations.push_back({ i, delimiter_block });
-					break;
-				}
-
-				// Case when the caret is on the same line as the end delimiter.
-				if (p_above && line_strip.ends_with(delimiter_end)) {
-					operations.push_back({ i, delimiter_block });
-					break;
-				}
-
-				// Case when the caret is in a block comment; needs to go up to
-				// find the beginning of the current doc comment.
-				for (int j = cl - 1; j >= 0; --j) {
-					line_strip = tx->get_line(j).strip_edges();
-
-					if (tx->is_in_comment(j) == -1) {
-						break;
-					}
-
-					if (line_strip.begins_with(delimiter_begin)) {
-						operations.push_back({ i, delimiter_block });
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	if (!operations.is_empty()) {
-		tx->begin_complex_operation();
-
-		for (const Vector<Variant> &op : operations) {
-			const int caret = op[0];
-			const String delimiter = op[1].operator String();
-
-			tx->insert_text_at_caret(delimiter + " ", caret);
-
-			if (op.size() == 3) {
-				const int line_to_move_on = op[2];
-				const int line_length = tx->get_line(line_to_move_on).length();
-				tx->set_caret_line(line_to_move_on, false, true, -1, caret);
-				tx->set_caret_column(line_length, false, caret);
-			}
-		}
-
-		tx->merge_overlapping_carets();
-		tx->end_complex_operation();
-	}
-}
-
 void ScriptTextEditor::_edit_option(int p_op) {
 	CodeEdit *tx = code_editor->get_text_editor();
 	tx->apply_ime();
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 81020e557dc1..0b81490d39a4 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -101,8 +101,6 @@ class ScriptTextEditor : public ScriptEditorBase {
 	Color folded_code_region_color = Color(1, 1, 1);
 	int previous_line = 0;
 
-	void _auto_fill_doc_comments(bool p_above);
-
 	PopupPanel *color_panel = nullptr;
 	ColorPicker *color_picker = nullptr;
 	Vector2 color_position;
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index a471240cf0b3..45120db58140 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -576,7 +576,7 @@ class GDScriptLanguage : public ScriptLanguage {
 	virtual bool is_control_flow_keyword(const String &p_keywords) const override;
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const override;
 	virtual void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
-	virtual void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const override;
+	virtual void get_block_key_delimiters(List<String> *p_delimiters) const override;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const override;
 	virtual bool is_using_templates() override;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index 4d39418a769d..0e99e6e9a223 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -59,13 +59,9 @@ void GDScriptLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) co
 	p_delimiters->push_back("##");
 }
 
-void GDScriptLanguage::get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const {
-	HashMap<String, String> first;
-	first["delimiter_begin"] = "##";
-	first["delimiter_block"] = "";
-	first["delimiter_end"] = "";
-
-	p_delimiters->push_back(first);
+void GDScriptLanguage::get_block_key_delimiters(List<String> *p_delimiters) const {
+	p_delimiters->push_back("##");
+	p_delimiters->push_back("#");
 }
 
 void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index de150b09ee47..05194a0c988b 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -341,19 +341,10 @@ void CSharpLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) cons
 	p_delimiters->push_back("/** */"); // delimited doc comment
 }
 
-void CSharpLanguage::get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const {
-	HashMap<String, String> first;
-	first["delimiter_begin"] = "///";
-	first["delimiter_block"] = "";
-	first["delimiter_end"] = "";
-
-	HashMap<String, String> second;
-	second["delimiter_begin"] = "/**";
-	second["delimiter_block"] = " *";
-	second["delimiter_end"] = "*/";
-
-	p_delimiters->push_back(first);
-	p_delimiters->push_back(second);
+void CSharpLanguage::get_block_key_delimiters(List<String> *p_delimiters) const {
+	p_delimiters->push_back("///");
+	p_delimiters->push_back("//");
+	p_delimiters->push_back("/**| *|*/");
 }
 
 void CSharpLanguage::get_string_delimiters(List<String> *p_delimiters) const {
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 0c105c334cc6..55243381dc72 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -504,7 +504,7 @@ class CSharpLanguage : public ScriptLanguage {
 	bool is_control_flow_keyword(const String &p_keyword) const override;
 	void get_comment_delimiters(List<String> *p_delimiters) const override;
 	void get_doc_comment_delimiters(List<String> *p_delimiters) const override;
-	void get_doc_comment_block_delimiters(List<HashMap<String, String>> *p_delimiters) const override;
+	void get_block_key_delimiters(List<String> *p_delimiters) const override;
 	void get_string_delimiters(List<String> *p_delimiters) const override;
 	bool is_using_templates() override;
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index 1fac512687ac..3e9c92f83bb8 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -1192,20 +1192,82 @@ void CodeEdit::_new_line(bool p_split_current_line, bool p_above) {
 			set_caret_line(get_caret_line(i) - 1, false, true, 0, i);
 			set_caret_column(get_line(get_caret_line(i)).length(), i == 0, i);
 		}
+
+		_auto_fill_doc_comments(i, p_above);
 	}
 
 	end_multicaret_edit();
 	end_complex_operation();
+}
 
-	if (new_lines_actions.size() > 0) {
-		for (Callable &action : new_lines_actions) {
-			action.call_deferred(p_above);
-		}
+void CodeEdit::_auto_fill_doc_comments(int caret, bool p_above) {
+	if (block_key_delimiters.is_empty()) {
+		return;
 	}
-}
 
-void CodeEdit::add_new_line_actions(const Callable &p_action) {
-	new_lines_actions.push_back(p_action);
+	const int cl = p_above ? (get_caret_line(caret) + 1) : (get_caret_line(caret) - 1);
+	const String line = get_line(cl);
+
+	if (is_in_comment(cl) != -1) {
+		for (const String &block_key : block_key_delimiters) {
+			const String delimiter_begin = block_key.get_slice("|", 0);
+			const String delimiter_block = block_key.get_slice("|", 1);
+			const String delimiter_end = block_key.get_slice("|", 2);
+			String line_strip = line.strip_edges();
+
+			// Case for inline comments.
+			if (delimiter_begin == delimiter_end) {
+				if (line_strip.begins_with(delimiter_begin)) {
+					insert_text_at_caret(delimiter_begin + " ", caret);
+					break;
+				}
+
+				continue;
+			}
+
+			// Case when the caret is on the same line as a block comment.
+			if (!p_above && line_strip.begins_with(delimiter_begin)) {
+				const String next_line = get_line(cl + 1);
+
+				if (next_line.ends_with(delimiter_end.strip_edges())) {
+					const int non_whitespace_column = get_first_non_whitespace_column(cl);
+					const String indent = line.substr(0, non_whitespace_column);
+
+					insert_text_at_caret(delimiter_begin + " ", caret);
+
+					const int line_to_move_on = cl + 1;
+					const int line_length = get_line(line_to_move_on).length();
+					set_caret_line(line_to_move_on, false, true, -1, caret);
+					set_caret_column(line_length, false, caret);
+					break;
+				}
+
+				insert_text_at_caret(delimiter_begin + " ", caret);
+				break;
+			}
+
+			// Case when the caret is on the same line as the end delimiter.
+			if (p_above && line_strip.ends_with(delimiter_end)) {
+				insert_text_at_caret(delimiter_begin + " ", caret);
+				break;
+			}
+
+			// Case when the caret is in a block comment; needs to go up to
+			// find the beginning of the current doc comment.
+			for (int j = cl - 1; j >= 0; --j) {
+				line_strip = get_line(j).strip_edges();
+
+				if (is_in_comment(j) == -1) {
+					break;
+				}
+
+				if (line_strip.begins_with(delimiter_begin)) {
+					insert_text_at_caret(delimiter_begin + " ", caret);
+					break;
+				}
+			}
+		}
+	}
 }
 
 /* Auto brace completion */
@@ -2064,6 +2126,18 @@ Point2 CodeEdit::get_delimiter_end_position(int p_line, int p_column) const {
 	return end_position;
 }
 
+Vector<String> CodeEdit::get_block_key_delimiters() const {
+	return block_key_delimiters;
+}
+
+void CodeEdit::set_block_key_delimiters(const List<String> *p_delimiters) {
+	block_key_delimiters.clear();
+
+	for (const String &delimiter : *p_delimiters) {
+		block_key_delimiters.push_back(delimiter);
+	}
+}
+
 /* Code hint */
 void CodeEdit::set_code_hint(const String &p_hint) {
 	if (code_hint == p_hint) {
diff --git a/scene/gui/code_edit.h b/scene/gui/code_edit.h
index ca9e3d2b23f9..bb4dc81c953a 100644
--- a/scene/gui/code_edit.h
+++ b/scene/gui/code_edit.h
@@ -74,6 +74,7 @@ class CodeEdit : public TextEdit {
 	int _calculate_spaces_till_next_right_indent(int p_column) const;
 
 	void _new_line(bool p_split_current_line = true, bool p_above = false);
+	void _auto_fill_doc_comments(int caret, bool p_above);
 
 	/* Auto brace completion */
 	bool auto_brace_completion_enabled = false;
@@ -185,6 +186,8 @@ class CodeEdit : public TextEdit {
 	 */
 	Vector<RBMap<int, int>> delimiter_cache;
 
+	Vector<String> block_key_delimiters;
+
 	void _update_delimiter_cache(int p_from_line = 0, int p_to_line = -1);
 	int _is_in_delimiter(int p_line, int p_column, DelimiterType p_type) const;
 
@@ -466,6 +469,9 @@ class CodeEdit : public TextEdit {
 	Point2 get_delimiter_start_position(int p_line, int p_column) const;
 	Point2 get_delimiter_end_position(int p_line, int p_column) const;
 
+	Vector<String> get_block_key_delimiters() const;
+	void set_block_key_delimiters(const List<String> *p_delimiters);
+
 	/* Code hint */
 	void set_code_hint(const String &p_hint);
 	void set_code_hint_draw_below(bool p_below);
@@ -517,8 +523,6 @@ class CodeEdit : public TextEdit {
 	void duplicate_selection();
 	void duplicate_lines();
 
-	void add_new_line_actions(const Callable &p_action);
-
 	CodeEdit();
 	~CodeEdit();
 };

From f0d5fe9d0c6b2615e1bec66c6b9993562ba8eff8 Mon Sep 17 00:00:00 2001
From: Cronos87 <cronos87@hotmail.fr>
Date: Sun, 6 Oct 2024 23:50:31 +0200
Subject: [PATCH 3/5] Remove autofill on comments

---
 modules/gdscript/gdscript_editor.cpp | 1 -
 modules/mono/csharp_script.cpp       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index 0e99e6e9a223..2c275e3b56cd 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -61,7 +61,6 @@ void GDScriptLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) co
 
 void GDScriptLanguage::get_block_key_delimiters(List<String> *p_delimiters) const {
 	p_delimiters->push_back("##");
-	p_delimiters->push_back("#");
 }
 
 void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 05194a0c988b..d0efdc6a28a9 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -343,7 +343,6 @@ void CSharpLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) cons
 
 void CSharpLanguage::get_block_key_delimiters(List<String> *p_delimiters) const {
 	p_delimiters->push_back("///");
-	p_delimiters->push_back("//");
 	p_delimiters->push_back("/**| *|*/");
 }
 

From 846d8d8fd05ca9084bf8729f0d10a6b3ad80a74f Mon Sep 17 00:00:00 2001
From: Cronos87 <cronos87@hotmail.fr>
Date: Sat, 16 Nov 2024 22:42:20 +0100
Subject: [PATCH 4/5] Apply feedbacks

---
 editor/plugins/script_text_editor.cpp |  8 +++++++-
 scene/gui/code_edit.cpp               | 22 +++++++++++-----------
 scene/gui/code_edit.h                 |  4 ++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 35ab770476f4..8a64f9382954 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -267,7 +267,13 @@ void ScriptTextEditor::_set_theme_for_script() {
 	List<String> block_key_delimiters;
 	script->get_language()->get_block_key_delimiters(&block_key_delimiters);
 
-	text_edit->set_block_key_delimiters(&block_key_delimiters);
+	Vector<String> block_key_delimiters_vector;
+
+	for (const String &delimiter : block_key_delimiters) {
+		block_key_delimiters_vector.push_back(delimiter);
+	}
+
+	text_edit->set_block_key_delimiters(block_key_delimiters_vector);
 }
 
 void ScriptTextEditor::_show_errors_panel(bool p_show) {
diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index 3e9c92f83bb8..5042396eec25 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -1200,12 +1200,12 @@ void CodeEdit::_new_line(bool p_split_current_line, bool p_above) {
 	end_complex_operation();
 }
 
-void CodeEdit::_auto_fill_doc_comments(int caret, bool p_above) {
+void CodeEdit::_auto_fill_doc_comments(int p_caret, bool p_above) {
 	if (block_key_delimiters.is_empty()) {
 		return;
 	}
 
-	const int cl = p_above ? (get_caret_line(caret) + 1) : (get_caret_line(caret) - 1);
+	const int cl = p_above ? (get_caret_line(p_caret) + 1) : (get_caret_line(p_caret) - 1);
 	const String line = get_line(cl);
 
 	if (is_in_comment(cl) != -1) {
@@ -1218,7 +1218,7 @@ void CodeEdit::_auto_fill_doc_comments(int caret, bool p_above) {
 			// Case for inline comments.
 			if (delimiter_begin == delimiter_end) {
 				if (line_strip.begins_with(delimiter_begin)) {
-					insert_text_at_caret(delimiter_begin + " ", caret);
+					insert_text_at_caret(delimiter_begin + " ", p_caret);
 					break;
 				}
 
@@ -1233,22 +1233,22 @@ void CodeEdit::_auto_fill_doc_comments(int caret, bool p_above) {
 					const int non_whitespace_column = get_first_non_whitespace_column(cl);
 					const String indent = line.substr(0, non_whitespace_column);
 
-					insert_text_at_caret(delimiter_begin + " ", caret);
+					insert_text_at_caret(delimiter_begin + " ", p_caret);
 
 					const int line_to_move_on = cl + 1;
 					const int line_length = get_line(line_to_move_on).length();
-					set_caret_line(line_to_move_on, false, true, -1, caret);
-					set_caret_column(line_length, false, caret);
+					set_caret_line(line_to_move_on, false, true, -1, p_caret);
+					set_caret_column(line_length, false, p_caret);
 					break;
 				}
 
-				insert_text_at_caret(delimiter_begin + " ", caret);
+				insert_text_at_caret(delimiter_begin + " ", p_caret);
 				break;
 			}
 
 			// Case when the caret is on the same line as the end delimiter.
 			if (p_above && line_strip.ends_with(delimiter_end)) {
-				insert_text_at_caret(delimiter_begin + " ", caret);
+				insert_text_at_caret(delimiter_begin + " ", p_caret);
 				break;
 			}
 
@@ -1262,7 +1262,7 @@ void CodeEdit::_auto_fill_doc_comments(int caret, bool p_above) {
 				}
 
 				if (line_strip.begins_with(delimiter_begin)) {
-					insert_text_at_caret(delimiter_begin + " ", caret);
+					insert_text_at_caret(delimiter_begin + " ", p_caret);
 					break;
 				}
 			}
@@ -2130,10 +2130,10 @@ Vector<String> CodeEdit::get_block_key_delimiters() const {
 	return block_key_delimiters;
 }
 
-void CodeEdit::set_block_key_delimiters(const List<String> *p_delimiters) {
+void CodeEdit::set_block_key_delimiters(const Vector<String> &p_delimiters) {
 	block_key_delimiters.clear();
 
-	for (const String &delimiter : *p_delimiters) {
+	for (const String &delimiter : p_delimiters) {
 		block_key_delimiters.push_back(delimiter);
 	}
 }
diff --git a/scene/gui/code_edit.h b/scene/gui/code_edit.h
index bb4dc81c953a..7ec33ea66f7e 100644
--- a/scene/gui/code_edit.h
+++ b/scene/gui/code_edit.h
@@ -74,7 +74,7 @@ class CodeEdit : public TextEdit {
 	int _calculate_spaces_till_next_right_indent(int p_column) const;
 
 	void _new_line(bool p_split_current_line = true, bool p_above = false);
-	void _auto_fill_doc_comments(int caret, bool p_above);
+	void _auto_fill_doc_comments(int p_caret, bool p_above);
 
 	/* Auto brace completion */
 	bool auto_brace_completion_enabled = false;
@@ -470,7 +470,7 @@ class CodeEdit : public TextEdit {
 	Point2 get_delimiter_end_position(int p_line, int p_column) const;
 
 	Vector<String> get_block_key_delimiters() const;
-	void set_block_key_delimiters(const List<String> *p_delimiters);
+	void set_block_key_delimiters(const Vector<String> &p_delimiters);
 
 	/* Code hint */
 	void set_code_hint(const String &p_hint);

From 84560814e58e647b4e04a09a2341737ded78930a Mon Sep 17 00:00:00 2001
From: Cronos87 <cronos87@hotmail.fr>
Date: Mon, 23 Dec 2024 23:38:20 +0100
Subject: [PATCH 5/5] Fix rebase error

---
 editor/plugins/script_text_editor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 8a64f9382954..df0e901045cb 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -2495,7 +2495,6 @@ ScriptTextEditor::ScriptTextEditor() {
 	code_editor->get_text_editor()->set_draw_executing_lines_gutter(true);
 	code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
 	code_editor->get_text_editor()->connect("caret_changed", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
-	code_editor->get_text_editor()->add_new_line_actions(callable_mp(this, &ScriptTextEditor::_auto_fill_doc_comments));
 	code_editor->connect("navigation_preview_ended", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
 
 	connection_gutter = 1;