Преглед изворни кода

Style: Trim trailing whitespace and ensure newline at EOF

Found by apply the file_format checks again via #91597.
Rémi Verschelde пре 1 година
родитељ
комит
7d03b1de0b
54 измењених фајлова са 54 додато и 66 уклоњено
  1. 0 1
      .clang-tidy
  2. 0 1
      .github/actions/godot-api-dump/action.yml
  3. 1 1
      doc/classes/GDExtensionManager.xml
  4. 1 1
      doc/classes/GPUParticles2D.xml
  5. 1 1
      doc/classes/Node.xml
  6. 1 1
      doc/classes/TextEdit.xml
  7. 1 1
      doc/classes/TileMapLayer.xml
  8. 1 1
      doc/classes/Time.xml
  9. 1 1
      doc/classes/VisualShaderNodeFrame.xml
  10. 1 1
      drivers/gles3/shaders/effects/post.glsl
  11. 1 1
      gles3_builders.py
  12. 0 1
      misc/dist/ios_xcode/godot_ios/en.lproj/InfoPlist.strings
  13. 0 1
      misc/error_suppressions/tsan.txt
  14. 2 2
      misc/extension_api_validation/4.2-stable.expected
  15. 1 1
      modules/enet/doc_classes/ENetConnection.xml
  16. 1 1
      modules/gdscript/README.md
  17. 0 1
      modules/gdscript/tests/scripts/analyzer/features/cast_enum_to_int.gd
  18. 0 1
      modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd
  19. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal_scene/dollar_class_scene.cfg
  20. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal_scene/dollar_native_scene.cfg
  21. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal_scene/percent_class_scene.cfg
  22. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal_scene/percent_native_scene.cfg
  23. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_interfered_scene/class_local_interfered_scene.cfg
  24. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_interfered_scene/native_local_interfered_scene.cfg
  25. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_scene/class_local_scene.cfg
  26. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_scene/native_local_scene.cfg
  27. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_typehint/class_local_typehint.cfg
  28. 1 1
      modules/gdscript/tests/scripts/completion/get_node/local_typehint/native_local_typehint.cfg
  29. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_interfered_scene/class_member_interfered_scene.cfg
  30. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_interfered_scene/native_member_interfered_scene.cfg
  31. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.cfg
  32. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.cfg
  33. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint/class_member_typehint.cfg
  34. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint/native_member_typehint.cfg
  35. 2 2
      modules/gdscript/tests/scripts/lsp/lambdas.gd
  36. 2 2
      modules/gdscript/tests/scripts/lsp/local_variables.gd
  37. 1 1
      modules/gdscript/tests/scripts/lsp/properties.gd
  38. 5 5
      modules/gdscript/tests/scripts/lsp/scopes.gd
  39. 0 1
      modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd
  40. 0 1
      modules/gdscript/tests/scripts/runtime/features/call_native_static_method_validated.gd
  41. 1 1
      modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
  42. 5 5
      modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets
  43. 1 1
      modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/ClassPartialModifier.GD0001.fixed.cs
  44. 1 1
      modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/ClassPartialModifier.GD0001.cs
  45. 1 1
      modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/GlobalClass.GD0401.cs
  46. 1 1
      modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/GlobalClass.GD0402.cs
  47. 2 2
      modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/MustBeVariant.GD0301.cs
  48. 0 1
      platform/android/java/editor/src/main/java/org/godotengine/editor/GodotProjectManager.kt
  49. 0 1
      platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java
  50. 0 1
      platform/android/java/scripts/publish-root.gradle
  51. 1 1
      platform/windows/godot.natvis
  52. 1 1
      servers/rendering/renderer_rd/shaders/samplers_inc.glsl
  53. 1 1
      tests/core/math/test_math_funcs.h
  54. 0 1
      tests/python_build/fixtures/gles3/vertex_fragment_expected_full.glsl

+ 0 - 1
.clang-tidy

@@ -43,4 +43,3 @@ CheckOptions:
   - key:             readability-braces-around-statements.ShortStatementLines
     value:           '0'
 ...
-

+ 0 - 1
.github/actions/godot-api-dump/action.yml

@@ -21,4 +21,3 @@ runs:
       with:
         name: 'godot-api-dump'
         path: './godot-api/*'
-

+ 1 - 1
doc/classes/GDExtensionManager.xml

