Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add GDScript .editorconfig rules

Browse Source 
- Uniformize `.gd` unit test files indentation to tabs (where needed)
This commit is contained in:
Adam Scott 2022-12-26 11:24:17 -05:00
parent 91713ced81
commit 44d1d72af1
25 changed files with 232 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.editorconfig
View File

@ -21,3 +21,13 @@ indent_size = 4
[*.{yml,yaml}] [*.{yml,yaml}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
# GDScript unit test files
[*.gd]
indent_style = tab
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
[*.out]
insert_final_newline = true

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

@ -1,4 +1,5 @@
enum MyEnum { VALUE_A, VALUE_B, VALUE_C = 42 } enum MyEnum { VALUE_A, VALUE_B, VALUE_C = 42 }
func test(): func test():
const P = preload("../features/enum_value_from_parent.gd") const P = preload("../features/enum_value_from_parent.gd")
var local_var: MyEnum var local_var: MyEnum

14
modules/gdscript/tests/scripts/analyzer/errors/outer_class_lookup.gd
View File

@ -1,12 +1,12 @@
class A: class A:
class B: class B:
func test(): func test():
print(A.B.D) print(A.B.D)
class C: class C:
class D: class D:
pass pass
func test(): func test():
var inst = A.B.new() var inst = A.B.new()
inst.test() inst.test()

2
modules/gdscript/tests/scripts/analyzer/errors/return_null_in_void_func.gd
View File

@ -1,2 +1,2 @@
func test() -> void: func test() -> void:
return null return null

6
modules/gdscript/tests/scripts/analyzer/errors/return_variant_in_void_func.gd
View File

@ -1,4 +1,4 @@
func test() -> void: func test() -> void:
var a var a
a = 1 a = 1
return a return a

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

@ -11,4 +11,3 @@ func test() -> void:
Extend.InnerClass.InnerInnerClass.test_a_b_c(A.new(), B.new(), C.new()) Extend.InnerClass.InnerInnerClass.test_a_b_c(A.new(), B.new(), C.new())
Extend.InnerClass.InnerInnerClass.test_enum(C.TestEnum.HELLO_WORLD) Extend.InnerClass.InnerInnerClass.test_enum(C.TestEnum.HELLO_WORLD)
Extend.InnerClass.InnerInnerClass.test_a_prime(A.APrime.new()) Extend.InnerClass.InnerInnerClass.test_a_prime(A.APrime.new())

20
modules/gdscript/tests/scripts/analyzer/features/class_from_parent.gd
View File

@ -1,19 +1,19 @@
class A: class A:
var x = 3 var x = 3
class B: class B:
var x = 4 var x = 4
class C: class C:
var x = 5 var x = 5
class Test: class Test:
var a = A.new() var a = A.new()
var b: B = B.new() var b: B = B.new()
var c := C.new() var c := C.new()
func test(): func test():
var test_instance := Test.new() var test_instance := Test.new()
prints(test_instance.a.x) prints(test_instance.a.x)
prints(test_instance.b.x) prints(test_instance.b.x)
prints(test_instance.c.x) prints(test_instance.c.x)

4
modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant.gd
View File

@ -2,5 +2,5 @@ const External = preload("external_enum_as_constant_external.notest.gd")
const MyEnum = External.MyEnum const MyEnum = External.MyEnum
func test(): func test():
print(MyEnum.WAITING == 0) print(MyEnum.WAITING == 0)
print(MyEnum.GODOT == 1) print(MyEnum.GODOT == 1)

4
modules/gdscript/tests/scripts/analyzer/features/external_enum_as_constant_external.notest.gd
View File

@ -1,4 +1,4 @@
enum MyEnum { enum MyEnum {
WAITING, WAITING,
GODOT GODOT
} }

52
modules/gdscript/tests/scripts/analyzer/features/lookup_class.gd
View File

@ -1,50 +1,50 @@
# Inner-outer class lookup # Inner-outer class lookup
class A: class A:
const Q: = "right one" const Q: = "right one"
class X: class X:
const Q: = "wrong one" const Q: = "wrong one"
class Y extends X: class Y extends X:
class B extends A: class B extends A:
static func check() -> void: static func check() -> void:
print(Q) print(Q)
# External class lookup # External class lookup
const External: = preload("lookup_class_external.notest.gd") const External: = preload("lookup_class_external.notest.gd")
class Internal extends External.A: class Internal extends External.A:
static func check() -> void: static func check() -> void:
print(TARGET) print(TARGET)
class E extends External.E: class E extends External.E:
static func check() -> void: static func check() -> void:
print(TARGET) print(TARGET)
print(WAITING) print(WAITING)
# Variable lookup # Variable lookup
class C: class C:
var Q := 'right one' var Q := 'right one'
class D: class D:
const Q := 'wrong one' const Q := 'wrong one'
class E extends D: class E extends D:
class F extends C: class F extends C:
func check() -> void: func check() -> void:
print(Q) print(Q)
# Test # Test
func test() -> void: func test() -> void:
# Inner-outer class lookup # Inner-outer class lookup
Y.B.check() Y.B.check()
print("---") print("---")
# External class lookup # External class lookup
Internal.check() Internal.check()
Internal.E.check() Internal.E.check()
print("---") print("---")
# Variable lookup # Variable lookup
var f: = E.F.new() var f: = E.F.new()
f.check() f.check()

54
modules/gdscript/tests/scripts/analyzer/features/lookup_signal.gd
View File

@ -1,41 +1,41 @@
signal hello signal hello
func get_signal() -> Signal: func get_signal() -> Signal:
return hello return hello
class A: class A:
signal hello signal hello
func get_signal() -> Signal: func get_signal() -> Signal:
return hello return hello
class B: class B:
signal hello signal hello
func get_signal() -> Signal: func get_signal() -> Signal:
return hello return hello
class C extends A.B: class C extends A.B:
func get_signal() -> Signal: func get_signal() -> Signal:
return hello return hello
func test(): func test():
var a: = A.new() var a: = A.new()
var b: = A.B.new() var b: = A.B.new()
var c: = C.new() var c: = C.new()
var hello_a_result: = hello == a.get_signal() var hello_a_result: = hello == a.get_signal()
var hello_b_result: = hello == b.get_signal() var hello_b_result: = hello == b.get_signal()
var hello_c_result: = hello == c.get_signal() var hello_c_result: = hello == c.get_signal()
var a_b_result: = a.get_signal() == b.get_signal() var a_b_result: = a.get_signal() == b.get_signal()
var a_c_result: = a.get_signal() == c.get_signal() var a_c_result: = a.get_signal() == c.get_signal()
var b_c_result: = b.get_signal() == c.get_signal() var b_c_result: = b.get_signal() == c.get_signal()
var c_c_result: = c.get_signal() == c.get_signal() var c_c_result: = c.get_signal() == c.get_signal()
print("hello == A.hello? %s" % hello_a_result) print("hello == A.hello? %s" % hello_a_result)
print("hello == A.B.hello? %s" % hello_b_result) print("hello == A.B.hello? %s" % hello_b_result)
print("hello == C.hello? %s" % hello_c_result) print("hello == C.hello? %s" % hello_c_result)
print("A.hello == A.B.hello? %s" % a_b_result) print("A.hello == A.B.hello? %s" % a_b_result)
print("A.hello == C.hello? %s" % a_c_result) print("A.hello == C.hello? %s" % a_c_result)
print("A.B.hello == C.hello? %s" % b_c_result) print("A.B.hello == C.hello? %s" % b_c_result)
print("C.hello == C.hello? %s" % c_c_result) print("C.hello == C.hello? %s" % c_c_result)

4
modules/gdscript/tests/scripts/analyzer/features/return_variant_typed.gd
View File

@ -1,5 +1,5 @@
func variant() -> Variant: func variant() -> Variant:
return 'variant' return 'variant'
func test(): func test():
print(variant()) print(variant())

2
modules/gdscript/tests/scripts/parser/errors/class_name_after_annotation.gd
View File

@ -3,4 +3,4 @@
class_name HelloWorld class_name HelloWorld
func test(): func test():
pass pass

2
modules/gdscript/tests/scripts/parser/errors/double_dictionary_comma.gd
View File

@ -1,2 +1,2 @@
func test(): func test():
var dictionary = { hello = "world",, } var dictionary = { hello = "world",, }

6
modules/gdscript/tests/scripts/parser/errors/match_multiple_variable_binds_in_branch.gd
View File

@ -1,4 +1,4 @@
func test(): func test():
match 1: match 1:
[[[var a]]], 2: [[[var a]]], 2:
pass pass

62
modules/gdscript/tests/scripts/parser/features/advanced_expression_matching.gd
View File

@ -1,34 +1,34 @@
func foo(x): func foo(x):
match x: match x:
1 + 1: 1 + 1:
print("1+1") print("1+1")
[1,2,[1,{1:2,2:var z,..}]]: [1,2,[1,{1:2,2:var z,..}]]:
print("[1,2,[1,{1:2,2:var z,..}]]") print("[1,2,[1,{1:2,2:var z,..}]]")
print(z) print(z)
1 if true else 2: 1 if true else 2:
print("1 if true else 2") print("1 if true else 2")
1 < 2: 1 < 2:
print("1 < 2") print("1 < 2")
1 or 2 and 1: 1 or 2 and 1:
print("1 or 2 and 1") print("1 or 2 and 1")
6 | 1: 6 | 1:
print("1 | 1") print("1 | 1")
1 >> 1: 1 >> 1:
print("1 >> 1") print("1 >> 1")
1, 2 or 3, 4: 1, 2 or 3, 4:
print("1, 2 or 3, 4") print("1, 2 or 3, 4")
_: _:
print("wildcard") print("wildcard")
func test(): func test():
foo(6 | 1) foo(6 | 1)
foo(1 >> 1) foo(1 >> 1)
foo(2) foo(2)
foo(1) foo(1)
foo(1+1) foo(1+1)
foo(1 < 2) foo(1 < 2)
foo([2, 1]) foo([2, 1])
foo(4) foo(4)
foo([1, 2, [1, {1 : 2, 2:3}]]) foo([1, 2, [1, {1 : 2, 2:3}]])
foo([1, 2, [1, {1 : 2, 2:[1,3,5, "123"], 4:2}]]) foo([1, 2, [1, {1 : 2, 2:[1,3,5, "123"], 4:2}]])
foo([1, 2, [1, {1 : 2}]]) foo([1, 2, [1, {1 : 2}]])

48
modules/gdscript/tests/scripts/parser/features/basic_expression_matching.gd
View File

@ -1,27 +1,27 @@
func foo(x): func foo(x):
match x: match x:
1: 1:
print("1") print("1")
2: 2:
print("2") print("2")
[1, 2]: [1, 2]:
print("[1, 2]") print("[1, 2]")
3 or 4: 3 or 4:
print("3 or 4") print("3 or 4")
4: 4:
print("4") print("4")
{1 : 2, 2 : 3}: {1 : 2, 2 : 3}:
print("{1 : 2, 2 : 3}") print("{1 : 2, 2 : 3}")
_: _:
print("wildcard") print("wildcard")
func test(): func test():
foo(0) foo(0)
foo(1) foo(1)
foo(2) foo(2)
foo([1, 2]) foo([1, 2])
foo(3) foo(3)
foo(4) foo(4)
foo([4,4]) foo([4,4])
foo({1 : 2, 2 : 3}) foo({1 : 2, 2 : 3})
foo({1 : 2, 4 : 3}) foo({1 : 2, 4 : 3})

6
modules/gdscript/tests/scripts/parser/features/lambda_callable.gd
View File

@ -1,4 +1,4 @@
func test(): func test():
var my_lambda = func(x): var my_lambda = func(x):
print(x) print(x)
my_lambda.call("hello") my_lambda.call("hello")

76
modules/gdscript/tests/scripts/parser/features/match_dictionary.gd
View File

@ -1,43 +1,43 @@
func foo(x): func foo(x):
match x: match x:
{"key1": "value1", "key2": "value2"}: {"key1": "value1", "key2": "value2"}:
print('{"key1": "value1", "key2": "value2"}') print('{"key1": "value1", "key2": "value2"}')
{"key1": "value1", "key2"}: {"key1": "value1", "key2"}:
print('{"key1": "value1", "key2"}') print('{"key1": "value1", "key2"}')
{"key1", "key2": "value2"}: {"key1", "key2": "value2"}:
print('{"key1", "key2": "value2"}') print('{"key1", "key2": "value2"}')
{"key1", "key2"}: {"key1", "key2"}:
print('{"key1", "key2"}') print('{"key1", "key2"}')
{"key1": "value1"}: {"key1": "value1"}:
print('{"key1": "value1"}') print('{"key1": "value1"}')
{"key1"}: {"key1"}:
print('{"key1"}') print('{"key1"}')
_: _:
print("wildcard") print("wildcard")
func bar(x): func bar(x):
match x: match x:
{0}: {0}:
print("0") print("0")
{1}: {1}:
print("1") print("1")
{2}: {2}:
print("2") print("2")
_: _:
print("wildcard") print("wildcard")
func test(): func test():
foo({"key1": "value1", "key2": "value2"}) foo({"key1": "value1", "key2": "value2"})
foo({"key1": "value1", "key2": ""}) foo({"key1": "value1", "key2": ""})
foo({"key1": "", "key2": "value2"}) foo({"key1": "", "key2": "value2"})
foo({"key1": "", "key2": ""}) foo({"key1": "", "key2": ""})
foo({"key1": "value1"}) foo({"key1": "value1"})
foo({"key1": ""}) foo({"key1": ""})
foo({"key1": "value1", "key2": "value2", "key3": "value3"}) foo({"key1": "value1", "key2": "value2", "key3": "value3"})
foo({"key1": "value1", "key3": ""}) foo({"key1": "value1", "key3": ""})
foo({"key2": "value2"}) foo({"key2": "value2"})
foo({"key3": ""}) foo({"key3": ""})
bar({0: "0"}) bar({0: "0"})
bar({1: "1"}) bar({1: "1"})
bar({2: "2"}) bar({2: "2"})
bar({3: "3"}) bar({3: "3"})

40
modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd
View File

@ -1,26 +1,26 @@
func foo(x): func foo(x):
match x: match x:
1, [2]: 1, [2]:
print('1, [2]') print('1, [2]')
_: _:
print('wildcard') print('wildcard')
func bar(x): func bar(x):
match x: match x:
[1], [2], [3]: [1], [2], [3]:
print('[1], [2], [3]') print('[1], [2], [3]')
[4]: [4]:
print('[4]') print('[4]')
_: _:
print('wildcard') print('wildcard')
func test(): func test():
foo(1) foo(1)
foo([2]) foo([2])
foo(2) foo(2)
bar([1]) bar([1])
bar([2]) bar([2])
bar([3]) bar([3])
bar([4]) bar([4])
bar([5]) bar([5])

10
modules/gdscript/tests/scripts/parser/features/match_multiple_variable_binds_in_pattern.gd
View File

@ -1,6 +1,6 @@
func test(): func test():
match [1, 2, 3]: match [1, 2, 3]:
[var a, var b, var c]: [var a, var b, var c]:
print(a == 1) print(a == 1)
print(b == 2) print(b == 2)
print(c == 3) print(c == 3)

2
modules/gdscript/tests/scripts/runtime/errors/constant_dictionary_erase.gd
View File

@ -1,4 +1,4 @@
const dictionary := {} const dictionary := {}
func test(): func test():
dictionary.erase(0) dictionary.erase(0)

2
modules/gdscript/tests/scripts/runtime/features/array_string_stringname_equivalent.gd
View File

@ -9,7 +9,7 @@ func test():
array_sname.push_back(&"godot") array_sname.push_back(&"godot")
print("String in Array: ", "godot" in array_sname) print("String in Array: ", "godot" in array_sname)
# Not equal because the values are different types. # Not equal because the values are different types.
print("Arrays not equal: ", array_str != array_sname) print("Arrays not equal: ", array_str != array_sname)
var string_array: Array[String] = [] var string_array: Array[String] = []

2
modules/gdscript/tests/scripts/runtime/features/dictionary_string_stringname_equivalent.gd
View File

@ -13,5 +13,5 @@ func test():
print("String gets StringName: ", stringname_dict.get("abc")) print("String gets StringName: ", stringname_dict.get("abc"))
stringname_dict[&"abc"] = 42 stringname_dict[&"abc"] = 42
# They compare equal because StringName keys are converted to String. # They compare equal because StringName keys are converted to String.
print("String Dictionary == StringName Dictionary: ", string_dict == stringname_dict) print("String Dictionary == StringName Dictionary: ", string_dict == stringname_dict)

24
modules/gdscript/tests/scripts/runtime/features/parameter_shadowing.gd
View File

@ -3,23 +3,23 @@
var a: int = 1 var a: int = 1
func shadow_regular_assignment(a: Variant, b: Variant) -> void: func shadow_regular_assignment(a: Variant, b: Variant) -> void:
print(a) print(a)
print(self.a) print(self.a)
a = b a = b
print(a) print(a)
print(self.a) print(self.a)
var v := Vector2(0.0, 0.0) var v := Vector2(0.0, 0.0)
func shadow_subscript_assignment(v: Vector2, x: float) -> void: func shadow_subscript_assignment(v: Vector2, x: float) -> void:
print(v) print(v)
print(self.v) print(self.v)
v.x += x v.x += x
print(v) print(v)
print(self.v) print(self.v)
func test(): func test():
shadow_regular_assignment('a', 'b') shadow_regular_assignment('a', 'b')
shadow_subscript_assignment(Vector2(1.0, 1.0), 5.0) shadow_subscript_assignment(Vector2(1.0, 1.0), 5.0)