godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

GDScript: Don't allow @onready without inheriting Node

Browse Source
This commit is contained in:
George Marques
2023-02-06 10:45:38 -03:00
parent 47c3e3b781
commit 3941af3d91
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.cpp
View File

@@ -3611,6 +3611,10 @@ bool GDScriptParser::icon_annotation(const AnnotationNode *p_annotation, Node *p
bool GDScriptParser::onready_annotation(const AnnotationNode *p_annotation, Node *p_node) { 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.)"); 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"))) {
push_error(R"("@onready" can only be used in classes that inherit "Node".)", p_annotation);
}
VariableNode *variable = static_cast<VariableNode *>(p_node); VariableNode *variable = static_cast<VariableNode *>(p_node);
if (variable->onready) { if (variable->onready) {
push_error(R"("@onready" annotation can only be used once per variable.)"); push_error(R"("@onready" annotation can only be used once per variable.)");

5
modules/gdscript/tests/scripts/analyzer/errors/get_node_shorthand_within_non_node.gd Normal file
View File

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

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

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot use shorthand "get_node()" notation ("$") on a class that isn't a node.

6
modules/gdscript/tests/scripts/analyzer/errors/onready_within_non_node.gd Normal file
View File

@@ -0,0 +1,6 @@
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.out Normal file
View File

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