1 files changed, 9 insertions, 50 deletions

diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index 7539810feb..e2f7ec860c 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -548,7 +548,7 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 	}
 
 	if (k->is_action("ui_text_dedent", true)) {
-		do_unindent();
+		unindent_lines();
 		accept_event();
 		return;
 	}
@@ -898,50 +898,6 @@ void CodeEdit::indent_lines() {
 	end_complex_operation();
 }
 
-void CodeEdit::do_unindent() {
-	if (!is_editable()) {
-		return;
-	}
-
-	int cc = get_caret_column();
-
-	if (has_selection() || cc <= 0) {
-		unindent_lines();
-		return;
-	}
-
-	begin_complex_operation();
-	Vector<int> caret_edit_order = get_caret_index_edit_order();
-	for (const int &c : caret_edit_order) {
-		int cl = get_caret_line(c);
-		const String &line = get_line(cl);
-
-		if (line[cc - 1] == '\t') {
-			remove_text(cl, cc - 1, cl, cc);
-			set_caret_column(MAX(0, cc - 1), c == 0, c);
-			adjust_carets_after_edit(c, cl, cc, cl, cc - 1);
-			continue;
-		}
-
-		if (line[cc - 1] != ' ') {
-			continue;
-		}
-
-		int spaces_to_remove = _calculate_spaces_till_next_left_indent(cc);
-		if (spaces_to_remove > 0) {
-			for (int i = 1; i <= spaces_to_remove; i++) {
-				if (line[cc - i] != ' ') {
-					spaces_to_remove = i - 1;
-					break;
-				}
-			}
-			remove_text(cl, cc - spaces_to_remove, cl, cc);
-			set_caret_column(MAX(0, cc - spaces_to_remove), c == 0, c);
-		}
-	}
-	end_complex_operation();
-}
-
 void CodeEdit::unindent_lines() {
 	if (!is_editable()) {
 		return;
@@ -2086,9 +2042,11 @@ void CodeEdit::confirm_code_completion(bool p_replace) {
 		int post_brace_pair = get_caret_column(i) < get_line(caret_line).length() ? _get_auto_brace_pair_close_at_pos(caret_line, get_caret_column(i)) : -1;
 
 		// Strings do not nest like brackets, so ensure we don't add an additional closing pair.
-		if (has_string_delimiter(String::chr(last_completion_char)) && post_brace_pair != -1 && last_char_matches) {
-			remove_text(caret_line, get_caret_column(i), caret_line, get_caret_column(i) + 1);
-			adjust_carets_after_edit(i, caret_line, get_caret_column(i), caret_line, get_caret_column(i) + 1);
+		if (has_string_delimiter(String::chr(last_completion_char))) {
+			if (post_brace_pair != -1 && last_char_matches) {
+				remove_text(caret_line, get_caret_column(i), caret_line, get_caret_column(i) + 1);
+				adjust_carets_after_edit(i, caret_line, get_caret_column(i), caret_line, get_caret_column(i) + 1);
+			}
 		} else {
 			if (pre_brace_pair != -1 && pre_brace_pair != post_brace_pair && last_char_matches) {
 				remove_text(caret_line, get_caret_column(i), caret_line, get_caret_column(i) + 1);
@@ -2202,7 +2160,6 @@ void CodeEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_auto_indent_prefixes"), &CodeEdit::get_auto_indent_prefixes);
 
 	ClassDB::bind_method(D_METHOD("do_indent"), &CodeEdit::do_indent);
-	ClassDB::bind_method(D_METHOD("do_unindent"), &CodeEdit::do_unindent);
 
 	ClassDB::bind_method(D_METHOD("indent_lines"), &CodeEdit::indent_lines);
 	ClassDB::bind_method(D_METHOD("unindent_lines"), &CodeEdit::unindent_lines);
@@ -2899,7 +2856,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 	const int caret_line = get_caret_line();
 	const int caret_column = get_caret_column();
 	const String line = get_line(caret_line);
-	ERR_FAIL_INDEX_MSG(caret_column - 1, line.length(), "Caret column exceeds line length.");
+	ERR_FAIL_INDEX_MSG(caret_column, line.length() + 1, "Caret column exceeds line length.");
 
 	if (caret_column > 0 && line[caret_column - 1] == '(' && !code_completion_forced) {
 		cancel_code_completion();
@@ -3131,6 +3088,8 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 	}
 
 	code_completion_options.append_array(completion_options_casei);
+	code_completion_options.append_array(completion_options_substr);
+	code_completion_options.append_array(completion_options_substr_casei);
 	code_completion_options.append_array(completion_options_subseq);
 	code_completion_options.append_array(completion_options_subseq_casei);