Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-06 19:01:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix GDScript code style regarding colon

Browse Source
This commit is contained in:
Danil Alexeev 2023-03-03 17:42:32 +03:00
parent 61d2c85511
commit ea5fd3d732
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
28 changed files with 74 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/DTLSServer.xml
View File

@ -23,8 +23,8 @@
func _process(delta): func _process(delta):
while server.is_connection_available(): while server.is_connection_available():
var peer : PacketPeerUDP = server.take_connection() var peer: PacketPeerUDP = server.take_connection()
var dtls_peer : PacketPeerDTLS = dtls.take_connection(peer) var dtls_peer: PacketPeerDTLS = dtls.take_connection(peer)
if dtls_peer.get_status() != PacketPeerDTLS.STATUS_HANDSHAKING: if dtls_peer.get_status() != PacketPeerDTLS.STATUS_HANDSHAKING:
continue # It is normal that 50% of the connections fails due to cookie exchange. continue # It is normal that 50% of the connections fails due to cookie exchange.
print("Peer connected!") print("Peer connected!")

4
doc/classes/EditorResourceConversionPlugin.xml
View File

@ -10,13 +10,13 @@
[gdscript] [gdscript]
extends EditorResourceConversionPlugin extends EditorResourceConversionPlugin
func _handles(resource : Resource): func _handles(resource: Resource):
return resource is ImageTexture return resource is ImageTexture
func _converts_to(): func _converts_to():
return "PortableCompressedTexture2D" return "PortableCompressedTexture2D"
func _convert(itex : Resource): func _convert(itex: Resource):
var ptex = PortableCompressedTexture2D.new() var ptex = PortableCompressedTexture2D.new()
ptex.create_from_image(itex.get_image(), PortableCompressedTexture2D.COMPRESSION_MODE_LOSSLESS) ptex.create_from_image(itex.get_image(), PortableCompressedTexture2D.COMPRESSION_MODE_LOSSLESS)
return ptex return ptex

8
doc/classes/GraphEdit.xml
View File

@ -31,8 +31,8 @@
Below is a sample code to help get started: Below is a sample code to help get started:
[codeblock] [codeblock]
func _is_in_input_hotzone(in_node, in_port, mouse_position): func _is_in_input_hotzone(in_node, in_port, mouse_position):
var port_size : Vector2 = Vector2(get_theme_constant("port_grab_distance_horizontal"), get_theme_constant("port_grab_distance_vertical")) var port_size: Vector2 = Vector2(get_theme_constant("port_grab_distance_horizontal"), get_theme_constant("port_grab_distance_vertical"))
var port_pos : Vector2 = in_node.get_position() + in_node.get_connection_input_position(in_port) - port_size / 2 var port_pos: Vector2 = in_node.get_position() + in_node.get_connection_input_position(in_port) - port_size / 2
var rect = Rect2(port_pos, port_size) var rect = Rect2(port_pos, port_size)
return rect.has_point(mouse_position) return rect.has_point(mouse_position)
@ -49,8 +49,8 @@
Below is a sample code to help get started: Below is a sample code to help get started:
[codeblock] [codeblock]
func _is_in_output_hotzone(in_node, in_port, mouse_position): func _is_in_output_hotzone(in_node, in_port, mouse_position):
var port_size : Vector2 = Vector2(get_theme_constant("port_grab_distance_horizontal"), get_theme_constant("port_grab_distance_vertical")) var port_size: Vector2 = Vector2(get_theme_constant("port_grab_distance_horizontal"), get_theme_constant("port_grab_distance_vertical"))
var port_pos : Vector2 = in_node.get_position() + in_node.get_connection_output_position(in_port) - port_size / 2 var port_pos: Vector2 = in_node.get_position() + in_node.get_connection_output_position(in_port) - port_size / 2
var rect = Rect2(port_pos, port_size) var rect = Rect2(port_pos, port_size)
return rect.has_point(mouse_position) return rect.has_point(mouse_position)

2
doc/classes/ImageTexture.xml
View File

