diff options
Diffstat (limited to 'modules')
5 files changed, 30 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 8a49398f1a..c63f7ebede 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -3686,6 +3686,12 @@ bool GDScriptParser::validate_annotation_arguments(AnnotationNode *p_annotation) } bool GDScriptParser::tool_annotation(const AnnotationNode *p_annotation, Node *p_node) { +#ifdef DEBUG_ENABLED + if (this->_is_tool) { + push_error(R"("@tool" annotation can only be used once.)", p_annotation); + return false; + } +#endif // DEBUG_ENABLED this->_is_tool = true; return true; } @@ -3694,6 +3700,16 @@ bool GDScriptParser::icon_annotation(const AnnotationNode *p_annotation, Node *p ERR_FAIL_COND_V_MSG(p_node->type != Node::CLASS, false, R"("@icon" annotation can only be applied to classes.)"); ERR_FAIL_COND_V(p_annotation->resolved_arguments.is_empty(), false); ClassNode *p_class = static_cast<ClassNode *>(p_node); +#ifdef DEBUG_ENABLED + if (!p_class->icon_path.is_empty()) { + push_error(R"("@icon" annotation can only be used once.)", p_annotation); + return false; + } + if (String(p_annotation->resolved_arguments[0]).is_empty()) { + push_error(R"("@icon" annotation argument must contain the path to the icon.)", p_annotation->arguments[0]); + return false; + } +#endif // DEBUG_ENABLED p_class->icon_path = p_annotation->resolved_arguments[0]; return true; } diff --git a/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.gd b/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.gd new file mode 100644 index 0000000000..7500e406f6 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.gd @@ -0,0 +1,5 @@ +@icon("res://1.png") +@icon("res://1.png") + +func test(): + pass diff --git a/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.out b/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.out new file mode 100644 index 0000000000..d6cbc95d10 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/duplicate_icon.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +"@icon" annotation can only be used once. diff --git a/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.gd b/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.gd new file mode 100644 index 0000000000..3a2f7118f9 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.gd @@ -0,0 +1,5 @@ +@tool +@tool + +func test(): + pass diff --git a/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.out b/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.out new file mode 100644 index 0000000000..26fe23fb78 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/duplicate_tool.out @@ -0,0 +1,2 @@ +GDTEST_ANALYZER_ERROR +"@tool" annotation can only be used once. |