Skip to content

Fix typed Dictionaries with objects failing to load #1517

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

Open
KazW wants to merge 3 commits into
base: master
Choose a base branch
from
+84 −4
Open

Fix typed Dictionaries with objects failing to load #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7292364
Remove unused loop variable in `EditorPropertySizeFlags::setup()`
KazW Oct 15, 2026
36798b5
Fix typed Dictionaries with objects failing to load
KazW Oct 15, 2026
4962752
Test parsing typed Dictionaries with object keys
KazW Oct 15, 2026
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
6 changes: 3 additions & 3 deletions core/variant/variant_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
key_type = builtin_types.get(token.value);
} else if (token.value == "Resource" || token.value == "SubResource" || token.value == "ExtResource") {
Variant resource;
err = parse_value(token, resource, p_stream, line, r_err_str, p_res_parser);
err = parse_value(token, resource, p_stream, line, r_err_str, p_res_parser, p_allow_objects);
if (err) {
if (token.value == "Resource" && err == ERR_PARSE_ERROR && r_err_str == "Expected '('" && token.type == TK_COMMA) {
err = OK;
Expand Down Expand Up @@ -1436,7 +1436,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
value_type = builtin_types.get(token.value);
} else if (token.value == "Resource" || token.value == "SubResource" || token.value == "ExtResource") {
Variant resource;
err = parse_value(token, resource, p_stream, line, r_err_str, p_res_parser);
err = parse_value(token, resource, p_stream, line, r_err_str, p_res_parser, p_allow_objects);
if (err) {
if (token.value == "Resource" && err == ERR_PARSE_ERROR && r_err_str == "Expected '('" && token.type == TK_BRACKET_CLOSE) {
err = OK;
Expand Down Expand Up @@ -1491,7 +1491,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
}

Dictionary values;
err = _parse_dictionary(values, p_stream, line, r_err_str, p_res_parser);
err = _parse_dictionary(values, p_stream, line, r_err_str, p_res_parser, p_allow_objects);
if (err) {
return err;
}
Expand Down
2 changes: 1 addition & 1 deletion editor/scene/gui/control_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ void EditorPropertySizeFlags::setup(const Vector<String> &p_options, bool p_vert
}

HashMap<int, String> flags;
for (int i = 0, j = 0; i < p_options.size(); i++, j++) {
for (int i = 0; i < p_options.size(); i++) {
Vector<String> text_split = p_options[i].split(":");
int64_t current_val = text_split[1].to_int();
flags[current_val] = text_split[0];
Expand Down
80 changes: 80 additions & 0 deletions tests/core/variant/test_variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,6 +1955,86 @@ TEST_CASE("[Variant] Writer and parser object") {
CHECK_EQ(ref_counted->get_meta("test"), Variant(123));
}

TEST_CASE("[Variant] Parser typed dictionary with objects") {
VariantParser::StreamString ss;
Variant parsed;
String errs;
int line;

SUBCASE("Object values") {
const String encoded = "Dictionary[int, RefCounted]({\n1: Object(RefCounted,\"script\":null,\"metadata/test\":123)\n})";

ss.s = encoded;
ERR_PRINT_OFF;
Error error = VariantParser::parse(&ss, parsed, errs, line);
ERR_PRINT_ON;

CHECK_EQ(error, ERR_UNAUTHORIZED);

ss = VariantParser::StreamString();
ss.s = encoded;
error = VariantParser::parse(&ss, parsed, errs, line, nullptr, true);

CHECK_EQ(error, OK);
Dictionary dict = parsed;
CHECK(dict.is_typed());
CHECK_EQ(dict.get_typed_value_class_name(), RefCounted::get_class_static());
Ref<RefCounted> ref_counted = dict[1];
CHECK(ref_counted.is_valid());
if (ref_counted.is_valid()) {
CHECK_EQ(ref_counted->get_meta("test"), Variant(123));
}
}

SUBCASE("Object keys") {
const String encoded = "Dictionary[Resource, int]({\nObject(Resource,\"script\":null,\"resource_name\":\"key\"): 1\n})";

ss.s = encoded;
ERR_PRINT_OFF;
Error error = VariantParser::parse(&ss, parsed, errs, line);
ERR_PRINT_ON;

CHECK_EQ(error, ERR_UNAUTHORIZED);

ss = VariantParser::StreamString();
ss.s = encoded;
error = VariantParser::parse(&ss, parsed, errs, line, nullptr, true);

CHECK_EQ(error, OK);
Dictionary dict = parsed;
CHECK_EQ(dict.get_typed_key_class_name(), Resource::get_class_static());
CHECK_EQ(dict.size(), 1);
if (dict.size() == 1) {
Ref<Resource> key = dict.keys()[0];
CHECK(key.is_valid());
if (key.is_valid()) {
CHECK_EQ(key->get_name(), "key");
CHECK_EQ(dict[key], Variant(1));
}
}
}

SUBCASE("Resource key type") {
ss.s = "Dictionary[Resource, int]({\n})";
Error error = VariantParser::parse(&ss, parsed, errs, line, nullptr, true);

CHECK_EQ(error, OK);
Dictionary dict = parsed;
CHECK(dict.get_typed_key_builtin() == Variant::OBJECT);
CHECK_EQ(dict.get_typed_key_class_name(), Resource::get_class_static());
}

SUBCASE("Resource value type") {
ss.s = "Dictionary[int, Resource]({\n})";
Error error = VariantParser::parse(&ss, parsed, errs, line, nullptr, true);

CHECK_EQ(error, OK);
Dictionary dict = parsed;
CHECK(dict.get_typed_value_builtin() == Variant::OBJECT);
CHECK_EQ(dict.get_typed_value_class_name(), Resource::get_class_static());
}
}

TEST_CASE("[Variant] Basic comparison") {
CHECK_EQ(Variant(1), Variant(1));
CHECK_FALSE(Variant(1) != Variant(1));
Expand Down
Loading