@ -20,7 +20,7 @@
[b]Note:[/b] The image can be retrieved from an imported texture using the [method Texture2D.get_image] method, which returns a copy of the image: [b]Note:[/b] The image can be retrieved from an imported texture using the [method Texture2D.get_image] method, which returns a copy of the image:
[codeblock] [codeblock]
var texture = load("res://icon.svg") var texture = load("res://icon.svg")
var image : Image = texture.get_image() var image: Image = texture.get_image()
[/codeblock] [/codeblock]
An [ImageTexture] is not meant to be operated from within the editor interface directly, and is mostly useful for rendering images on screen dynamically via code. If you need to generate images procedurally from within the editor, consider saving and importing images as custom texture resources implementing a new [EditorImportPlugin]. An [ImageTexture] is not meant to be operated from within the editor interface directly, and is mostly useful for rendering images on screen dynamically via code. If you need to generate images procedurally from within the editor, consider saving and importing images as custom texture resources implementing a new [EditorImportPlugin].
[b]Note:[/b] The maximum texture size is 16384×16384 pixels due to graphics hardware limitations. [b]Note:[/b] The maximum texture size is 16384×16384 pixels due to graphics hardware limitations.

2
doc/classes/UDPServer.xml
View File

@ -22,7 +22,7 @@
func _process(delta): func _process(delta):
server.poll() # Important! server.poll() # Important!
if server.is_connection_available(): if server.is_connection_available():
var peer : PacketPeerUDP = server.take_connection() var peer: PacketPeerUDP = server.take_connection()
var packet = peer.get_packet() var packet = peer.get_packet()
print("Accepted peer: %s:%s" % [peer.get_packet_ip(), peer.get_packet_port()]) print("Accepted peer: %s:%s" % [peer.get_packet_ip(), peer.get_packet_port()])
print("Received data: %s" % [packet.get_string_from_utf8()]) print("Received data: %s" % [packet.get_string_from_utf8()])

4
doc/classes/XRInterface.xml
View File

@ -116,9 +116,9 @@
[b]Note:[/b] Not all runtimes support all environment blend modes, so it is important to check this at startup. For example: [b]Note:[/b] Not all runtimes support all environment blend modes, so it is important to check this at startup. For example:
[codeblock] [codeblock]
func _ready(): func _ready():
var xr_interface : XRInterface = XRServer.find_interface("OpenXR") var xr_interface: XRInterface = XRServer.find_interface("OpenXR")
if xr_interface and xr_interface.is_initialized(): if xr_interface and xr_interface.is_initialized():
var vp : Viewport = get_viewport() var vp: Viewport = get_viewport()
vp.use_xr = true vp.use_xr = true
var acceptable_modes = [ XRInterface.XR_ENV_BLEND_MODE_OPAQUE, XRInterface.XR_ENV_BLEND_MODE_ADDITIVE ] var acceptable_modes = [ XRInterface.XR_ENV_BLEND_MODE_OPAQUE, XRInterface.XR_ENV_BLEND_MODE_ADDITIVE ]
var modes = xr_interface.get_supported_environment_blend_modes() var modes = xr_interface.get_supported_environment_blend_modes()

14
editor/project_converter_3_to_4.cpp
View File

