godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-18 14:21:41 +00:00
Code Releases Wiki Activity

GDScript: Fix annotation parsing adding new annotation entries

Browse Source
This commit is contained in:
HolonProduction
2024-10-13 19:01:30 +02:00
parent 92e51fca72
commit 140c6a612e
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_parser.cpp
View File

@@ -1624,6 +1624,7 @@ GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_vali
valid = false; valid = false;
} }
if (valid) {
annotation->info = &valid_annotations[annotation->name]; annotation->info = &valid_annotations[annotation->name];
if (!annotation->applies_to(p_valid_targets)) { if (!annotation->applies_to(p_valid_targets)) {
@@ -1634,6 +1635,7 @@ GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_vali
} }
valid = false; valid = false;
} }
}
if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) { if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
push_multiline(true); push_multiline(true);

3
modules/gdscript/tests/scripts/parser/errors/annotation_inapplicable.gd Normal file
View File

@@ -0,0 +1,3 @@
@export
func test():
pass

2
modules/gdscript/tests/scripts/parser/errors/annotation_inapplicable.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Annotation "@export" cannot be applied to a function.

3
modules/gdscript/tests/scripts/parser/errors/annotation_unrecognized.gd Normal file
View File

@@ -0,0 +1,3 @@
@hello_world
func test():
pass

2
modules/gdscript/tests/scripts/parser/errors/annotation_unrecognized.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Unrecognized annotation: "@hello_world".