godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDScript: Fix conflict between property and group names 

(cherry picked from commit bf8f996212)
This commit is contained in:
Danil Alexeev 2023-06-15 08:02:42 +03:00 committed by Yuri Sizov
parent c4be3487ca
commit 102f93b8b8
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdscript/gdscript_compiler.cpp
View File

@ -2705,20 +2705,21 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri
case GDScriptParser::ClassNode::Member::GROUP: { case GDScriptParser::ClassNode::Member::GROUP: {
const GDScriptParser::AnnotationNode *annotation = member.annotation; const GDScriptParser::AnnotationNode *annotation = member.annotation;
StringName name = annotation->export_info.name; // Avoid name conflict. See GH-78252.
StringName name = vformat("@group_%d_%s", p_script->members.size(), annotation->export_info.name);
// This is not a normal member, but we need this to keep indices in order. // This is not a normal member, but we need this to keep indices in order.
GDScript::MemberInfo minfo; GDScript::MemberInfo minfo;
minfo.index = p_script->member_indices.size(); minfo.index = p_script->member_indices.size();
PropertyInfo prop_info; PropertyInfo prop_info;
prop_info.name = name; prop_info.name = annotation->export_info.name;
prop_info.usage = annotation->export_info.usage; prop_info.usage = annotation->export_info.usage;
prop_info.hint_string = annotation->export_info.hint_string; prop_info.hint_string = annotation->export_info.hint_string;
p_script->member_info[name] = prop_info; p_script->member_info[name] = prop_info;
p_script->member_indices[name] = minfo; p_script->member_indices[name] = minfo;
p_script->members.insert(name); p_script->members.insert(Variant());
} break; } break;
default: default:

4
modules/gdscript/gdscript_parser.h
View File

@ -753,7 +753,9 @@ public:
members.push_back(Member(p_enum_value)); members.push_back(Member(p_enum_value));
} }
void add_member_group(AnnotationNode *p_annotation_node) { void add_member_group(AnnotationNode *p_annotation_node) {
members_indices[p_annotation_node->export_info.name] = members.size(); // Avoid name conflict. See GH-78252.
StringName name = vformat("@group_%d_%s", members.size(), p_annotation_node->export_info.name);
members_indices[name] = members.size();
members.push_back(Member(p_annotation_node)); members.push_back(Member(p_annotation_node));
} }

17
modules/gdscript/tests/scripts/runtime/features/export_group_no_name_conflict_with_properties.gd Normal file
View File

@ -0,0 +1,17 @@
extends RefCounted # TODO: Fix standalone annotations parsing.
# GH-73843
@export_group("Resource")
# GH-78252
@export var prop_1: int
@export_category("prop_1")
@export var prop_2: int
func test():
var resource := Resource.new()
prints("Not shadowed:", resource.get_class())
for property in get_property_list():
if property.name in ["prop_1", "prop_2"]:
print(property)

5
modules/gdscript/tests/scripts/runtime/features/export_group_no_name_conflict_with_properties.out Normal file
View File

@ -0,0 +1,5 @@
GDTEST_OK
Not shadowed: Resource
{ "name": "prop_1", "class_name": &"", "type": 2, "hint": 0, "hint_string": "int", "usage": 4102 }
{ "name": "prop_1", "class_name": &"", "type": 0, "hint": 0, "hint_string": "", "usage": 128 }
{ "name": "prop_2", "class_name": &"", "type": 2, "hint": 0, "hint_string": "int", "usage": 4102 }