@ -70,9 +70,9 @@ public:
RegEx reg_json_print = RegEx("\\bJSON\\b\\.print\\("); RegEx reg_json_print = RegEx("\\bJSON\\b\\.print\\(");
RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)"); RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)");
RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)"); RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)");
RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)"); RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)");
RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$"); RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^\n]*$");
RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$"); RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$");
RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)"); RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)");
RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)"); RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)");
RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)"); RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)");
@ -833,10 +833,10 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
valid = valid && test_conversion_with_regex("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container); valid = valid && test_conversion_with_regex("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container);
valid = valid && test_conversion_with_regex("\n\nmastersync func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc(\"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container); valid = valid && test_conversion_with_regex("\n\nmastersync func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc(\"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container);
valid = valid && test_conversion_gdscript_builtin("var size : Vector2 = Vector2() setget set_function , get_function", "var size : Vector2 = Vector2() : get = get_function, set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function, get_function", "var size: Vector2 = Vector2(): get = get_function, set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size : Vector2 = Vector2() setget set_function , ", "var size : Vector2 = Vector2() : set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function, ", "var size: Vector2 = Vector2(): set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size : Vector2 = Vector2() setget set_function", "var size : Vector2 = Vector2() : set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function", "var size: Vector2 = Vector2(): set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size : Vector2 = Vector2() setget , get_function", "var size : Vector2 = Vector2() : get = get_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget , get_function", "var size: Vector2 = Vector2(): get = get_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); valid = valid && test_conversion_gdscript_builtin("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);

4
modules/gdscript/doc_classes/@GDScript.xml
View File

@ -285,7 +285,7 @@
@export var string = "" @export var string = ""
@export var int_number = 5 @export var int_number = 5
@export var float_number: float = 5 @export var float_number: float = 5
@export var image : Image @export var image: Image
[/codeblock] [/codeblock]
</description> </description>
</annotation> </annotation>
@ -309,7 +309,7 @@
Export a [Color] property without allowing its transparency ([member Color.a]) to be edited. Export a [Color] property without allowing its transparency ([member Color.a]) to be edited.
See also [constant PROPERTY_HINT_COLOR_NO_ALPHA]. See also [constant PROPERTY_HINT_COLOR_NO_ALPHA].
[codeblock] [codeblock]
@export_color_no_alpha var dye_color : Color @export_color_no_alpha var dye_color: Color
[/codeblock] [/codeblock]
</description> </description>
</annotation> </annotation>

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

@ -1,7 +1,7 @@
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 } enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
enum MyOtherEnum { OTHER_ENUM_VALUE_1, OTHER_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) print(e)
func test(): func test():

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

@ -4,4 +4,4 @@ func test():
x.free() x.free()
var ok = x var ok = x
var bad : Node = x var bad: Node = x

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

@ -2,5 +2,5 @@ enum LocalNamed { VALUE_A, VALUE_B, VALUE_C = 42 }
func test(): func test():
const P = preload("../features/enum_from_outer.gd") const P = preload("../features/enum_from_outer.gd")
var x : LocalNamed var x: LocalNamed
x = P.Named.VALUE_A x = P.Named.VALUE_A

4
modules/gdscript/tests/scripts/analyzer/errors/property_function_get_type_error.gd
View File

@ -1,7 +1,7 @@
var _prop : int var _prop: int
# Getter function has wrong return type. # Getter function has wrong return type.
var prop : String: var prop: String:
get = get_prop get = get_prop
func get_prop(): func get_prop():

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

@ -1,10 +1,10 @@
var _prop : int var _prop: int
# Setter function has wrong argument type. # Setter function has wrong argument type.
var prop : String: var prop: String:
set = set_prop set = set_prop
func set_prop(value : int): func set_prop(value: int):
_prop = value _prop = value
func test(): func test():

4
modules/gdscript/tests/scripts/analyzer/errors/property_inline_get_type_error.gd
View File

@ -1,7 +1,7 @@
var _prop : int var _prop: int
# Inline getter returns int instead of String. # Inline getter returns int instead of String.
var prop : String: var prop: String:
get: get:
return _prop return _prop

4
modules/gdscript/tests/scripts/analyzer/errors/property_inline_set_type_error.gd
View File

@ -1,7 +1,7 @@
var _prop : int var _prop: int
# Inline setter assigns String to int. # Inline setter assigns String to int.
var prop : String: var prop: String:
set(value): set(value):
_prop = value _prop = value

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

@ -7,4 +7,4 @@ func test():
x.free() x.free()
var ok = x var ok = x
var bad : A = x var bad: A = x

2
modules/gdscript/tests/scripts/analyzer/features/enum_duplicate_into_dict.gd
View File

@ -1,7 +1,7 @@
enum Enum {V1, V2} enum Enum {V1, V2}
func test(): func test():
var enumAsDict : Dictionary = Enum.duplicate() var enumAsDict: Dictionary = Enum.duplicate()
var enumAsVariant = Enum.duplicate() var enumAsVariant = Enum.duplicate()
print(Enum.has("V1")) print(Enum.has("V1"))
print(enumAsDict.has("V1")) print(enumAsDict.has("V1"))

16
modules/gdscript/tests/scripts/analyzer/features/enum_function_typecheck.gd
View File

@ -5,19 +5,19 @@ enum MyEnum { V0, V1, V2 }
class InnerClass: class InnerClass:
enum MyEnum { V0, V2, V1 } enum MyEnum { V0, V2, V1 }
func inner_inner_no_class(e : MyEnum) -> MyEnum: func inner_inner_no_class(e: MyEnum) -> MyEnum:
print(e) print(e)
return e return e
func inner_inner_class(e : InnerClass.MyEnum) -> InnerClass.MyEnum: func inner_inner_class(e: InnerClass.MyEnum) -> InnerClass.MyEnum:
print(e) print(e)
return 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) print(e)
return e return e
func inner_outer(e : EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum: func inner_outer(e: EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
print(e) print(e)
return e return e
@ -59,19 +59,19 @@ class InnerClass:
print() print()
func outer_outer_no_class(e : MyEnum) -> MyEnum: func outer_outer_no_class(e: MyEnum) -> MyEnum:
print(e) print(e)
return e return e
func outer_outer_class(e : EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum: func outer_outer_class(e: EnumFunctionTypecheckOuterClass.MyEnum) -> EnumFunctionTypecheckOuterClass.MyEnum:
print(e) print(e)
return e return e
func outer_inner_class(e : InnerClass.MyEnum) -> InnerClass.MyEnum: func outer_inner_class(e: InnerClass.MyEnum) -> InnerClass.MyEnum:
print(e) print(e)
return 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) print(e)
return e return e

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

@ -1,9 +1,9 @@
func print_enum(e : TileSet.TileShape) -> TileSet.TileShape: func print_enum(e: TileSet.TileShape) -> TileSet.TileShape:
print(e) print(e)
return e return e
func test(): func test():
var v : TileSet.TileShape var v: TileSet.TileShape
v = TileSet.TILE_SHAPE_SQUARE v = TileSet.TILE_SHAPE_SQUARE
v = print_enum(v) v = print_enum(v)
v = print_enum(TileSet.TILE_SHAPE_SQUARE) v = print_enum(TileSet.TILE_SHAPE_SQUARE)

16
modules/gdscript/tests/scripts/analyzer/features/enum_typecheck_inner_class.gd
View File

@ -7,9 +7,9 @@ class InnerClass:
static func test_inner_from_inner(): static func test_inner_from_inner():
print("Inner - Inner") print("Inner - Inner")
var e1 : MyEnum var e1: MyEnum
var e2 : InnerClass.MyEnum var e2: InnerClass.MyEnum
var e3 : EnumTypecheckOuterClass.InnerClass.MyEnum var e3: EnumTypecheckOuterClass.InnerClass.MyEnum
print("Self ", e1, e2, e3) print("Self ", e1, e2, e3)
e1 = MyEnum.V1 e1 = MyEnum.V1
@ -36,7 +36,7 @@ class InnerClass:
static func test_outer_from_inner(): static func test_outer_from_inner():
print("Inner - Outer") print("Inner - Outer")
var e : EnumTypecheckOuterClass.MyEnum var e: EnumTypecheckOuterClass.MyEnum
e = EnumTypecheckOuterClass.MyEnum.V1 e = EnumTypecheckOuterClass.MyEnum.V1
print("Outer.MyEnum ", e) print("Outer.MyEnum ", e)
@ -45,8 +45,8 @@ class InnerClass:
func test_outer_from_outer(): func test_outer_from_outer():
print("Outer - Outer") print("Outer - Outer")
var e1 : MyEnum var e1: MyEnum
var e2 : EnumTypecheckOuterClass.MyEnum var e2: EnumTypecheckOuterClass.MyEnum
print("Self ", e1, e2) print("Self ", e1, e2)
e1 = MyEnum.V1 e1 = MyEnum.V1
@ -63,8 +63,8 @@ func test_outer_from_outer():
func test_inner_from_outer(): func test_inner_from_outer():
print("Outer - Inner") print("Outer - Inner")
var e1 : InnerClass.MyEnum var e1: InnerClass.MyEnum
var e2 : EnumTypecheckOuterClass.InnerClass.MyEnum var e2: EnumTypecheckOuterClass.InnerClass.MyEnum
print("Inner ", e1, e2) print("Inner ", e1, e2)
e1 = InnerClass.MyEnum.V1 e1 = InnerClass.MyEnum.V1

2
modules/gdscript/tests/scripts/analyzer/features/getter_return_type.gd
View File

@ -1,4 +1,4 @@
var Value:int = 8 : var Value:int = 8:
get: get:
return Value return Value
set(v): set(v):

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

@ -6,21 +6,21 @@ var prop1:
prop1 = value prop1 = value
# Typed inline property # Typed inline property
var prop2 : int: var prop2: int:
get: get:
return prop2 return prop2
set(value): set(value):
prop2 = value prop2 = value
# Typed inline property with default value # Typed inline property with default value
var prop3 : int = 1: var prop3: int = 1:
get: get:
return prop3 return prop3
set(value): set(value):
prop3 = value prop3 = value
# Typed inline property with backing variable # Typed inline property with backing variable
var _prop4 : int = 2 var _prop4: int = 2
var prop4: int: var prop4: int:
get: get:
return _prop4 return _prop4

2
modules/gdscript/tests/scripts/analyzer/features/use_preload_script_as_type.gd
View File

@ -1,4 +1,4 @@
const preloaded : GDScript = preload("gdscript_to_preload.notest.gd") const preloaded: GDScript = preload("gdscript_to_preload.notest.gd")
func test(): func test():
var preloaded_instance: preloaded = preloaded.new() var preloaded_instance: preloaded = preloaded.new()

2
modules/gdscript/tests/scripts/parser/features/static_typing.gd
View File

@ -1,3 +1,5 @@
# Do not fix code style here!
func test(): func test():
# The following lines are equivalent: # The following lines are equivalent:
var _integer: int = 1 var _integer: int = 1

20
modules/gdscript/tests/scripts/parser/features/static_typing.out
View File

@ -1,21 +1,21 @@
GDTEST_OK GDTEST_OK
>> WARNING >> 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 >> Line: 11
>> UNUSED_LOCAL_CONSTANT >> 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 >> WARNING
>> Line: 12 >> Line: 12
>> UNUSED_LOCAL_CONSTANT >> 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 >> WARNING
>> Line: 13 >> Line: 13
>> UNUSED_LOCAL_CONSTANT >> 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' >> 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'

4
modules/gdscript/tests/scripts/runtime/features/default_set_beforehand.gd
View File

@ -1,8 +1,8 @@
extends Node extends Node
@onready var later_inferred := [1] @onready var later_inferred := [1]
@onready var later_static : Array @onready var later_static: Array
@onready var later_static_with_init : Array = [1] @onready var later_static_with_init: Array = [1]
@onready var later_untyped = [1] @onready var later_untyped = [1]
func test(): func test():

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

@ -1,5 +1,5 @@
#GDTEST_OK #GDTEST_OK
var prop : int = 0: var prop: int = 0:
get: get:
return prop return prop
set(value): set(value):

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

@ -4,6 +4,6 @@ func test():
@warning_ignore("narrowing_conversion") @warning_ignore("narrowing_conversion")
var foo: int = 0.0 var foo: int = 0.0
print(typeof(foo) == TYPE_INT) print(typeof(foo) == TYPE_INT)
var dict : Dictionary = {"a":0.0} var dict: Dictionary = {"a": 0.0}
foo = dict.get("a") foo = dict.get("a")
print(typeof(foo) == TYPE_INT) print(typeof(foo) == TYPE_INT)