mirror of
https://github.com/godotengine/godot.git
synced 2026-03-03 20:55:48 +00:00
Fix GDScript code style regarding colon
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
|
||||
enum MyOtherEnum { OTHER_ENUM_VALUE_1, OTHER_ENUM_VALUE_2 }
|
||||
|
||||
func enum_func(e : MyEnum) -> void:
|
||||
func enum_func(e: MyEnum) -> void:
|
||||
print(e)
|
||||
|
||||
func test():
|
||||
|
||||
@@ -4,4 +4,4 @@ func test():
|
||||
x.free()
|
||||
|
||||
var ok = x
|
||||
var bad : Node = x
|
||||
var bad: Node = x
|
||||
|
||||
@@ -2,5 +2,5 @@ enum LocalNamed { VALUE_A, VALUE_B, VALUE_C = 42 }
|
||||
|
||||
func test():
|
||||
const P = preload("../features/enum_from_outer.gd")
|
||||
var x : LocalNamed
|
||||
var x: LocalNamed
|
||||
x = P.Named.VALUE_A
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
var _prop : int
|
||||
var _prop: int
|
||||
|
||||
# Getter function has wrong return type.
|
||||
var prop : String:
|
||||
var prop: String:
|
||||
get = get_prop
|
||||
|
||||
func get_prop():
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
var _prop : int
|
||||
var _prop: int
|
||||
|
||||
# Setter function has wrong argument type.
|
||||
var prop : String:
|
||||
var prop: String:
|
||||
set = set_prop
|
||||
|
||||
func set_prop(value : int):
|
||||
func set_prop(value: int):
|
||||
_prop = value
|
||||
|
||||
func test():
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
var _prop : int
|
||||
var _prop: int
|
||||
|
||||
# Inline getter returns int instead of String.
|
||||
var prop : String:
|
||||
var prop: String:
|
||||
get:
|
||||
return _prop
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
var _prop : int
|
||||
var _prop: int
|
||||
|
||||
# Inline setter assigns String to int.
|
||||
var prop : String:
|
||||
var prop: String:
|
||||
set(value):
|
||||
_prop = value
|
||||
|
||||
|
||||
@@ -7,4 +7,4 @@ func test():
|
||||
x.free()
|
||||
|
||||
var ok = x
|
||||
var bad : A = x
|
||||
var bad: A = x
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
enum Enum {V1, V2}
|
||||
|
||||
func test():
|
||||
var enumAsDict : Dictionary = Enum.duplicate()
|
||||
var enumAsDict: Dictionary = Enum.duplicate()
|
||||
var enumAsVariant = Enum.duplicate()
|
||||
print(Enum.has("V1"))
|
||||
print(enumAsDict.has("V1"))
|
||||
|
||||
@@ -5,19 +5,19 @@ enum MyEnum { V0, V1, V2 }
|
||||
class InnerClass:
|
||||
enum MyEnum { V0, V2, V1 }
|
||||
|
||||
func inner_inner_no_class(e : MyEnum) -> MyEnum:
|
||||
func inner_inner_no_class(e: MyEnum) -> MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func inner_inner_class(e : InnerClass.MyEnum) -> InnerClass.MyEnum:
|
||||
func inner_inner_class(e: InnerClass.MyEnum) -> InnerClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func inner_inner_class_class(e : EnumFunctionTypecheckOuterClass.InnerClass.MyEnum) -> EnumFunctionTypecheckOuterClass.InnerClass.MyEnum:
|
||||
func inner_inner_class_class(e: EnumFunctionTypecheckOuterClass.InnerClass.MyEnum) -> EnumFunctionTypecheckOuterClass.InnerClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func inner_outer(e : EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
|
||||
func inner_outer(e: EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
@@ -59,19 +59,19 @@ class InnerClass:
|
||||
print()
|
||||
|
||||
|
||||
func outer_outer_no_class(e : MyEnum) -> MyEnum:
|
||||
func outer_outer_no_class(e: MyEnum) -> MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func outer_outer_class(e : EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
|
||||
func outer_outer_class(e: EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func outer_inner_class(e : InnerClass.MyEnum) -> InnerClass.MyEnum:
|
||||
func outer_inner_class(e: InnerClass.MyEnum) -> InnerClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func outer_inner_class_class(e : EnumFunctionTypecheckOuterClass.InnerClass.MyEnum) -> EnumFunctionTypecheckOuterClass.InnerClass.MyEnum:
|
||||
func outer_inner_class_class(e: EnumFunctionTypecheckOuterClass.InnerClass.MyEnum) -> EnumFunctionTypecheckOuterClass.InnerClass.MyEnum:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
func print_enum(e : TileSet.TileShape) -> TileSet.TileShape:
|
||||
func print_enum(e: TileSet.TileShape) -> TileSet.TileShape:
|
||||
print(e)
|
||||
return e
|
||||
|
||||
func test():
|
||||
var v : TileSet.TileShape
|
||||
var v: TileSet.TileShape
|
||||
v = TileSet.TILE_SHAPE_SQUARE
|
||||
v = print_enum(v)
|
||||
v = print_enum(TileSet.TILE_SHAPE_SQUARE)
|
||||
|
||||
@@ -7,9 +7,9 @@ class InnerClass:
|
||||
|
||||
static func test_inner_from_inner():
|
||||
print("Inner - Inner")
|
||||
var e1 : MyEnum
|
||||
var e2 : InnerClass.MyEnum
|
||||
var e3 : EnumTypecheckOuterClass.InnerClass.MyEnum
|
||||
var e1: MyEnum
|
||||
var e2: InnerClass.MyEnum
|
||||
var e3: EnumTypecheckOuterClass.InnerClass.MyEnum
|
||||
|
||||
print("Self ", e1, e2, e3)
|
||||
e1 = MyEnum.V1
|
||||
@@ -36,7 +36,7 @@ class InnerClass:
|
||||
|
||||
static func test_outer_from_inner():
|
||||
print("Inner - Outer")
|
||||
var e : EnumTypecheckOuterClass.MyEnum
|
||||
var e: EnumTypecheckOuterClass.MyEnum
|
||||
|
||||
e = EnumTypecheckOuterClass.MyEnum.V1
|
||||
print("Outer.MyEnum ", e)
|
||||
@@ -45,8 +45,8 @@ class InnerClass:
|
||||
|
||||
func test_outer_from_outer():
|
||||
print("Outer - Outer")
|
||||
var e1 : MyEnum
|
||||
var e2 : EnumTypecheckOuterClass.MyEnum
|
||||
var e1: MyEnum
|
||||
var e2: EnumTypecheckOuterClass.MyEnum
|
||||
|
||||
print("Self ", e1, e2)
|
||||
e1 = MyEnum.V1
|
||||
@@ -63,8 +63,8 @@ func test_outer_from_outer():
|
||||
|
||||
func test_inner_from_outer():
|
||||
print("Outer - Inner")
|
||||
var e1 : InnerClass.MyEnum
|
||||
var e2 : EnumTypecheckOuterClass.InnerClass.MyEnum
|
||||
var e1: InnerClass.MyEnum
|
||||
var e2: EnumTypecheckOuterClass.InnerClass.MyEnum
|
||||
|
||||
print("Inner ", e1, e2)
|
||||
e1 = InnerClass.MyEnum.V1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var Value:int = 8 :
|
||||
var Value:int = 8:
|
||||
get:
|
||||
return Value
|
||||
set(v):
|
||||
|
||||
@@ -6,21 +6,21 @@ var prop1:
|
||||
prop1 = value
|
||||
|
||||
# Typed inline property
|
||||
var prop2 : int:
|
||||
var prop2: int:
|
||||
get:
|
||||
return prop2
|
||||
set(value):
|
||||
prop2 = value
|
||||
|
||||
# Typed inline property with default value
|
||||
var prop3 : int = 1:
|
||||
var prop3: int = 1:
|
||||
get:
|
||||
return prop3
|
||||
set(value):
|
||||
prop3 = value
|
||||
|
||||
# Typed inline property with backing variable
|
||||
var _prop4 : int = 2
|
||||
var _prop4: int = 2
|
||||
var prop4: int:
|
||||
get:
|
||||
return _prop4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
const preloaded : GDScript = preload("gdscript_to_preload.notest.gd")
|
||||
const preloaded: GDScript = preload("gdscript_to_preload.notest.gd")
|
||||
|
||||
func test():
|
||||
var preloaded_instance: preloaded = preloaded.new()
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# Do not fix code style here!
|
||||
|
||||
func test():
|
||||
# The following lines are equivalent:
|
||||
var _integer: int = 1
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
GDTEST_OK
|
||||
>> WARNING
|
||||
>> Line: 9
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER'
|
||||
>> WARNING
|
||||
>> Line: 10
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_TYPED' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_TYPED'
|
||||
>> WARNING
|
||||
>> Line: 11
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_TYPED2' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_TYPED2'
|
||||
>> The local constant '_INTEGER' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER'
|
||||
>> WARNING
|
||||
>> Line: 12
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_INFERRED' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_INFERRED'
|
||||
>> The local constant '_INTEGER_REDUNDANT_TYPED' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_TYPED'
|
||||
>> WARNING
|
||||
>> Line: 13
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_TYPED2' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_TYPED2'
|
||||
>> WARNING
|
||||
>> Line: 14
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_INFERRED' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_INFERRED'
|
||||
>> WARNING
|
||||
>> Line: 15
|
||||
>> UNUSED_LOCAL_CONSTANT
|
||||
>> The local constant '_INTEGER_REDUNDANT_INFERRED2' is declared but never used in the block. If this is intended, prefix it with an underscore: '__INTEGER_REDUNDANT_INFERRED2'
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
extends Node
|
||||
|
||||
@onready var later_inferred := [1]
|
||||
@onready var later_static : Array
|
||||
@onready var later_static_with_init : Array = [1]
|
||||
@onready var later_static: Array
|
||||
@onready var later_static_with_init: Array = [1]
|
||||
@onready var later_untyped = [1]
|
||||
|
||||
func test():
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#GDTEST_OK
|
||||
var prop : int = 0:
|
||||
var prop: int = 0:
|
||||
get:
|
||||
return prop
|
||||
set(value):
|
||||
|
||||
@@ -4,6 +4,6 @@ func test():
|
||||
@warning_ignore("narrowing_conversion")
|
||||
var foo: int = 0.0
|
||||
print(typeof(foo) == TYPE_INT)
|
||||
var dict : Dictionary = {"a":0.0}
|
||||
var dict: Dictionary = {"a": 0.0}
|
||||
foo = dict.get("a")
|
||||
print(typeof(foo) == TYPE_INT)
|
||||
|
||||
Reference in New Issue
Block a user