1 files changed, 22 insertions, 9 deletions

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 7a9daea73e..1738e303aa 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -430,7 +430,7 @@ void TextEdit::_notification(int p_what) {
 				double dist = sqrt(target_y * target_y);
 				double vel = ((target_y / dist) * v_scroll_speed) * get_fixed_process_delta_time();
 
-				if (vel >= dist) {
+				if (Math::abs(vel) >= dist) {
 					v_scroll->set_value(target_v_scroll);
 					scrolling = false;
 					set_fixed_process(false);
@@ -2113,15 +2113,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 
 				//keep indentation
 				int space_count = 0;
-				for (int i = 0; i < text[cursor.line].length(); i++) {
-					if (text[cursor.line][i] == '\t' && cursor.column > 0) {
+				for (int i = 0; i < cursor.column; i++) {
+					if (text[cursor.line][i] == '\t') {
 						if (indent_using_spaces) {
 							ins += space_indent;
 						} else {
 							ins += "\t";
 						}
 						space_count = 0;
-					} else if (text[cursor.line][i] == ' ' && cursor.column > 0) {
+					} else if (text[cursor.line][i] == ' ') {
 						space_count++;
 
 						if (space_count == indent_size) {
@@ -2136,15 +2136,25 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 						break;
 					}
 				}
-				if (auto_indent) {
-					// indent once again if previous line will end with ':'
-					// (i.e. colon precedes current cursor position)
-					if (cursor.column > 0 && text[cursor.line][cursor.column - 1] == ':') {
+
+				bool brace_indent = false;
+
+				// no need to indent if we are going upwards.
+				if (auto_indent && !(k->get_command() && k->get_shift())) {
+					// indent once again if previous line will end with ':' or '{'
+					// (i.e. colon/brace precedes current cursor position)
+					if (cursor.column > 0 && (text[cursor.line][cursor.column - 1] == ':' || text[cursor.line][cursor.column - 1] == '{')) {
 						if (indent_using_spaces) {
 							ins += space_indent;
 						} else {
 							ins += "\t";
 						}
+
+						// no need to move the brace below if we are not taking the text with us.
+						if (text[cursor.line][cursor.column] == '}' && !k->get_command()) {
+							brace_indent = true;
+							ins += "\n" + ins.substr(1, ins.length() - 2);
+						}
 					}
 				}
 
@@ -2168,6 +2178,9 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 
 				if (first_line) {
 					cursor_set_line(0);
+				} else if (brace_indent) {
+					cursor_set_line(cursor.line - 1);
+					cursor_set_column(text[cursor.line].length());
 				}
 
 			} break;
@@ -4531,7 +4544,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {
 		bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this
 
 		bool inside_quotes = false;
-		int qbegin, qend;
+		int qbegin = 0, qend = 0;
 		for (int i = 0; i < s.length(); i++) {
 			if (s[i] == '"') {
 				if (inside_quotes) {