瀏覽代碼

GDScript: Don't allow @onready without inheriting Node

George Marques 2 年之前
父節點
當前提交
3941af3d91

+ 4 - 0
modules/gdscript/gdscript_parser.cpp

@@ -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) {
 	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);
 	if (variable->onready) {
 		push_error(R"("@onready" annotation can only be used once per variable.)");

+ 5 - 0
modules/gdscript/tests/scripts/analyzer/errors/get_node_shorthand_within_non_node.gd

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

+ 2 - 0
modules/gdscript/tests/scripts/analyzer/errors/get_node_shorthand_within_non_node.out

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

+ 6 - 0
modules/gdscript/tests/scripts/analyzer/errors/onready_within_non_node.gd

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

+ 2 - 0
modules/gdscript/tests/scripts/analyzer/errors/onready_within_non_node.out

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