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

Make brackets only be inserted when necessary when autocompleting methods

Browse source
This commit is contained in:
Michael Alexsander Silva Dias 2019-04-04 23:06:44 -03:00
parent 9cf81271f6
commit 24137f423a
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scene/gui/text_edit.cpp
View file

@ -5662,19 +5662,29 @@ void TextEdit::_confirm_completion() {
cursor_set_column(cursor.column - completion_base.length(), false); cursor_set_column(cursor.column - completion_base.length(), false);
insert_text_at_cursor(completion_current); insert_text_at_cursor(completion_current);
// When inserted into the middle of an existing string, don't add an unnecessary quote // When inserted into the middle of an existing string/method, don't add an unnecessary quote/bracket.
String line = text[cursor.line]; String line = text[cursor.line];
CharType next_char = line[cursor.column]; CharType next_char = line[cursor.column];
CharType last_completion_char = completion_current[completion_current.length() - 1]; CharType last_completion_char = completion_current[completion_current.length() - 1];
if ((last_completion_char == '"' || last_completion_char == '\'') && if ((last_completion_char == '"' || last_completion_char == '\'') && last_completion_char == next_char) {
last_completion_char == next_char) {
_base_remove_text(cursor.line, cursor.column, cursor.line, cursor.column + 1); _base_remove_text(cursor.line, cursor.column, cursor.line, cursor.column + 1);
} }
if (last_completion_char == '(' && auto_brace_completion_enabled) { if (last_completion_char == '(') {
insert_text_at_cursor(")");
cursor.column--; if (next_char == last_completion_char) {
_base_remove_text(cursor.line, cursor.column - 1, cursor.line, cursor.column);
} else if (auto_brace_completion_enabled) {
insert_text_at_cursor(")");
cursor.column--;
}
} else if (last_completion_char == ')' && next_char == '(') {
_base_remove_text(cursor.line, cursor.column - 2, cursor.line, cursor.column);
if (line[cursor.column + 1] != ')') {
cursor.column--;
}
} }
end_complex_operation(); end_complex_operation();
@ -5869,7 +5879,6 @@ void TextEdit::code_complete(const Vector<String> &p_strings, bool p_forced) {
completion_current = ""; completion_current = "";
completion_index = 0; completion_index = 0;
_update_completion_candidates(); _update_completion_candidates();
//
} }
String TextEdit::get_word_at_pos(const Vector2 &p_pos) const { String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {