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

Clarify error message about script-level annotation

Browse Source
This commit is contained in:
Danil Alexeev 2023-01-24 13:10:45 +03:00
parent 4fa6edc888
commit 13215638a9
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_parser.cpp
View File

@ -1434,7 +1434,11 @@ GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_vali
annotation->info = &valid_annotations[annotation->name];
if (!annotation->applies_to(p_valid_targets)) {
push_error(vformat(R"(Annotation "%s" is not allowed in this level.)", annotation->name));
if (annotation->applies_to(AnnotationInfo::SCRIPT)) {
push_error(vformat(R"(Annotation "%s" must be at the top of the script, before "extends" and "class_name".)", annotation->name));
} else {
push_error(vformat(R"(Annotation "%s" is not allowed in this level.)", annotation->name));
}
valid = false;
}

2
modules/gdscript/tests/scripts/parser/errors/class_name_after_annotation.out
View File

@ -1,2 +1,2 @@
GDTEST_PARSER_ERROR
Annotation "@icon" is not allowed in this level.
Annotation "@icon" must be at the top of the script, before "extends" and "class_name".