noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Remove script class checks when getting function signature"

Browse Source 
This reverts commit 0fef203b1f.

This introduced some other issues, as discussed in #72144.
This commit is contained in:
Rémi Verschelde
2023-02-07 16:28:52 +01:00
parent bdad9770d6
commit 98921d8fba
13 changed files with 13 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.gd
View File

@@ -1,5 +0,0 @@
const TestClass = preload("gdscript_duplicate_class.notest.gd")
func test():
# (TestClass as GDScript).duplicate() exists
TestClass.duplicate()

2
modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate.out
View File

@@ -1,2 +0,0 @@
GDTEST_ANALYZER_ERROR
Cannot call non-static function "duplicate()" on a class directly. Make an instance instead.

1
modules/gdscript/tests/scripts/analyzer/errors/gdscript_duplicate_class.notest.gd
View File

@@ -1 +0,0 @@
extends Node

6
modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.gd
View File

@@ -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()

1
modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate.out
View File

@@ -1 +0,0 @@
GDTEST_OK

1
modules/gdscript/tests/scripts/analyzer/features/gdscript_duplicate_class.notest.gd
View File

@@ -1 +0,0 @@
extends Node

13
modules/gdscript/tests/scripts/parser/features/super_class_check.gd
View File

@@ -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

1
modules/gdscript/tests/scripts/parser/features/super_class_check.out
View File

@@ -1 +0,0 @@
GDTEST_OK

19
modules/gdscript/tests/scripts/runtime/features/static_duplicate.gd
View File

@@ -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)

9
modules/gdscript/tests/scripts/runtime/features/static_duplicate.out
View File

@@ -1,9 +0,0 @@
GDTEST_OK
preload duplicate
true
true
preload duplicate
true
true
preload duplicate
false

5
modules/gdscript/tests/scripts/runtime/features/static_duplicate_preload.notest.gd
View File

@@ -1,5 +0,0 @@
extends RefCounted
static func duplicate() -> Vector2:
print("preload duplicate")
return Vector2.ONE