From 98921d8fbaa83f53f0205ea77f522e37ba30ead2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 7 Feb 2023 16:28:52 +0100 Subject: Revert "Remove script class checks when getting function signature" This reverts commit 0fef203b1f39c3373f9f25b8e75e75f6b03f7c88. This introduced some other issues, as discussed in #72144. --- .../scripts/analyzer/errors/gdscript_duplicate.gd | 5 ----- .../scripts/analyzer/errors/gdscript_duplicate.out | 2 -- .../errors/gdscript_duplicate_class.notest.gd | 1 - .../scripts/analyzer/features/gdscript_duplicate.gd | 6 ------ .../scripts/analyzer/features/gdscript_duplicate.out | 1 - .../features/gdscript_duplicate_class.notest.gd | 1 - .../scripts/parser/features/super_class_check.gd | 13 ------------- .../scripts/parser/features/super_class_check.out | 1 - .../scripts/runtime/features/static_duplicate.gd | 19 ------------------- .../scripts/runtime/features/static_duplicate.out | 9 --------- .../features/static_duplicate_preload.notest.gd | 5 ----- 11 files changed, 63 deletions(-) delete mode 100644 modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.gd delete mode 100644 modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.out delete mode 100644 modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate_class.notest.gd delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.gd delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.out delete mode 100644 modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate_class.notest.gd delete mode 100644 modules/gdscript/tests/scripts/parser/features/super_class_check.gd delete mode 100644 modules/gdscript/tests/scripts/parser/features/super_class_check.out delete mode 100644 modules/gdscript/tests/scripts/runtime/features/static_duplicate.gd delete mode 100644 modules/gdscript/tests/scripts/runtime/features/static_duplicate.out delete mode 100644 modules/gdscript/tests/scripts/runtime/features/static_duplicate_preload.notest.gd (limited to 'modules/gdscript/tests') diff --git a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.gd b/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.gd deleted file mode 100644 index 966d2b0aa2..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.gd +++ /dev/null @@ -1,5 +0,0 @@ -const TestClass = preload("gdscript_duplicate_class.notest.gd") - -func test(): - # (TestClass as GDScript).duplicate() exists - TestClass.duplicate() diff --git a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.out b/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.out deleted file mode 100644 index b2c7fec86e..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.out +++ /dev/null @@ -1,2 +0,0 @@ -GDTEST_ANALYZER_ERROR -Cannot call non-static function "duplicate()" on a class directly. Make an instance instead. diff --git a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate_class.notest.gd b/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate_class.notest.gd deleted file mode 100644 index 61510e14cd..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate_class.notest.gd +++ /dev/null @@ -1 +0,0 @@ -extends Node diff --git a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.gd b/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.gd deleted file mode 100644 index 030daf502c..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.gd +++ /dev/null @@ -1,6 +0,0 @@ -const TestClass = preload("gdscript_duplicate_class.notest.gd") - -func test(): - # TestClass.duplicate() fails - @warning_ignore("return_value_discarded") - (TestClass as GDScript).duplicate() diff --git a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.out b/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.out deleted file mode 100644 index d73c5eb7cd..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.out +++ /dev/null @@ -1 +0,0 @@ -GDTEST_OK diff --git a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate_class.notest.gd b/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate_class.notest.gd deleted file mode 100644 index 61510e14cd..0000000000 --- a/modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate_class.notest.gd +++ /dev/null @@ -1 +0,0 @@ -extends Node diff --git a/modules/gdscript/tests/scripts/parser/features/super_class_check.gd b/modules/gdscript/tests/scripts/parser/features/super_class_check.gd deleted file mode 100644 index edfc45a8d8..0000000000 --- a/modules/gdscript/tests/scripts/parser/features/super_class_check.gd +++ /dev/null @@ -1,13 +0,0 @@ -# https://github.com/godotengine/godot/issues/71994 - -func test(): - pass - -class A extends RefCounted: - pass - -class B extends A: - # Parsing `duplicate()` here would throw this error: - # Parse Error: The function signature doesn't match the parent. Parent signature is "duplicate(bool = default) -> Resource". - func duplicate(): - pass diff --git a/modules/gdscript/tests/scripts/parser/features/super_class_check.out b/modules/gdscript/tests/scripts/parser/features/super_class_check.out deleted file mode 100644 index d73c5eb7cd..0000000000 --- a/modules/gdscript/tests/scripts/parser/features/super_class_check.out +++ /dev/null @@ -1 +0,0 @@ -GDTEST_OK diff --git a/modules/gdscript/tests/scripts/runtime/features/static_duplicate.gd b/modules/gdscript/tests/scripts/runtime/features/static_duplicate.gd deleted file mode 100644 index 418501dcc5..0000000000 --- a/modules/gdscript/tests/scripts/runtime/features/static_duplicate.gd +++ /dev/null @@ -1,19 +0,0 @@ -const PreloadClass = preload("static_duplicate_preload.notest.gd") -const PreloadClassAlias = PreloadClass - -func test(): - var dup_preload_one = PreloadClass.duplicate() - print(dup_preload_one == Vector2.ONE) - - var dup_preload_two = (PreloadClass as GDScript).duplicate() - print(dup_preload_two is GDScript) - - var dup_preload_alias_one = PreloadClassAlias.duplicate() - print(dup_preload_alias_one == Vector2.ONE) - - var dup_preload_alias_two = (PreloadClassAlias as GDScript).duplicate() - print(dup_preload_alias_two is GDScript) - - var PreloadClassAsGDScript = PreloadClass as GDScript - var dup_preload_class_as_gdscript_one = PreloadClassAsGDScript.duplicate() - print(dup_preload_class_as_gdscript_one is GDScript) diff --git a/modules/gdscript/tests/scripts/runtime/features/static_duplicate.out b/modules/gdscript/tests/scripts/runtime/features/static_duplicate.out deleted file mode 100644 index 34cd5c7652..0000000000 --- a/modules/gdscript/tests/scripts/runtime/features/static_duplicate.out +++ /dev/null @@ -1,9 +0,0 @@ -GDTEST_OK -preload duplicate -true -true -preload duplicate -true -true -preload duplicate -false diff --git a/modules/gdscript/tests/scripts/runtime/features/static_duplicate_preload.notest.gd b/modules/gdscript/tests/scripts/runtime/features/static_duplicate_preload.notest.gd deleted file mode 100644 index 291ffc2c0b..0000000000 --- a/modules/gdscript/tests/scripts/runtime/features/static_duplicate_preload.notest.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends RefCounted - -static func duplicate() -> Vector2: - print("preload duplicate") - return Vector2.ONE -- cgit v1.2.3