fixed some bugs; reimplemented unit tests

Author: Lazy-Rabbit-2001

doc/classes/ProjectSettings.xml

@@ -480,6 +480,9 @@
 		<member name="debug/gdscript/warnings/assert_always_true" type="int" setter="" getter="" default="1">
 			When set to [code]warn[/code] or [code]error[/code], produces a warning or an error respectively when an [code]assert[/code] call always evaluates to [code]true[/code].
 		</member>
+		<member name="debug/gdscript/warnings/call_private_method" type="int" setter="" getter="" default="1">
+			When set to [code]warn[/code] or [code]error[/code], produces a warning or an error respectively when a class method is called from external places, such as calling a private method from other classes that are not derived from the class where the method is defined.
+		</member>
 		<member name="debug/gdscript/warnings/confusable_capture_reassignment" type="int" setter="" getter="" default="1">
 			When set to [code]warn[/code] or [code]error[/code], produces a warning or an error respectively when a local variable captured by a lambda is reassigned, since this does not modify the outer local variable.
 		</member>

modules/gdscript/gdscript_analyzer.cpp

@@ -1965,15 +1965,14 @@ void GDScriptAnalyzer::check_access_private_member(GDScriptParser::IdentifierNod
 	}
 
 	GDScriptParser::DataType target_resolved = type_from_metatype(p_datatype);