@@ -43,7 +43,7 @@
 			<return type="int" enum="GDExtensionManager.LoadStatus" />
 			<param index="0" name="path" type="String" />
 			<description>
-				Reloads the extension at the given file path. The [param path] needs to point to a valid [GDExtension], otherwise this method may return either [constant LOAD_STATUS_NOT_LOADED] or [constant LOAD_STATUS_FAILED]. 
+				Reloads the extension at the given file path. The [param path] needs to point to a valid [GDExtension], otherwise this method may return either [constant LOAD_STATUS_NOT_LOADED] or [constant LOAD_STATUS_FAILED].
 				[b]Note:[/b] You can only reload extensions in the editor. In release builds, this method always fails and returns [constant LOAD_STATUS_FAILED].
 			</description>
 		</method>

+ 1 - 1
doc/classes/GPUParticles2D.xml

@@ -43,7 +43,7 @@
 		<method name="restart">
 			<return type="void" />
 			<description>
-				Restarts the particle emission cycle, clearing existing particles. To avoid particles vanishing from the viewport, wait for the [signal finished] signal before calling.			
+				Restarts the particle emission cycle, clearing existing particles. To avoid particles vanishing from the viewport, wait for the [signal finished] signal before calling.
 				[b]Note:[/b] The [signal finished] signal is only emitted by [member one_shot] emitters.
 			</description>
 		</method>

+ 1 - 1
doc/classes/Node.xml

