1 files changed, 122 insertions, 2 deletions

diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index e9580ae0d1..a9ec776693 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "code_editor.h"
 
+#include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/string_builder.h"
 #include "editor/editor_scale.h"
@@ -432,7 +433,11 @@ void FindReplaceBar::_search_text_changed(const String &p_text) {
 
 void FindReplaceBar::_search_text_entered(const String &p_text) {
 
-	search_next();
+	if (Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
+		search_prev();
+	} else {
+		search_next();
+	}
 }
 
 void FindReplaceBar::_replace_text_entered(const String &p_text) {
@@ -763,6 +768,7 @@ void CodeTextEditor::update_editor_settings() {
 	text_editor->set_hiding_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding"));
 	text_editor->set_draw_fold_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding"));
 	text_editor->set_wrap_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/word_wrap"));
+	text_editor->set_draw_info_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_info_gutter"));
 	text_editor->cursor_set_block_mode(EditorSettings::get_singleton()->get("text_editor/cursor/block_caret"));
 	text_editor->set_smooth_scroll_enabled(EditorSettings::get_singleton()->get("text_editor/open_scripts/smooth_scrolling"));
 	text_editor->set_v_scroll_speed(EditorSettings::get_singleton()->get("text_editor/open_scripts/v_scroll_speed"));
@@ -1085,6 +1091,79 @@ void CodeTextEditor::clone_lines_down() {
 	text_editor->update();
 }
 
+void CodeTextEditor::toggle_inline_comment(const String &delimiter) {
+	text_editor->begin_complex_operation();
+	if (text_editor->is_selection_active()) {
+		int begin = text_editor->get_selection_from_line();
+		int end = text_editor->get_selection_to_line();
+
+		// End of selection ends on the first column of the last line, ignore it.
+		if (text_editor->get_selection_to_column() == 0)
+			end -= 1;
+
+		int col_to = text_editor->get_selection_to_column();
+		int cursor_pos = text_editor->cursor_get_column();
+
+		// Check if all lines in the selected block are commented
+		bool is_commented = true;
+		for (int i = begin; i <= end; i++) {
+			if (!text_editor->get_line(i).begins_with(delimiter)) {
+				is_commented = false;
+				break;
+			}
+		}
+		for (int i = begin; i <= end; i++) {
+			String line_text = text_editor->get_line(i);
+
+			if (line_text.strip_edges().empty()) {
+				line_text = delimiter;
+			} else {
+				if (is_commented) {
+					line_text = line_text.substr(delimiter.length(), line_text.length());
+				} else {
+					line_text = delimiter + line_text;
+				}
+			}
+			text_editor->set_line(i, line_text);
+		}
+
+		// Adjust selection & cursor position.
+		int offset = (is_commented ? -1 : 1) * delimiter.length();
+		int col_from = text_editor->get_selection_from_column() > 0 ? text_editor->get_selection_from_column() + offset : 0;
+
+		if (is_commented && text_editor->cursor_get_column() == text_editor->get_line(text_editor->cursor_get_line()).length() + 1)
+			cursor_pos += 1;
+
+		if (text_editor->get_selection_to_column() != 0 && col_to != text_editor->get_line(text_editor->get_selection_to_line()).length() + 1)
+			col_to += offset;
+
+		if (text_editor->cursor_get_column() != 0)
+			cursor_pos += offset;
+
+		text_editor->select(begin, col_from, text_editor->get_selection_to_line(), col_to);
+		text_editor->cursor_set_column(cursor_pos);
+
+	} else {
+		int begin = text_editor->cursor_get_line();
+		String line_text = text_editor->get_line(begin);
+		int delimiter_length = delimiter.length();
+
+		int col = text_editor->cursor_get_column();
+		if (line_text.begins_with(delimiter)) {
+			line_text = line_text.substr(delimiter_length, line_text.length());
+			col -= delimiter_length;
+		} else {
+			line_text = delimiter + line_text;
+			col += delimiter_length;
+		}
+
+		text_editor->set_line(begin, line_text);
+		text_editor->cursor_set_column(col);
+	}
+	text_editor->end_complex_operation();
+	text_editor->update();
+}
+
 void CodeTextEditor::goto_line(int p_line) {
 	text_editor->deselect();
 	text_editor->unfold_line(p_line);
@@ -1102,17 +1181,57 @@ Variant CodeTextEditor::get_edit_state() {
 	Dictionary state;
 
 	state["scroll_position"] = text_editor->get_v_scroll();
+	state["h_scroll_position"] = text_editor->get_h_scroll();
 	state["column"] = text_editor->cursor_get_column();
 	state["row"] = text_editor->cursor_get_line();
 
+	state["selection"] = get_text_edit()->is_selection_active();
+	if (get_text_edit()->is_selection_active()) {
+		state["selection_from_line"] = text_editor->get_selection_from_line();
+		state["selection_from_column"] = text_editor->get_selection_from_column();
+		state["selection_to_line"] = text_editor->get_selection_to_line();
+		state["selection_to_column"] = text_editor->get_selection_to_column();
+	}
+
+	state["folded_lines"] = text_editor->get_folded_lines();
+	state["breakpoints"] = text_editor->get_breakpoints_array();
+
+	state["syntax_highlighter"] = TTR("Standard");
+	SyntaxHighlighter *syntax_highlighter = text_editor->_get_syntax_highlighting();
+	if (syntax_highlighter) {
+		state["syntax_highlighter"] = syntax_highlighter->get_name();
+	}
+
 	return state;
 }
 
 void CodeTextEditor::set_edit_state(const Variant &p_state) {
 	Dictionary state = p_state;
-	text_editor->cursor_set_column(state["column"]);
+
+	/* update the row first as it sets the column to 0 */
 	text_editor->cursor_set_line(state["row"]);
+	text_editor->cursor_set_column(state["column"]);
 	text_editor->set_v_scroll(state["scroll_position"]);
+	text_editor->set_h_scroll(state["h_scroll_position"]);
+
+	if (state.has("selection")) {
+		text_editor->select(state["selection_from_line"], state["selection_from_column"], state["selection_to_line"], state["selection_to_column"]);
+	}
+
+	if (state.has("folded_lines")) {
+		Vector<int> folded_lines = state["folded_lines"];
+		for (int i = 0; i < folded_lines.size(); i++) {
+			text_editor->fold_line(folded_lines[i]);
+		}
+	}
+
+	if (state.has("breakpoints")) {
+		Array breakpoints = state["breakpoints"];
+		for (int i = 0; i < breakpoints.size(); i++) {
+			text_editor->set_line_as_breakpoint(breakpoints[i], true);
+		}
+	}
+
 	text_editor->grab_focus();
 }
 
@@ -1144,6 +1263,7 @@ void CodeTextEditor::_update_font() {
 	text_editor->add_font_override("font", get_font("source", "EditorFonts"));
 
 	Ref<Font> status_bar_font = get_font("status_source", "EditorFonts");
+	error->add_font_override("font", status_bar_font);
 	int count = status_bar->get_child_count();
 	for (int i = 0; i < count; i++) {
 		Control *n = Object::cast_to<Control>(status_bar->get_child(i));