mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-07 00:44:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103825 from JulianHeuser/region_highlight_crash_fix

Browse Source 
Fix crash related to #region/#endregion caused by trailing spaces
This commit is contained in:
Thaddeus Crews 2025-03-11 19:54:46 -05:00
commit 754e3b3f9a
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/string/ustring.cpp
View File

@ -1175,7 +1175,7 @@ String String::get_slicec(char32_t p_splitter, int p_slice) const {
}
}
Vector<String> String::split_spaces() const {
Vector<String> String::split_spaces(int p_maxsplit) const {
Vector<String> ret;
int from = 0;
int i = 0;
@ -1199,6 +1199,11 @@ Vector<String> String::split_spaces() const {
}
if (empty && inside) {
if (p_maxsplit > 0 && p_maxsplit == ret.size()) {
// Put rest of the string and leave cycle.
ret.push_back(substr(from));
break;
}
ret.push_back(substr(from, i - from));
inside = false;
}

2
core/string/ustring.h
View File

@ -471,7 +471,7 @@ public:
Vector<String> split(const char *p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
Vector<String> rsplit(const String &p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
Vector<String> rsplit(const char *p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
Vector<String> split_spaces() const;
Vector<String> split_spaces(int p_maxsplit = 0) const;
Vector<double> split_floats(const String &p_splitter, bool p_allow_empty = true) const;
Vector<float> split_floats_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const;
Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const;

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

@ -151,10 +151,13 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
}
}
// "#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 (color_regions[c].type == ColorRegion::TYPE_CODE_REGION) {
Vector<String> str_stripped_split = str.strip_edges().split_spaces(1);
if (!str_stripped_split.is_empty() &&
str_stripped_split[0] != "#region" &&
str_stripped_split[0] != "#endregion") {
match = false;
}
}
if (!match) {
continue;

4
scene/gui/code_edit.cpp
View File

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

8
tests/core/string/test_string.h
View File

@ -730,6 +730,14 @@ TEST_CASE("[String] Splitting") {
CHECK(l[i] == slices[i]);
}
}
{
const String s = "Mars Jupiter Saturn Uranus";
const char *slices[2] = { "Mars", "Jupiter Saturn Uranus" };
Vector<String> l = s.split_spaces(1);
for (int i = 0; i < l.size(); i++) {
CHECK(l[i] == slices[i]);
}
}
{
const String s = "1.2;2.3 4.5";