@@ -991,7 +991,7 @@
 			[b]Note:[/b] When changing the name, the following characters will be replaced with an underscore: ([code].[/code] [code]:[/code] [code]@[/code] [code]/[/code] [code]"[/code] [code]%[/code]). In particular, the [code]@[/code] character is reserved for auto-generated names. See also [method String.validate_node_name].
 		</member>
 		<member name="owner" type="Node" setter="set_owner" getter="get_owner">
-			The owner of this node. The owner must be an ancestor of this node. When packing the owner node in a [PackedScene], all the nodes it owns are also saved with it. 
+			The owner of this node. The owner must be an ancestor of this node. When packing the owner node in a [PackedScene], all the nodes it owns are also saved with it.
 			[b]Note:[/b] In the editor, nodes not owned by the scene root are usually not displayed in the Scene dock, and will [b]not[/b] be saved. To prevent this, remember to set the owner after calling [method add_child]. See also (see [member unique_name_in_owner])
 		</member>
 		<member name="physics_interpolation_mode" type="int" setter="set_physics_interpolation_mode" getter="get_physics_interpolation_mode" enum="Node.PhysicsInterpolationMode" default="0">

+ 1 - 1
doc/classes/TextEdit.xml

@@ -1193,7 +1193,7 @@
 			<param index="2" name="wrap_index" type="int" default="-1" />
 			<param index="3" name="caret_index" type="int" default="0" />
 			<description>
-				Sets the selection origin line to the [param line] for the given [param caret_index]. If the selection origin is moved to the caret position, the selection will deselect. 
+				Sets the selection origin line to the [param line] for the given [param caret_index]. If the selection origin is moved to the caret position, the selection will deselect.
 				If [param can_be_hidden] is [code]false[/code], The line will be set to the nearest unhidden line below or above.
 				If [param wrap_index] is [code]-1[/code], the selection origin column will be clamped to the [param line]'s length. If [param wrap_index] is greater than [code]-1[/code], the column will be moved to attempt to match the visual x position on the line's [param wrap_index] to the position from the last time [method set_selection_origin_column] or [method select] was called.
 			</description>

+ 1 - 1
doc/classes/TileMapLayer.xml

@@ -97,7 +97,7 @@
 		<method name="get_navigation_map" qualifiers="const">
 			<return type="RID" />
 			<description>
-				Returns the [RID] of the [NavigationServer2D] navigation used by this [TileMapLayer]. 
+				Returns the [RID] of the [NavigationServer2D] navigation used by this [TileMapLayer].
 				By default this returns the default [World2D] navigation map, unless a custom map was provided using [method set_navigation_map].
 			</description>
 		</method>

+ 1 - 1
doc/classes/Time.xml

@@ -152,7 +152,7 @@
 		<method name="get_time_zone_from_system" qualifiers="const">
 			<return type="Dictionary" />
 			<description>
-				Returns the current time zone as a dictionary of keys: [code]bias[/code] and [code]name[/code]. 
+				Returns the current time zone as a dictionary of keys: [code]bias[/code] and [code]name[/code].
 				- [code]bias[/code] is the offset from UTC in minutes, since not all time zones are multiples of an hour from UTC.
 				- [code]name[/code] is the localized name of the time zone, according to the OS locale settings of the current user.
 			</description>

+ 1 - 1
doc/classes/VisualShaderNodeFrame.xml

@@ -4,7 +4,7 @@
 		A frame other visual shader nodes can be attached to for better organization.
 	</brief_description>
 	<description>
-		A rectangular frame that can be used to group visual shader nodes together to improve organization. 
+		A rectangular frame that can be used to group visual shader nodes together to improve organization.
 		Nodes attached to the frame will move with it when it is dragged and it can automatically resize to enclose all attached nodes.
 		Its title, description and color can be customized.
 	</description>

+ 1 - 1
drivers/gles3/shaders/effects/post.glsl

@@ -1,6 +1,6 @@
 /* clang-format off */
 #[modes]
-mode_default = 
+mode_default =
 
 #[specializations]
 

+ 1 - 1
gles3_builders.py

@@ -588,7 +588,7 @@ def build_gles3_header(
         fd.write("\t}\n\n")
 
         fd.write("};\n\n")
-        fd.write("#endif\n\n")
+        fd.write("#endif\n")
 
 
 def build_gles3_headers(target, source, env):

+ 0 - 1
misc/dist/ios_xcode/godot_ios/en.lproj/InfoPlist.strings

@@ -1,2 +1 @@
 /* Localized versions of Info.plist keys */
-

+ 0 - 1
misc/error_suppressions/tsan.txt

@@ -5,4 +5,3 @@ deadlock:tests/core/templates/test_command_queue.h
 deadlock:modules/text_server_adv/text_server_adv.cpp
 deadlock:modules/text_server_fb/text_server_fb.cpp
 race:modules/navigation/nav_map.cpp
-

+ 2 - 2
misc/extension_api_validation/4.2-stable.expected

@@ -321,7 +321,7 @@ GH-86978
 --------
 Validate extension JSON: Error: Field 'classes/TextEdit/methods/set_selection_mode/arguments': size changed value in new API, from 4 to 1.
 
-Removed optional arguments set_selection_mode, use set_selection_origin_line/column instead. 
+Removed optional arguments set_selection_mode, use set_selection_origin_line/column instead.
 Compatibility methods registered.
 
 
@@ -343,4 +343,4 @@ GH-91143
 --------
 Validate extension JSON: Error: Field 'classes/Input/methods/vibrate_handheld/arguments': size changed value in new API, from 1 to 2.
 
-Added optional argument. Compatibility method registered.
+Added optional argument. Compatibility method registered.

+ 1 - 1
modules/enet/doc_classes/ENetConnection.xml

@@ -151,7 +151,7 @@
 			<param index="1" name="destination_port" type="int" />
 			<param index="2" name="packet" type="PackedByteArray" />
 			<description>
-				Sends a [param packet] toward a destination from the address and port currently bound by this ENetConnection instance. 
+				Sends a [param packet] toward a destination from the address and port currently bound by this ENetConnection instance.
 				This is useful as it serves to establish entries in NAT routing tables on all devices between this bound instance and the public facing internet, allowing a prospective client's connection packets to be routed backward through the NAT device(s) between the public internet and this host.
 				This requires forward knowledge of a prospective client's address and communication port as seen by the public internet - after any NAT devices have handled their connection request. This information can be obtained by a [url=https://en.wikipedia.org/wiki/STUN]STUN[/url] service, and must be handed off to your host by an entity that is not the prospective client. This will never work for a client behind a Symmetric NAT due to the nature of the Symmetric NAT routing algorithm, as their IP and Port cannot be known beforehand.
 			</description>

+ 1 - 1
modules/gdscript/README.md

@@ -136,4 +136,4 @@ There are many other classes in the GDScript module. Here is a brief overview of
 - The [virtual machine](gdscript_vm.cpp) is essentially defined as calling `GDScriptFunction::call()`.
 - Editor-related functions can be found in parts of `GDScriptLanguage`, originally declared in [`gdscript.h`](gdscript.h) but defined in [`gdscript_editor.cpp`](gdscript_editor.cpp). Code highlighting can be found in [`GDScriptSyntaxHighlighter`](editor/gdscript_highlighter.h).
 - GDScript decompilation is found in [`gdscript_disassembler.cpp`](gdscript_disassembler.h), defined as `GDScriptFunction::disassemble()`.
-- Documentation generation from GDScript comments in [`GDScriptDocGen`](editor/gdscript_docgen.h)
+- Documentation generation from GDScript comments in [`GDScriptDocGen`](editor/gdscript_docgen.h)

+ 0 - 1
modules/gdscript/tests/scripts/analyzer/features/cast_enum_to_int.gd

@@ -6,4 +6,3 @@ func test():
 	var a := Foo.A
 	var b := a as int + 1
 	print(b)
-	

+ 0 - 1
modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd

@@ -3,4 +3,3 @@ const Constants = preload("gdscript_to_preload.notest.gd")
 func test():
 	var a := Constants.A
 	print(a)
-

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal_scene/dollar_class_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal_scene/dollar_native_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal_scene/percent_class_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal_scene/percent_native_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_interfered_scene/class_local_interfered_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_interfered_scene/native_local_interfered_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_scene/class_local_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_scene/native_local_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_typehint/class_local_typehint.cfg

@@ -4,7 +4,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/local_typehint/native_local_typehint.cfg

@@ -4,7 +4,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_interfered_scene/class_member_interfered_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_interfered_scene/native_member_interfered_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.cfg

@@ -6,7 +6,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint/class_member_typehint.cfg

@@ -4,7 +4,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; GDScript: class_a.notest.gd
     {"display": "property_of_a"},
     {"display": "func_of_a"},

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint/native_member_typehint.cfg

@@ -4,7 +4,7 @@ include=[
     {"display": "add_child"},
     {"display": "owner"},
     {"display": "child_entered_tree"},
-    
+
     ; AnimationPlayer
     {"display": "autoplay"},
     {"display": "play"},

+ 2 - 2
modules/gdscript/tests/scripts/lsp/lambdas.gd

@@ -7,7 +7,7 @@ var lambda_member1 := func(alpha: int, beta): return alpha + beta
 #   |            |         ^^^^^ \1:alpha -> \1:alpha
 #   ^^^^^^^^^^^^^^ \1 -> \1
 
-var lambda_member2 := func(alpha, beta: int) -> int: 
+var lambda_member2 := func(alpha, beta: int) -> int:
 #   |            |         |   |  |  |
 #   |            |         |   |  |  |
 #   |            |         |   |  ^^^^ \2:beta -> \2:beta
@@ -76,7 +76,7 @@ func _ready() -> void:
 	#   |          |        |   |  ^^^^ \local:beta -> \local:beta
 	#   |          |        ^^^^^ \local:alpha -> \local:alpha
 	#   ^^^^^^^^^^^^ \local -> \local
-	
+
 	var value := 42
 	#   ^^^^^ local:value -> local:value
 	var lambda_capture = func(): return value + some_name.length()

+ 2 - 2
modules/gdscript/tests/scripts/lsp/local_variables.gd

@@ -9,7 +9,7 @@ func test_member() -> void:
 	#   ^^^^ test -> test
 	test += 3
 	#<^^ -> test
-	member += 5	
+	member += 5
 	#<^^^^ -> member
 	test = return_arg(test)
 	#  |              ^^^^ -> test
@@ -22,4 +22,4 @@ func return_arg(arg: int) -> int:
 	arg += 2
 	#<^ -> arg
 	return arg
-	#      ^^^ -> arg
+	#      ^^^ -> arg

+ 1 - 1
modules/gdscript/tests/scripts/lsp/properties.gd

@@ -16,7 +16,7 @@ var prop3 := 42:
 		#<^^^ -> prop3
 var prop4: int:
 #   ^^^^^ prop4 -> prop4
-	get: 
+	get:
 		return 42
 var prop5 := 42:
 #   ^^^^^ prop5 -> prop5

+ 5 - 5
modules/gdscript/tests/scripts/lsp/scopes.gd

@@ -68,16 +68,16 @@ func m():
 
 	match value:
 	#     ^^^^^ -> m:value
-		13: 
+		13:
 			print(value)
 			#     ^^^^^ -> m:value
-		[var start, _, var end]: 
+		[var start, _, var end]:
 		#    |   |         ^^^ m:match:array:end -> m:match:array:end
 		#    ^^^^^  m:match:array:start -> m:match:array:start
 			print(start + end)
 			#     |   |   ^^^ -> m:match:array:end
 			#     ^^^^^ -> m:match:array:start
-		{ "name": var name }: 
+		{ "name": var name }:
 		#             ^^^^ m:match:dict:var -> m:match:dict:var
 			print(name)
 			#     ^^^^ -> m:match:dict:var
@@ -87,10 +87,10 @@ func m():
 			#     ^^^^^^^^ -> m:match:var
 
 func m2():
-	var value = 42 
+	var value = 42
 	#   ^^^^^ m2:value -> m2:value
 
-	match value: 
+	match value:
 	#     ^^^^^ -> m2:value
 		{ "name": var name }:
 		#             ^^^^ m2:match:dict:var -> m2:match:dict:var

+ 0 - 1
modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd

@@ -23,4 +23,3 @@ func test():
 	bar([3])
 	bar([4])
 	bar([5])
-

+ 0 - 1
modules/gdscript/tests/scripts/runtime/features/call_native_static_method_validated.gd

@@ -4,4 +4,3 @@ func test():
 
 	# Validated native static call without return value.
 	Node.print_orphan_nodes()
-

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props

@@ -71,7 +71,7 @@
     <GodotTargetPlatform Condition=" '$(GodotTargetPlatform)' == '' and $(RuntimeIdentifier.StartsWith('osx')) ">macos</GodotTargetPlatform>
     <GodotTargetPlatform Condition=" '$(GodotTargetPlatform)' == '' and $(RuntimeIdentifier.StartsWith('win')) ">windows</GodotTargetPlatform>
   </PropertyGroup>
-  
+
   <!-- Auto-detect the target Godot platform if it was not specified and there's no runtime identifier information. -->
   <PropertyGroup Condition=" '$(GodotTargetPlatform)' == '' ">
     <GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(Linux))' ">linuxbsd</GodotTargetPlatform>

+ 5 - 5
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets

@@ -11,10 +11,10 @@
     <XCodePath Condition=" '$(XCodePath)' == '' ">/Applications/Xcode.app/Contents/Developer</XCodePath>
     <XCodePath>$([MSBuild]::EnsureTrailingSlash('$(XCodePath)'))</XCodePath>
   </PropertyGroup>
-  
+
   <Target Name="PrepareBeforeIlcCompile"
           BeforeTargets="IlcCompile">
-    
+
     <Copy SourceFiles="%(ResolvedRuntimePack.PackageDirectory)/runtimes/$(RuntimeIdentifier)/native/icudt.dat" DestinationFolder="$(PublishDir)"/>
 
     <!-- We need to find the path to Xcode so we can set manual linker args to the correct SDKs
@@ -29,9 +29,9 @@
       <XCodePath>$(XcodeSelect)</XCodePath>
       <XCodePath>$([MSBuild]::EnsureTrailingSlash('$(XCodePath)'))</XCodePath>
     </PropertyGroup>
-    
+
     <Message Importance="normal" Text="Found XCode at $(XcodeSelect)"  Condition=" '$(FindXCode)' == 'true' "/>
-    
+
     <ItemGroup>
       <LinkerArg Include="-mios-simulator-version-min=12.0 -isysroot %22$(XCodePath)Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk%22"
                  Condition=" $(RuntimeIdentifier.Contains('simulator')) "/>
@@ -54,5 +54,5 @@
     </ItemGroup>
     <Copy SourceFiles="@(SymbolFiles)" DestinationFolder="$(PublishDir)$(TargetName).framework.dSYM"/>
   </Target>
-  
+
 </Project>

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/ClassPartialModifier.GD0001.fixed.cs

@@ -2,5 +2,5 @@ using Godot;
 
 public partial class ClassPartialModifier : Node
 {
-    
+
 }

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/ClassPartialModifier.GD0001.cs

@@ -2,5 +2,5 @@ using Godot;
 
 public class {|GD0001:ClassPartialModifier|} : Node
 {
-    
+
 }

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/GlobalClass.GD0401.cs

@@ -2,7 +2,7 @@ using Godot;
 
 // This works because it inherits from GodotObject.
 [GlobalClass]
-public partial class CustomGlobalClass1 : GodotObject 
+public partial class CustomGlobalClass1 : GodotObject
 {
 
 }

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/GlobalClass.GD0402.cs

@@ -2,7 +2,7 @@ using Godot;
 
 // This works because it inherits from GodotObject and it doesn't have any generic type parameter.
 [GlobalClass]
-public partial class CustomGlobalClass : GodotObject 
+public partial class CustomGlobalClass : GodotObject
 {
 
 }

+ 2 - 2
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/MustBeVariant.GD0301.cs

@@ -10,7 +10,7 @@ public class MustBeVariantGD0301
         // This raises a GD0301 diagnostic error: object is not Variant (and Method<T> requires a variant generic type).
         Method<{|GD0301:object|}>();
     }
-    
+
     public void MethodCallsOk()
     {
         // All these calls are valid because they are Variant types.
@@ -75,7 +75,7 @@ public class MustBeVariantGD0301
     public void Method<[MustBeVariant] T>()
     {
     }
-    
+
     public void MustBeVariantClasses()
     {
         new ClassWithGenericVariant<bool>();

+ 0 - 1
platform/android/java/editor/src/main/java/org/godotengine/editor/GodotProjectManager.kt

@@ -42,4 +42,3 @@ class GodotProjectManager : GodotEditor() {
 		// Nothing to do here.. we have yet to select a project to load.
 	}
 }
-

+ 0 - 1
platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java

@@ -1955,4 +1955,3 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
 	private int mEGLContextClientVersion;
 	private boolean mPreserveEGLContextOnPause;
 }
-

+ 0 - 1
platform/android/java/scripts/publish-root.gradle

@@ -36,4 +36,3 @@ nexusPublishing {
         }
     }
 }
