nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-03-03 20:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55227 from ator-dev/fix-code-folding

Browse Source
This commit is contained in:
Rémi Verschelde
2021-11-25 22:21:46 +01:00
committed by GitHub
parent 21052ce253 bac0a035c9
commit 1b89296fad
2 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scene/gui/code_edit.cpp
View File

@@ -1419,40 +1419,23 @@ void CodeEdit::fold_line(int p_line) {
/* End line is the same therefore we have a block of single line delimiters. */
if (end_line == p_line) {
for (int i = p_line + 1; i <= line_count; i++) {
if (i == line_count) {
end_line = line_count;
break;
}
if ((in_string != -1 && is_in_string(i) == -1) || (in_comment != -1 && is_in_comment(i) == -1)) {
end_line = i - 1;
break;
}
end_line = i;
}
}
} else {
int start_indent = get_indent_level(p_line);
for (int i = p_line + 1; i <= line_count; i++) {
if (get_line(p_line).strip_edges().size() == 0 || is_in_string(i) != -1 || is_in_comment(i) != -1) {
if (get_line(i).strip_edges().size() == 0) {
continue;
}
if (get_indent_level(i) > start_indent) {
end_line = i;
continue;
}
if (i == line_count) {
/* Do not fold empty last line of script if any */
end_line = i;
if (get_line(i).strip_edges().size() == 0) {
end_line--;
}
break;
}
if ((get_indent_level(i) <= start_indent && get_line(i).strip_edges().size() != 0)) {
/* Keep an empty line unfolded if any */
end_line = i - 1;
if (get_line(i - 1).strip_edges().size() == 0 && i - 2 > p_line) {
end_line = i - 2;
}
if (is_in_string(i) == -1 && is_in_comment(i) == -1) {
break;
}
}