godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Change container_element_type to vector container

Browse Source
This commit is contained in:
Thaddeus Crews
2023-09-14 13:31:07 -05:00
parent d76c1d0e51
commit 5cf0d772bc
9 changed files with 168 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/editor/gdscript_docgen.cpp
View File

@@ -64,8 +64,8 @@ void GDScriptDocGen::_doctype_from_gdtype(const GDType &p_gdtype, String &r_type
r_type = p_is_return ? "void" : "null";
return;
}
if (p_gdtype.builtin_type == Variant::ARRAY && p_gdtype.has_container_element_type()) {
_doctype_from_gdtype(p_gdtype.get_container_element_type(), r_type, r_enum);
if (p_gdtype.builtin_type == Variant::ARRAY && p_gdtype.has_container_element_type(0)) {
_doctype_from_gdtype(p_gdtype.get_container_element_type(0), r_type, r_enum);
if (!r_enum.is_empty()) {
r_type = "int[]";
r_enum += "[]";

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

@@ -494,7 +494,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
in_function_arg_dicts = 0;
}
if (expect_type && (prev_is_char || str[j] == '=') && str[j] != '[' && str[j] != '.') {
if (expect_type && (prev_is_char || str[j] == '=') && str[j] != '[' && str[j] != ',' && str[j] != '.') {
expect_type = false;
}