1 files changed, 39 insertions, 4 deletions

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 4626f10b8d..981881fb9b 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -133,11 +133,11 @@ void ScriptTextEditor::apply_code() {
 	code_editor->get_text_editor()->get_syntax_highlighter()->update_cache();
 }
 
-RES ScriptTextEditor::get_edited_resource() const {
+Ref<Resource> ScriptTextEditor::get_edited_resource() const {
 	return script;
 }
 
-void ScriptTextEditor::set_edited_resource(const RES &p_res) {
+void ScriptTextEditor::set_edited_resource(const Ref<Resource> &p_res) {
 	ERR_FAIL_COND(script.is_valid());
 	ERR_FAIL_COND(p_res.is_null());
 
@@ -239,6 +239,29 @@ void ScriptTextEditor::_show_warnings_panel(bool p_show) {
 void ScriptTextEditor::_warning_clicked(Variant p_line) {
 	if (p_line.get_type() == Variant::INT) {
 		goto_line_centered(p_line.operator int64_t());
+	} else if (p_line.get_type() == Variant::DICTIONARY) {
+		Dictionary meta = p_line.operator Dictionary();
+		const int line = meta["line"].operator int64_t() - 1;
+
+		CodeEdit *text_editor = code_editor->get_text_editor();
+		String prev_line = line > 0 ? text_editor->get_line(line - 1) : "";
+		if (prev_line.contains("@warning_ignore")) {
+			const int closing_bracket_idx = prev_line.find(")");
+			const String text_to_insert = ", " + meta["code"].operator String();
+			prev_line = prev_line.insert(closing_bracket_idx, text_to_insert);
+			text_editor->set_line(line - 1, prev_line);
+		} else {
+			const int indent = text_editor->get_indent_level(line) / text_editor->get_indent_size();
+			String annotation_indent;
+			if (!text_editor->is_indent_using_spaces()) {
+				annotation_indent = String("\t").repeat(indent);
+			} else {
+				annotation_indent = String(" ").repeat(text_editor->get_indent_size() * indent);
+			}
+			text_editor->insert_line_at(line, annotation_indent + "@warning_ignore(" + meta["code"].operator String() + ")");
+		}
+
+		_validate_script();
 	}
 }
 
@@ -482,8 +505,20 @@ void ScriptTextEditor::_update_warnings() {
 	}
 
 	// Add script warnings.
-	warnings_panel->push_table(2);
+	warnings_panel->push_table(3);
 	for (const ScriptLanguage::Warning &w : warnings) {
+		Dictionary ignore_meta;
+		ignore_meta["line"] = w.start_line;
+		ignore_meta["code"] = w.string_code.to_lower();
+		warnings_panel->push_cell();
+		warnings_panel->push_meta(ignore_meta);
+		warnings_panel->push_color(
+				warnings_panel->get_theme_color(SNAME("accent_color"), SNAME("Editor")).lerp(warnings_panel->get_theme_color(SNAME("mono_color"), SNAME("Editor")), 0.5f));
+		warnings_panel->add_text(TTR("[Ignore]"));
+		warnings_panel->pop(); // Color.
+		warnings_panel->pop(); // Meta ignore.
+		warnings_panel->pop(); // Cell.
+
 		warnings_panel->push_cell();
 		warnings_panel->push_meta(w.start_line - 1);
 		warnings_panel->push_color(warnings_panel->get_theme_color(SNAME("warning_color"), SNAME("Editor")));
@@ -1963,7 +1998,7 @@ ScriptTextEditor::~ScriptTextEditor() {
 	}
 }
 
-static ScriptEditorBase *create_editor(const RES &p_resource) {
+static ScriptEditorBase *create_editor(const Ref<Resource> &p_resource) {
 	if (Object::cast_to<Script>(*p_resource)) {
 		return memnew(ScriptTextEditor);
 	}