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

GDScript: Fix inheritance check of @onready for inner classes

Browse Source
This commit is contained in:
George Marques 2023-02-06 14:52:13 -03:00
parent eee343210d
commit ed5ddab7e5
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_parser.cpp
View File

@ -3619,7 +3619,7 @@ bool GDScriptParser::icon_annotation(const AnnotationNode *p_annotation, Node *p
bool GDScriptParser::onready_annotation(const AnnotationNode *p_annotation, Node *p_node) {
ERR_FAIL_COND_V_MSG(p_node->type != Node::VARIABLE, false, R"("@onready" annotation can only be applied to class variables.)");
if (head && !ClassDB::is_parent_class(head->get_datatype().native_type, SNAME("Node"))) {
if (current_class && !ClassDB::is_parent_class(current_class->get_datatype().native_type, SNAME("Node"))) {
push_error(R"("@onready" can only be used in classes that inherit "Node".)", p_annotation);
}

7
modules/gdscript/tests/scripts/analyzer/errors/onready_within_non_node_inner_class.gd Normal file
View File

@ -0,0 +1,7 @@
extends Node
class Inner extends RefCounted:
@onready var nope = 0
func test():
print("Cannot use @onready without a Node base")

2
modules/gdscript/tests/scripts/analyzer/errors/onready_within_non_node_inner_class.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
"@onready" can only be used in classes that inherit "Node".

7
modules/gdscript/tests/scripts/analyzer/features/onready_on_inner_class_with_non_node_outer.gd Normal file
View File

@ -0,0 +1,7 @@
extends RefCounted
func test():
print("ok")
class Inner extends Node:
@onready var okay = 0

2
modules/gdscript/tests/scripts/analyzer/features/onready_on_inner_class_with_non_node_outer.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_OK
ok