From 22e9544582fb821feba10fa08f5cc0a1ab8e71fc Mon Sep 17 00:00:00 2001
From: Michael Alexsander Silva Dias <michaelalexsander@protonmail.com>
Date: Wed, 14 Aug 2019 18:31:07 -0300
Subject: [PATCH] Fix matches result in the code search not appearing when the
 quantity is 0

---
 editor/code_editor.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 5b1a460a545..33af5927b30 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -164,6 +164,7 @@ bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col)
 
 		_update_results_count();
 	} else {
+		results_count = 0;
 		result_line = -1;
 		result_col = -1;
 		text_edit->set_search_text("");
@@ -196,7 +197,7 @@ void FindReplaceBar::_replace() {
 void FindReplaceBar::_replace_all() {
 
 	text_edit->disconnect("text_changed", this, "_editor_text_changed");
-	// line as x so it gets priority in comparison, column as y
+	// Line as x so it gets priority in comparison, column as y.
 	Point2i orig_cursor(text_edit->cursor_get_line(), text_edit->cursor_get_column());
 	Point2i prev_match = Point2(-1, -1);
 
@@ -228,7 +229,7 @@ void FindReplaceBar::_replace_all() {
 			Point2i match_to(result_line, result_col + search_text_len);
 
 			if (match_from < prev_match) {
-				break; // done
+				break; // Done.
 			}
 
 			prev_match = Point2i(result_line, result_col + replace_text.length());
@@ -241,14 +242,14 @@ void FindReplaceBar::_replace_all() {
 					continue;
 				}
 
-				// replace but adjust selection bounds
+				// Replace but adjust selection bounds.
 				text_edit->insert_text_at_cursor(replace_text);
 				if (match_to.x == selection_end.x) {
 					selection_end.y += replace_text.length() - search_text_len;
 				}
 
 			} else {
-				// just replace
+				// Just replace.
 				text_edit->insert_text_at_cursor(replace_text);
 			}
 
@@ -260,12 +261,12 @@ void FindReplaceBar::_replace_all() {
 
 	replace_all_mode = false;
 
-	// restore editor state (selection, cursor, scroll)
+	// Restore editor state (selection, cursor, scroll).
 	text_edit->cursor_set_line(orig_cursor.x);
 	text_edit->cursor_set_column(orig_cursor.y);
 
 	if (selection_enabled && is_selection_only()) {
-		// reselect
+		// Reselect.
 		text_edit->select(selection_begin.x, selection_begin.y, selection_end.x, selection_end.y);
 	} else {
 		text_edit->deselect();
@@ -363,7 +364,7 @@ bool FindReplaceBar::search_prev() {
 	int line, col;
 	_get_search_from(line, col);
 	if (text_edit->is_selection_active())
-		col--; //Skip currently selected word.
+		col--; // Skip currently selected word.
 
 	if (line == result_line && col == result_col) {
 		col -= text.length();
@@ -751,7 +752,7 @@ void CodeTextEditor::_zoom_changed() {
 }
 
 void CodeTextEditor::_reset_zoom() {
-	Ref<DynamicFont> font = text_editor->get_font("font"); // reset source font size to default
+	Ref<DynamicFont> font = text_editor->get_font("font"); // Reset source font size to default.
 
 	if (font.is_valid()) {
 		EditorSettings::get_singleton()->set("interface/editor/code_font_size", 14);
@@ -1261,7 +1262,7 @@ void CodeTextEditor::toggle_inline_comment(const String &delimiter) {
 		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
+		// 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)) {
@@ -1456,14 +1457,14 @@ void CodeTextEditor::_on_settings_change() {
 
 	font_size = EditorSettings::get_singleton()->get("interface/editor/code_font_size");
 
-	// AUTO BRACE COMPLETION
+	// Auto brace completion.
 	text_editor->set_auto_brace_completion(
 			EDITOR_GET("text_editor/completion/auto_brace_complete"));
 
 	code_complete_timer->set_wait_time(
 			EDITOR_GET("text_editor/completion/code_complete_delay"));
 
-	// call hint settings
+	// Call hint settings.
 	text_editor->set_callhint_settings(
 			EDITOR_GET("text_editor/completion/put_callhint_tooltip_below_current_line"),
 			EDITOR_GET("text_editor/completion/callhint_tooltip_offset"));