godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge ba3f4a4b24 into 15ff450680

This commit is contained in:
Julian Heuser 2025-02-28 01:36:01 +01:00 committed by GitHub
parent 15ff450680 ba3f4a4b24
commit 69359c13b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/editor/gdscript_highlighter.cpp
View File

@ -150,6 +150,12 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
break;
}
}
// "#region" and "#endregion" only highlighted if they're the first region on the line.
if (color_regions[c].type == ColorRegion::TYPE_CODE_REGION &&
str.strip_edges().split_spaces()[0] != "#region" &&
str.strip_edges().split_spaces()[0] != "#endregion") {
match = false;
}
if (!match) {
continue;
}

6
scene/gui/code_edit.cpp
View File

@ -1872,7 +1872,8 @@ bool CodeEdit::is_line_code_region_start(int p_line) const {
if (is_in_string(p_line) != -1) {
return false;
}
return get_line(p_line).strip_edges().begins_with(code_region_start_string);
Vector<String> split = get_line(p_line).strip_edges().split_spaces();
return split.size() > 0 && split[0] == code_region_start_string;
}
bool CodeEdit::is_line_code_region_end(int p_line) const {
@ -1883,7 +1884,8 @@ bool CodeEdit::is_line_code_region_end(int p_line) const {
if (is_in_string(p_line) != -1) {
return false;
}
return get_line(p_line).strip_edges().begins_with(code_region_end_string);
Vector<String> split = get_line(p_line).strip_edges().split_spaces();
return split.size() > 0 && split[0] == code_region_end_string;
}
/* Delimiters */