Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code Editor: Fix regression with using doc comments for code regions #83216

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Code Editor: Fix regression with using doc comments for code regions #83216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/gdscript/editor/gdscript_highlighter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,8 @@ void GDScriptSyntaxHighlighter::add_color_region(const String &p_start_key, cons
ERR_FAIL_COND_MSG(color_regions[i].start_key == p_start_key, "color region with start key '" + p_start_key + "' already exists.");
if (p_start_key.length() < color_regions[i].start_key.length()) {
at++;
} else {
break;
}
}

Expand Down
5 changes: 4 additions & 1 deletion scene/gui/code_edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,8 @@ void CodeEdit::_update_code_region_tags() {
return;
}

for (int i = 0; i < delimiters.size(); i++) {
// A shorter delimiter has higher priority.
for (int i = delimiters.size() - 1; i >= 0; i--) {
if (delimiters[i].type != DelimiterType::TYPE_COMMENT) {
continue;
}
Expand Down Expand Up @@ -3104,6 +3105,8 @@ void CodeEdit::_add_delimiter(const String &p_start_key, const String &p_end_key
ERR_FAIL_COND_MSG(delimiters[i].start_key == p_start_key, "delimiter with start key '" + p_start_key + "' already exists.");
if (p_start_key.length() < delimiters[i].start_key.length()) {
at++;
} else {
break;
}
}

Expand Down
6 changes: 3 additions & 3 deletions tests/scene/test_code_edit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2944,15 +2944,15 @@ TEST_CASE("[SceneTree][CodeEdit] region folding") {
CHECK(code_edit->is_line_code_region_end(2));

// Update code region delimiter when removing comment delimiter.
code_edit->set_text("//region region_name\nline2\n//endregion\n#region region_name\nline2\n#endregion");
code_edit->set_text("#region region_name\nline2\n#endregion\n//region region_name\nline2\n//endregion");
code_edit->clear_comment_delimiters();
code_edit->add_comment_delimiter("//", "");
code_edit->add_comment_delimiter("#", "");
code_edit->add_comment_delimiter("#", ""); // A shorter delimiter has higher priority.
CHECK(code_edit->is_line_code_region_start(0));
CHECK(code_edit->is_line_code_region_end(2));
CHECK_FALSE(code_edit->is_line_code_region_start(3));
CHECK_FALSE(code_edit->is_line_code_region_end(5));
code_edit->remove_comment_delimiter("//");
code_edit->remove_comment_delimiter("#");
CHECK_FALSE(code_edit->is_line_code_region_start(0));
CHECK_FALSE(code_edit->is_line_code_region_end(2));
CHECK(code_edit->is_line_code_region_start(3));
Expand Down
Loading