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

Merge pull request #75070 from jmb462/74802 

Fix commenting collapsed function issue
This commit is contained in:
Yuri Sizov 2023-04-03 15:38:18 +02:00 committed by GitHub
parent 49c17bb262 68ad3338ef
commit aeb4489e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/code_editor.cpp
View File

@ -1587,11 +1587,17 @@ void CodeTextEditor::toggle_inline_comment(const String &delimiter) {
Vector<int> caret_edit_order = text_editor->get_caret_index_edit_order(); Vector<int> caret_edit_order = text_editor->get_caret_index_edit_order();
caret_edit_order.reverse(); caret_edit_order.reverse();
int last_line = -1; int last_line = -1;
int folded_to = 0;
for (const int &c1 : caret_edit_order) { for (const int &c1 : caret_edit_order) {
int from = _get_affected_lines_from(c1); int from = _get_affected_lines_from(c1);
from += from == last_line ? 1 : 0; from += from == last_line ? 1 + folded_to : 0;
int to = _get_affected_lines_to(c1); int to = _get_affected_lines_to(c1);
last_line = to; last_line = to;
// If last line is folded, extends to the end of the folded section
if (text_editor->is_line_folded(to)) {
folded_to = text_editor->get_next_visible_line_offset_from(to + 1, 1) - 1;
to += folded_to;
}
// Check first if there's any uncommented lines in selection. // Check first if there's any uncommented lines in selection.
bool is_commented = true; bool is_commented = true;
for (int line = from; line <= to; line++) { for (int line = from; line <= to; line++) {