maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow single quotes in comments

Browse source 
Fixes: #36638
(cherry picked from commit ab6456d1bc)
This commit is contained in:
Dominik 'dreamsComeTrue' Jasiński 2020-03-01 23:04:11 +01:00 committed by Rémi Verschelde
parent 40b53bc29a
commit e590a33d45
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/gui/text_edit.cpp
View file

@ -1848,6 +1848,7 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
bool in_single_quote = false;
bool in_double_quote = false;
bool found_comment = false;
int c = 0;
while (c < line.length()) {
@ -1857,6 +1858,9 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
if (cursor.column == c) {
break;
}
} else if (!in_single_quote && !in_double_quote && line[c] == '#') {
found_comment = true;
break;
} else {
if (line[c] == '\'' && !in_double_quote) {
in_single_quote = !in_single_quote;
@ -1872,7 +1876,15 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
}
}
// Disallow inserting duplicated quotes while already in string
// Do not need to duplicate quotes while in comments
if (found_comment) {
insert_text_at_cursor(ch_single);
cursor_set_column(cursor_position_to_move);
return;
}
// Disallow inserting duplicated quotes while already in string
if ((in_single_quote || in_double_quote) && (ch == '"' || ch == '\'')) {
insert_text_at_cursor(ch_single);
cursor_set_column(cursor_position_to_move);