godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for brace auto indent and fixed indent above

Browse Source
This commit is contained in:
Paulb23 2017-09-02 15:59:30 +01:00
parent 0b747c2910
commit cfa5f37ee7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/text_edit.cpp
View File

@ -2136,15 +2136,25 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
break; break;
} }
} }
if (auto_indent) {
// indent once again if previous line will end with ':' bool brace_indent = false;
// (i.e. colon precedes current cursor position)
if (cursor.column > 0 && text[cursor.line][cursor.column - 1] == ':') { // 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) { if (indent_using_spaces) {
ins += space_indent; ins += space_indent;
} else { } else {
ins += "\t"; 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) { if (first_line) {
cursor_set_line(0); cursor_set_line(0);
} else if (brace_indent) {
cursor_set_line(cursor.line - 1);
cursor_set_column(text[cursor.line].length());
} }
} break; } break;