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

Improve toggle comment function in script editor.

Browse Source
This commit is contained in:
Unknown 2018-10-04 23:42:51 +02:00 committed by Akeru
parent 8068d0217a
commit c3d40e42ce
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editor/plugins/script_text_editor.cpp
View File

@ -817,6 +817,9 @@ void ScriptTextEditor::_edit_option(int p_op) {
if (tx->get_selection_to_column() == 0) if (tx->get_selection_to_column() == 0)
end -= 1; end -= 1;
int col_to = tx->get_selection_to_column();
int cursor_pos = tx->cursor_get_column();
// Check if all lines in the selected block are commented // Check if all lines in the selected block are commented
bool is_commented = true; bool is_commented = true;
for (int i = begin; i <= end; i++) { for (int i = begin; i <= end; i++) {
@ -839,19 +842,42 @@ void ScriptTextEditor::_edit_option(int p_op) {
} }
tx->set_line(i, line_text); tx->set_line(i, line_text);
} }
// Adjust selection & cursor position.
int offset = is_commented ? -1 : 1;
int col_from = tx->get_selection_from_column() > 0 ? tx->get_selection_from_column() + offset : 0;
if (is_commented && tx->cursor_get_column() == tx->get_line(tx->cursor_get_line()).length() + 1)
cursor_pos += 1;
if (tx->get_selection_to_column() != 0 && col_to != tx->get_line(tx->get_selection_to_line()).length() + 1)
col_to += offset;
if (tx->cursor_get_column() != 0)
cursor_pos += offset;
tx->select(begin, col_from, tx->get_selection_to_line(), col_to);
tx->cursor_set_column(cursor_pos);
} else { } else {
int begin = tx->cursor_get_line(); int begin = tx->cursor_get_line();
String line_text = tx->get_line(begin); String line_text = tx->get_line(begin);
if (line_text.begins_with(delimiter)) int col = tx->cursor_get_column();
if (line_text.begins_with(delimiter)) {
line_text = line_text.substr(delimiter.length(), line_text.length()); line_text = line_text.substr(delimiter.length(), line_text.length());
else col -= 1;
} else {
line_text = delimiter + line_text; line_text = delimiter + line_text;
col += 1;
}
tx->set_line(begin, line_text); tx->set_line(begin, line_text);
tx->cursor_set_column(col);
} }
tx->end_complex_operation(); tx->end_complex_operation();
tx->update(); tx->update();
//tx->deselect();
} break; } break;
case EDIT_COMPLETE: { case EDIT_COMPLETE: {