-	bool target_has_member = target_resolved.class_type != nullptr && !target_resolved.class_type->has_member(p_identifier->name);
-	if (!target_has_member && p_is_call && !ClassDB::has_method(target_resolved.native_type, p_identifier->name)) {
+	if (target_resolved.class_type != nullptr && !target_resolved.class_type->has_member(p_identifier->name)) {
 		return; // Accessing an inexisting method
 	}
-	if (is_type_compatible(p_datatype, parser->current_class->get_datatype(), true)) {
+	if (is_type_compatible(target_resolved, type_from_metatype(parser->current_class->get_datatype()))) {
 		return;
 	}
 
-	parser->push_warning(p_identifier, p_is_call ? GDScriptWarning::CALLING_PRIVATE_METHOD : GDScriptWarning::ACCESS_PRIVATE_MEMBER, p_identifier->name);
+	parser->push_warning(p_identifier, p_is_call ? GDScriptWarning::CALL_PRIVATE_METHOD : GDScriptWarning::ACCESS_PRIVATE_MEMBER, p_identifier->name);
 
 	/*GDScriptParser::ClassNode *base_class = parser->current_class->base_type.class_type;
 	while (base_class != nullptr) {

modules/gdscript/gdscript_warning.cpp

@@ -165,7 +165,7 @@ String GDScriptWarning::get_message() const {
 		case ACCESS_PRIVATE_MEMBER:
 			CHECK_SYMBOLS(1);
 			return vformat(R"(Trying to access a private member "%s" from an external place, which would cause problems during runtime.)", symbols[0]);
-		case CALLING_PRIVATE_METHOD:
+		case CALL_PRIVATE_METHOD:
 			CHECK_SYMBOLS(1);
 			return vformat(R"*(Trying to call a private method "%s()" from an external place, which would cause problems during runtime.)*", symbols[0]);
 #ifndef DISABLE_DEPRECATED
@@ -245,7 +245,7 @@ String GDScriptWarning::get_name_from_code(Code p_code) {
 		"GET_NODE_DEFAULT_WITHOUT_ONREADY",
 		"ONREADY_WITH_EXPORT",
 		"ACCESS_PRIVATE_MEMBER",
-		"CALLING_PRIVATE_METHOD",
+		"CALL_PRIVATE_METHOD",
 #ifndef DISABLE_DEPRECATED
 		"PROPERTY_USED_AS_FUNCTION",
 		"CONSTANT_USED_AS_FUNCTION",

modules/gdscript/gdscript_warning.h

@@ -90,7 +90,7 @@ class GDScriptWarning {
 		GET_NODE_DEFAULT_WITHOUT_ONREADY, // A class variable uses `get_node()` (or the `$` notation) as its default value, but does not use the @onready annotation.
 		ONREADY_WITH_EXPORT, // The `@onready` annotation will set the value after `@export` which is likely not intended.
 		ACCESS_PRIVATE_MEMBER, // Accessing a private member from external places. E.g. accessing an `_`-prefixed member from other classes that are not derived from the class where the member is defined.
-		CALLING_PRIVATE_METHOD, // Calling a private method from external places. E.g. calling an `_`-prefixed method from other classes that are not derived from the class where the method is defined.
+		CALL_PRIVATE_METHOD, // Calling a private method from external places. E.g. calling an `_`-prefixed method from other classes that are not derived from the class where the method is defined.
 #ifndef DISABLE_DEPRECATED
 		PROPERTY_USED_AS_FUNCTION, // Function not found, but there's a property with the same name.
 		CONSTANT_USED_AS_FUNCTION, // Function not found, but there's a constant with the same name.
@@ -149,7 +149,7 @@ class GDScriptWarning {
 		ERROR, // GET_NODE_DEFAULT_WITHOUT_ONREADY // May not work as expected.
 		ERROR, // ONREADY_WITH_EXPORT // May not work as expected.
 		WARN, // ACCESS_PRIVATE_MEMBER
-		WARN, // CALLING_PRIVATE_METHOD
+		WARN, // CALL_PRIVATE_METHOD
 #ifndef DISABLE_DEPRECATED
 		WARN, // PROPERTY_USED_AS_FUNCTION
 		WARN, // CONSTANT_USED_AS_FUNCTION

modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.gd

@@ -15,6 +15,7 @@ class SuperMethodsRecognized extends BaseClass:
 		return result
 
 func test():
+	@warning_ignore_start("call_private_method")
 	var test1 = SuperClassMethodsRecognized.new()
 	print(test1._get_property_list()) # Calls base class's method.
 	var test2 = SuperMethodsRecognized.new()

modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.gd

@@ -151,6 +151,30 @@ func test_unsafe_void_return() -> void:
 func get_class():
 	pass
 
+class PrivA:
+    var _t = 1
+
+    func _priv_method():
+        _t = 5
+
+class PrivB:
+    var a = PrivA.new()
+
+    func _foo():
+		@warning_ignore("access_private_member")
+        a._t = 2
+		@warning_ignore("call_private_method")
+        a._priv_method()
+
+class PrivC extends PrivA:
+    var a = PrivA.new()
+
+    func _foo():
+		@warning_ignore("access_private_member")
+        a._t = 2
+		@warning_ignore("call_private_method")
+        a._priv_method()
+
 # We don't want to execute it because of errors, just analyze.
 func test():
 	pass

modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.out

@@ -1 +1,2 @@
-GDTEST_OK
+GDTEST_PARSER_ERROR
+Used space character for indentation instead of tab as used before in the file.

modules/gdscript/tests/scripts/analyzer/warnings/access_modifier_soft.gd

@@ -0,0 +1,22 @@
+class A:
+    var _t = 1
+
+    func _priv_method():
+        _t = 5
+
+class B:
+    var a = A.new()
+
+    func _foo():
+        a._t = 2
+        a._priv_method()
+
+class C extends A:
+    var a = A.new()
+
+    func _foo():
+        a._t = 2
+        a._priv_method()
+
+func test():
+    pass

modules/gdscript/tests/scripts/analyzer/warnings/access_modifier_soft.out

@@ -0,0 +1,3 @@
+GDTEST_OK
+~~ WARNING at line 11: (ACCESS_PRIVATE_MEMBER) Trying to access a private member "_t" from an external place, which would cause problems during runtime.
+~~ WARNING at line 12: (CALL_PRIVATE_METHOD) Trying to call a private method "_priv_method()" from an external place, which would cause problems during runtime.

modules/gdscript/tests/scripts/runtime/features/onready_base_before_subclass.gd

@@ -14,5 +14,6 @@ class B extends A:
 
 func test():
 	var node := B.new()
+	@warning_ignore("call_private_method")
 	node._ready()
 	node.free()