-

+ 1 - 1
platform/windows/godot.natvis

@@ -15,7 +15,7 @@
 			<Item Name="[size]">_p->array._cowdata._ptr ? (((const unsigned long long *)(_p->array._cowdata._ptr))[-1]) : 0</Item>
 			<ArrayItems>
 				<Size>_p->array._cowdata._ptr ? (((const unsigned long long *)(_p->array._cowdata._ptr))[-1]) : 0</Size>
-				<ValuePointer>(Variant *) _p->array._cowdata._ptr</ValuePointer> 
+				<ValuePointer>(Variant *) _p->array._cowdata._ptr</ValuePointer>
 			</ArrayItems>
 		</Expand>
 	</Type>

+ 1 - 1
servers/rendering/renderer_rd/shaders/samplers_inc.glsl

@@ -9,4 +9,4 @@ layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 7) uniform sampler SAMP
 layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 8) uniform sampler SAMPLER_NEAREST_WITH_MIPMAPS_REPEAT;
 layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 9) uniform sampler SAMPLER_LINEAR_WITH_MIPMAPS_REPEAT;
 layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 10) uniform sampler SAMPLER_NEAREST_WITH_MIPMAPS_ANISOTROPIC_REPEAT;
-layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 11) uniform sampler SAMPLER_LINEAR_WITH_MIPMAPS_ANISOTROPIC_REPEAT;
+layout(set = 0, binding = SAMPLERS_BINDING_FIRST_INDEX + 11) uniform sampler SAMPLER_LINEAR_WITH_MIPMAPS_ANISOTROPIC_REPEAT;

+ 1 - 1
tests/core/math/test_math_funcs.h

@@ -382,7 +382,7 @@ TEST_CASE_TEMPLATE("[Math] remap", T, float, double) {
 	CHECK(Math::remap((T)-200.0, (T)-100.0, (T)-200.0, (T)0.0, (T)-1000.0) == doctest::Approx((T)-1000.0));
 	CHECK(Math::remap((T)-250.0, (T)-100.0, (T)-200.0, (T)0.0, (T)-1000.0) == doctest::Approx((T)-1500.0));
 
-	// Note: undefined behaviour can happen when `p_istart == p_istop`. We don't bother testing this as it will
+	// Note: undefined behavior can happen when `p_istart == p_istop`. We don't bother testing this as it will
 	// vary between hardware and compilers properly implementing IEEE 754.
 }
 

+ 0 - 1
tests/python_build/fixtures/gles3/vertex_fragment_expected_full.glsl

@@ -48,4 +48,3 @@ protected:
 };
 
 #endif
-