asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #32902 from nekomatata/auto-indent-bracket-fix

Browse source 
Auto-indent after opening bracket and parenthesis in the script editor
This commit is contained in:
Rémi Verschelde 2019-10-22 14:30:16 +02:00 committed by GitHub
commit 97a4fe79fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
scene/gui/text_edit.cpp
View file

@ -2843,19 +2843,30 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
// No need to indent if we are going upwards. // No need to indent if we are going upwards.
if (auto_indent && !(k->get_command() && k->get_shift())) { if (auto_indent && !(k->get_command() && k->get_shift())) {
// Indent once again if previous line will end with ':' or '{' and the line is not a comment // Indent once again if previous line will end with ':','{','[','(' and the line is not a comment
// (i.e. colon/brace precedes current cursor position). // (i.e. colon/brace precedes current cursor position).
if (cursor.column > 0 && (text[cursor.line][cursor.column - 1] == ':' || text[cursor.line][cursor.column - 1] == '{') && !is_line_comment(cursor.line)) { if (cursor.column > 0) {
if (indent_using_spaces) { char prev_char = text[cursor.line][cursor.column - 1];
ins += space_indent; switch (prev_char) {
} else { case ':':
ins += "\t"; case '{':
} case '[':
case '(': {
if (!is_line_comment(cursor.line)) {
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. // 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()) { char closing_char = _get_right_pair_symbol(prev_char);
brace_indent = true; if ((closing_char != 0) && (closing_char == text[cursor.line][cursor.column]) && !k->get_command()) {
ins += "\n" + ins.substr(1, ins.length() - 2); brace_indent = true;
ins += "\n" + ins.substr(1, ins.length() - 2);
}
}
} break;
} }
} }
} }