From 745f8e112fcf5d61e0fc377bdbc2539dd6b16ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 29 Jan 2024 21:00:26 +0100 Subject: Revert "Add UID support to GDScript files" This reverts commit c7f68a27ec4b825302998eeb5a400f869cd21cf7. We still think GDScript files need UIDs to allow safe refactoring, but we're still debating what form those should take exactly. So far there seems to be agreement that it shouldn't be done via an annotation as implemented here, so we're reverting this one for now, to revisit the feature in a future PR. --- modules/gdscript/gdscript_parser.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'modules/gdscript/gdscript_parser.h') diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 8cbf862f1a..11c5e51b9a 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -736,8 +736,6 @@ public: IdentifierNode *identifier = nullptr; String icon_path; String simplified_icon_path; - String uid_string; - Vector2i uid_lines = Vector2i(-1, -1); Vector members; HashMap members_indices; ClassNode *outer = nullptr; @@ -1320,7 +1318,6 @@ private: friend class GDScriptAnalyzer; bool _is_tool = false; - bool _has_uid = false; String script_path; bool for_completion = false; bool panic_mode = false; @@ -1476,7 +1473,6 @@ private: static bool register_annotation(const MethodInfo &p_info, uint32_t p_target_kinds, AnnotationAction p_apply, const Vector &p_default_arguments = Vector(), bool p_is_vararg = false); bool validate_annotation_arguments(AnnotationNode *p_annotation); void clear_unused_annotations(); - bool uid_annotation(const AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class); bool tool_annotation(const AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class); bool icon_annotation(const AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class); bool onready_annotation(const AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class); -- cgit v1.2.3