godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #105007 from Aziroshin/dev/aziroshin/comment-after-region-not-folding-102382

Browse Source 
[CodeEdit] Fix folding for comments mixed with code region tags.
This commit is contained in:
Thaddeus Crews
2025-04-10 10:18:14 -05:00
parent 722ddf6e6f 40b7931279
commit 6fce829fce
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/code_edit.cpp
View File

@@ -1644,12 +1644,12 @@ bool CodeEdit::can_fold_line(int p_line) const {
if (delimiter_end_line == p_line) { if (delimiter_end_line == p_line) {
/* Check we are the start of the block. */ /* Check we are the start of the block. */
if (p_line - 1 >= 0) { if (p_line - 1 >= 0) {
if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1)) { if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1 && !is_line_code_region_start(p_line - 1) && !is_line_code_region_end(p_line - 1))) {
return false; return false;
} }
} }
/* Check it continues for at least one line. */ /* Check it continues for at least one line. */
return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1)); return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1 && !is_line_code_region_start(p_line + 1) && !is_line_code_region_end(p_line + 1)));
} }
return ((in_string != -1 && is_in_string(delimiter_end_line) != -1) || (in_comment != -1 && is_in_comment(delimiter_end_line) != -1)); return ((in_string != -1 && is_in_string(delimiter_end_line) != -1) || (in_comment != -1 && is_in_comment(delimiter_end_line) != -1));
} }
@@ -1704,6 +1704,10 @@ void CodeEdit::fold_line(int p_line) {
if ((in_string != -1 && is_in_string(i) == -1) || (in_comment != -1 && is_in_comment(i) == -1)) { if ((in_string != -1 && is_in_string(i) == -1) || (in_comment != -1 && is_in_comment(i) == -1)) {
break; break;
} }
if (in_comment != -1 && (is_line_code_region_start(i) || is_line_code_region_end(i))) {
// A code region tag should split a comment block, ending it early.
break;
}
end_line = i; end_line = i;
} }
} }

41
tests/scene/test_code_edit.h
View File

@@ -3269,6 +3269,47 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4); CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4);
} }
SUBCASE("[CodeEdit] folding comments including and/or adjacent to code regions") {
code_edit->add_comment_delimiter("#", "", true);
// Single line comment directly above a code region tag is not foldable.
code_edit->set_text("#line0\n#region a\nnothing\n#line3\n#endregion");
CHECK_FALSE(code_edit->can_fold_line(0));
CHECK_FALSE(code_edit->can_fold_line(3));
// Comment blocks.
// Foldable even when directly below a code region start tag.
code_edit->set_text("#line0\n#line1\n#region a\n#line3\n#line4\nnothing\n#endregion");
CHECK(code_edit->can_fold_line(3));
// Doesn't fold beyond region start tag.
code_edit->fold_line(0);
CHECK(code_edit->is_line_folded(0));
CHECK_EQ(code_edit->get_visible_line_count_in_range(0, 1), 1);
CHECK_EQ(code_edit->get_visible_line_count_in_range(2, 2), 1);
// Foldable even when directly below a code region end tag.
code_edit->set_text("#region a\nnothing\n#line2\n#line3\n#endregion\n#line5\n#line6");
CHECK(code_edit->can_fold_line(5));
// Doesn't fold beyond region end tag.
code_edit->fold_line(2);
CHECK(code_edit->is_line_folded(2));
CHECK_EQ(code_edit->get_visible_line_count_in_range(2, 3), 1);
CHECK_EQ(code_edit->get_visible_line_count_in_range(4, 4), 1);
code_edit->add_comment_delimiter("/*", "*/", false);
// Multiline comments.
// Folds a region tag inside it.
code_edit->set_text("/*\nnothing\n#region a\n*/\n#endregion");
CHECK(code_edit->can_fold_line(0));
code_edit->fold_line(0);
CHECK(code_edit->is_line_folded(0));
CHECK_EQ(code_edit->get_visible_line_count_in_range(0, 3), 1);
CHECK_EQ(code_edit->get_visible_line_count_in_range(4, 4), 1);
}
SUBCASE("[CodeEdit] folding carets") { SUBCASE("[CodeEdit] folding carets") {
// Folding a line moves all carets that would be hidden. // Folding a line moves all carets that would be hidden.
code_edit->set_text("test\n\tline1\n\t\tline 2\n"); code_edit->set_text("test\n\tline1\n\t\tline 2\n");