From d35c58507c7b4e1da2c310f3d290c7c13ea8fcf0 Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Sat, 27 Aug 2022 03:22:23 +0200 Subject: [PATCH 1/2] Fix C# style with `dotnet format` --- .../ExportedFields.cs | 12 +- .../ExportedProperties.cs | 12 +- .../GodotTools.Core/StringExtensions.cs | 4 +- .../GodotTools.IdeMessaging/Client.cs | 10 +- .../GodotTools.IdeMessaging/Peer.cs | 2 +- .../ResponseAwaiter.cs | 2 +- .../GodotTools.OpenVisualStudio/Program.cs | 2 +- .../GodotTools/Export/AotBuilder.cs | 15 +- .../GodotTools/Ides/GodotIdeManager.cs | 6 +- .../GodotTools/Ides/MessagingServer.cs | 2 +- .../editor/GodotTools/GodotTools/Utils/OS.cs | 6 +- .../VariantConversionCallbacks.cs | 224 +++++++++--------- 12 files changed, 158 insertions(+), 139 deletions(-) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedFields.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedFields.cs index ac9f59aa99b..ac8d6473a61 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedFields.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedFields.cs @@ -94,16 +94,20 @@ namespace Godot.SourceGenerators.Sample [Export] private NodePath field_NodePath = new NodePath("foo"); [Export] private RID field_RID; - [Export] private Godot.Collections.Dictionary field_GodotDictionary = + [Export] + private Godot.Collections.Dictionary field_GodotDictionary = new() { { "foo", 10 }, { Vector2.Up, Colors.Chocolate } }; - [Export] private Godot.Collections.Array field_GodotArray = + [Export] + private Godot.Collections.Array field_GodotArray = new() { "foo", 10, Vector2.Up, Colors.Chocolate }; - [Export] private Godot.Collections.Dictionary field_GodotGenericDictionary = + [Export] + private Godot.Collections.Dictionary field_GodotGenericDictionary = new() { { "foo", true }, { "bar", false } }; - [Export] private Godot.Collections.Array field_GodotGenericArray = + [Export] + private Godot.Collections.Array field_GodotGenericArray = new() { 0, 1, 2, 3, 4, 5, 6 }; } } diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedProperties.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedProperties.cs index 4a0e8075f07..3020cfbc504 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedProperties.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/ExportedProperties.cs @@ -94,16 +94,20 @@ namespace Godot.SourceGenerators.Sample [Export] private NodePath property_NodePath { get; set; } = new NodePath("foo"); [Export] private RID property_RID { get; set; } - [Export] private Godot.Collections.Dictionary property_GodotDictionary { get; set; } = + [Export] + private Godot.Collections.Dictionary property_GodotDictionary { get; set; } = new() { { "foo", 10 }, { Vector2.Up, Colors.Chocolate } }; - [Export] private Godot.Collections.Array property_GodotArray { get; set; } = + [Export] + private Godot.Collections.Array property_GodotArray { get; set; } = new() { "foo", 10, Vector2.Up, Colors.Chocolate }; - [Export] private Godot.Collections.Dictionary property_GodotGenericDictionary { get; set; } = + [Export] + private Godot.Collections.Dictionary property_GodotGenericDictionary { get; set; } = new() { { "foo", true }, { "bar", false } }; - [Export] private Godot.Collections.Array property_GodotGenericArray { get; set; } = + [Export] + private Godot.Collections.Array property_GodotGenericArray { get; set; } = new() { 0, 1, 2, 3, 4, 5, 6 }; } } diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs index 60a4f297c9c..7c5502814f6 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs +++ b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs @@ -34,7 +34,7 @@ namespace GodotTools.Core path = path.Replace('\\', '/'); path = path[path.Length - 1] == '/' ? path.Substring(0, path.Length - 1) : path; - string[] parts = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); + string[] parts = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); path = string.Join(Path.DirectorySeparatorChar.ToString(), parts).Trim(); @@ -60,7 +60,7 @@ namespace GodotTools.Core public static string ToSafeDirName(this string dirName, bool allowDirSeparator = false) { - var invalidChars = new List {":", "*", "?", "\"", "<", ">", "|"}; + var invalidChars = new List { ":", "*", "?", "\"", "<", ">", "|" }; if (allowDirSeparator) { diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs index bc09e1ebf95..72e2a1fc0da 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs @@ -123,12 +123,16 @@ namespace GodotTools.IdeMessaging string projectMetadataDir = Path.Combine(godotProjectDir, ".godot", "mono", "metadata"); // FileSystemWatcher requires an existing directory - if (!Directory.Exists(projectMetadataDir)) { + if (!Directory.Exists(projectMetadataDir)) + { // Check if the non hidden version exists string nonHiddenProjectMetadataDir = Path.Combine(godotProjectDir, "godot", "mono", "metadata"); - if (Directory.Exists(nonHiddenProjectMetadataDir)) { + if (Directory.Exists(nonHiddenProjectMetadataDir)) + { projectMetadataDir = nonHiddenProjectMetadataDir; - } else { + } + else + { Directory.CreateDirectory(projectMetadataDir); } } diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs index 10d7e1898e9..dd3913b4f3a 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs @@ -78,7 +78,7 @@ namespace GodotTools.IdeMessaging clientStream.WriteTimeout = ClientWriteTimeout; clientReader = new StreamReader(clientStream, Encoding.UTF8); - clientWriter = new StreamWriter(clientStream, Encoding.UTF8) {NewLine = "\n"}; + clientWriter = new StreamWriter(clientStream, Encoding.UTF8) { NewLine = "\n" }; } public async Task Process() diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs index 548e7f06eed..a57c82b6089 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs @@ -17,7 +17,7 @@ namespace GodotTools.IdeMessaging if (content.Status == MessageStatus.Ok) SetResult(JsonConvert.DeserializeObject(content.Body)); else - SetResult(new T {Status = content.Status}); + SetResult(new T { Status = content.Status }); } } } diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs index 7a4641dbbc9..cc0deb6cc0a 100644 --- a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs +++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs @@ -249,8 +249,8 @@ namespace GodotTools.OpenVisualStudio // Thread call was rejected, so try again. int IOleMessageFilter.RetryRejectedCall(IntPtr hTaskCallee, int dwTickCount, int dwRejectType) { + // flag = SERVERCALL_RETRYLATER if (dwRejectType == 2) - // flag = SERVERCALL_RETRYLATER { // Retry the thread call immediately if return >= 0 & < 100 return 99; diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs index fc325fc25b0..96b28de7892 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs @@ -76,13 +76,20 @@ namespace GodotTools.Export else { string arch = ""; - if (features.Contains("x86_64")) { + if (features.Contains("x86_64")) + { arch = "x86_64"; - } else if (features.Contains("x86_32")) { + } + else if (features.Contains("x86_32")) + { arch = "x86_32"; - } else if (features.Contains("arm64")) { + } + else if (features.Contains("arm64")) + { arch = "arm64"; - } else if (features.Contains("arm32")) { + } + else if (features.Contains("arm32")) + { arch = "arm32"; } CompileAssembliesForDesktop(exporter, platform, isDebug, arch, aotOpts, aotTempDir, outputDataDir, assembliesPrepared, bclDir); diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs index 95b60aded12..3f4dbb95bb3 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs @@ -180,17 +180,17 @@ namespace GodotTools.Ides public void SendOpenFile(string file) { - SendRequest(new OpenFileRequest {File = file}); + SendRequest(new OpenFileRequest { File = file }); } public void SendOpenFile(string file, int line) { - SendRequest(new OpenFileRequest {File = file, Line = line}); + SendRequest(new OpenFileRequest { File = file, Line = line }); } public void SendOpenFile(string file, int line, int column) { - SendRequest(new OpenFileRequest {File = file, Line = line, Column = column}); + SendRequest(new OpenFileRequest { File = file, Line = line, Column = column }); } } diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs index 6f11831b805..62db6e3af5f 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs @@ -385,7 +385,7 @@ namespace GodotTools.Ides // However, it doesn't fix resource loading if the rest of the path is also case insensitive. string scriptFileLocalized = FsPathUtils.LocalizePathWithCaseChecked(request.ScriptFile); - var response = new CodeCompletionResponse {Kind = request.Kind, ScriptFile = request.ScriptFile}; + var response = new CodeCompletionResponse { Kind = request.Kind, ScriptFile = request.ScriptFile }; response.Suggestions = await Task.Run(() => Internal.CodeCompletionRequest(response.Kind, scriptFileLocalized ?? request.ScriptFile)); return response; diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs index 651922d0195..ecbe730adf1 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs @@ -206,10 +206,10 @@ namespace GodotTools.Utils return searchDirs.Select(dir => Path.Combine(dir, name)).FirstOrDefault(File.Exists); return (from dir in searchDirs - select Path.Combine(dir, name) + select Path.Combine(dir, name) into path - from ext in windowsExts - select path + ext).FirstOrDefault(File.Exists); + from ext in windowsExts + select path + ext).FirstOrDefault(File.Exists); } [return: MaybeNull] diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantConversionCallbacks.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantConversionCallbacks.cs index 2b5bf2e1429..a13fb936e80 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantConversionCallbacks.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantConversionCallbacks.cs @@ -6,7 +6,7 @@ namespace Godot.NativeInterop; internal static unsafe class VariantConversionCallbacks { [SuppressMessage("ReSharper", "RedundantNameQualifier")] - internal static delegate* GetToVariantCallback() + internal static delegate* GetToVariantCallback() { static godot_variant FromBool(in bool @bool) => VariantUtils.CreateFromBool(@bool); @@ -153,163 +153,163 @@ internal static unsafe class VariantConversionCallbacks if (typeOfT == typeof(bool)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromBool; } if (typeOfT == typeof(char)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromChar; } if (typeOfT == typeof(sbyte)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt8; } if (typeOfT == typeof(short)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt16; } if (typeOfT == typeof(int)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt32; } if (typeOfT == typeof(long)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt64; } if (typeOfT == typeof(byte)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt8; } if (typeOfT == typeof(ushort)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt16; } if (typeOfT == typeof(uint)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt32; } if (typeOfT == typeof(ulong)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt64; } if (typeOfT == typeof(float)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromFloat; } if (typeOfT == typeof(double)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromDouble; } if (typeOfT == typeof(Vector2)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector2; } if (typeOfT == typeof(Vector2i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector2I; } if (typeOfT == typeof(Rect2)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromRect2; } if (typeOfT == typeof(Rect2i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromRect2I; } if (typeOfT == typeof(Transform2D)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromTransform2D; } if (typeOfT == typeof(Vector3)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector3; } if (typeOfT == typeof(Vector3i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector3I; } if (typeOfT == typeof(Basis)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromBasis; } if (typeOfT == typeof(Quaternion)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromQuaternion; } if (typeOfT == typeof(Transform3D)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromTransform3D; } if (typeOfT == typeof(AABB)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromAabb; } if (typeOfT == typeof(Color)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromColor; } if (typeOfT == typeof(Plane)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromPlane; } if (typeOfT == typeof(Callable)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromCallable; } if (typeOfT == typeof(SignalInfo)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromSignalInfo; } @@ -321,42 +321,42 @@ internal static unsafe class VariantConversionCallbacks { case TypeCode.SByte: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt8; } case TypeCode.Int16: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt16; } case TypeCode.Int32: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt32; } case TypeCode.Int64: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt64; } case TypeCode.Byte: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt8; } case TypeCode.UInt16: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt16; } case TypeCode.UInt32: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt32; } case TypeCode.UInt64: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromUInt64; } default: @@ -366,121 +366,121 @@ internal static unsafe class VariantConversionCallbacks if (typeOfT == typeof(string)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromString; } if (typeOfT == typeof(byte[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromByteArray; } if (typeOfT == typeof(int[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt32Array; } if (typeOfT == typeof(long[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromInt64Array; } if (typeOfT == typeof(float[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromFloatArray; } if (typeOfT == typeof(double[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromDoubleArray; } if (typeOfT == typeof(string[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromStringArray; } if (typeOfT == typeof(Vector2[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector2Array; } if (typeOfT == typeof(Vector3[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVector3Array; } if (typeOfT == typeof(Color[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromColorArray; } if (typeOfT == typeof(StringName[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromStringNameArray; } if (typeOfT == typeof(NodePath[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromNodePathArray; } if (typeOfT == typeof(RID[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromRidArray; } if (typeof(Godot.Object).IsAssignableFrom(typeOfT)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromGodotObject; } if (typeOfT == typeof(StringName)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromStringName; } if (typeOfT == typeof(NodePath)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromNodePath; } if (typeOfT == typeof(RID)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromRid; } if (typeOfT == typeof(Godot.Collections.Dictionary)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromGodotDictionary; } if (typeOfT == typeof(Godot.Collections.Array)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromGodotArray; } if (typeOfT == typeof(Variant)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &FromVariant; } @@ -488,7 +488,7 @@ internal static unsafe class VariantConversionCallbacks } [SuppressMessage("ReSharper", "RedundantNameQualifier")] - internal static delegate* GetToManagedCallback() + internal static delegate* GetToManagedCallback() { static bool ToBool(in godot_variant variant) => VariantUtils.ConvertToBool(variant); @@ -638,163 +638,163 @@ internal static unsafe class VariantConversionCallbacks if (typeOfT == typeof(bool)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToBool; } if (typeOfT == typeof(char)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToChar; } if (typeOfT == typeof(sbyte)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt8; } if (typeOfT == typeof(short)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt16; } if (typeOfT == typeof(int)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt32; } if (typeOfT == typeof(long)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt64; } if (typeOfT == typeof(byte)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt8; } if (typeOfT == typeof(ushort)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt16; } if (typeOfT == typeof(uint)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt32; } if (typeOfT == typeof(ulong)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt64; } if (typeOfT == typeof(float)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToFloat; } if (typeOfT == typeof(double)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToDouble; } if (typeOfT == typeof(Vector2)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector2; } if (typeOfT == typeof(Vector2i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector2I; } if (typeOfT == typeof(Rect2)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToRect2; } if (typeOfT == typeof(Rect2i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToRect2I; } if (typeOfT == typeof(Transform2D)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToTransform2D; } if (typeOfT == typeof(Vector3)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector3; } if (typeOfT == typeof(Vector3i)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector3I; } if (typeOfT == typeof(Basis)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToBasis; } if (typeOfT == typeof(Quaternion)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToQuaternion; } if (typeOfT == typeof(Transform3D)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToTransform3D; } if (typeOfT == typeof(AABB)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToAabb; } if (typeOfT == typeof(Color)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToColor; } if (typeOfT == typeof(Plane)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToPlane; } if (typeOfT == typeof(Callable)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToCallable; } if (typeOfT == typeof(SignalInfo)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToSignalInfo; } @@ -806,42 +806,42 @@ internal static unsafe class VariantConversionCallbacks { case TypeCode.SByte: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt8; } case TypeCode.Int16: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt16; } case TypeCode.Int32: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt32; } case TypeCode.Int64: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt64; } case TypeCode.Byte: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt8; } case TypeCode.UInt16: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt16; } case TypeCode.UInt32: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt32; } case TypeCode.UInt64: { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToUInt64; } default: @@ -851,121 +851,121 @@ internal static unsafe class VariantConversionCallbacks if (typeOfT == typeof(string)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToString; } if (typeOfT == typeof(byte[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToByteArray; } if (typeOfT == typeof(int[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt32Array; } if (typeOfT == typeof(long[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToInt64Array; } if (typeOfT == typeof(float[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToFloatArray; } if (typeOfT == typeof(double[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToDoubleArray; } if (typeOfT == typeof(string[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToStringArray; } if (typeOfT == typeof(Vector2[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector2Array; } if (typeOfT == typeof(Vector3[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVector3Array; } if (typeOfT == typeof(Color[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToColorArray; } if (typeOfT == typeof(StringName[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToStringNameArray; } if (typeOfT == typeof(NodePath[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToNodePathArray; } if (typeOfT == typeof(RID[])) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToRidArray; } if (typeof(Godot.Object).IsAssignableFrom(typeOfT)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToGodotObject; } if (typeOfT == typeof(StringName)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToStringName; } if (typeOfT == typeof(NodePath)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToNodePath; } if (typeOfT == typeof(RID)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToRid; } if (typeOfT == typeof(Godot.Collections.Dictionary)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToGodotDictionary; } if (typeOfT == typeof(Godot.Collections.Array)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToGodotArray; } if (typeOfT == typeof(Variant)) { - return (delegate* )(delegate* ) + return (delegate*)(delegate*) &ToVariant; } From ea6b8ecb6fb535004e7a3e8ce6ac7673665144b8 Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Sat, 27 Aug 2022 03:14:27 +0200 Subject: [PATCH 2/2] Add `dotnet format` to CI to check C# style --- .github/workflows/static_checks.yml | 4 ++++ misc/scripts/dotnet_format.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100755 misc/scripts/dotnet_format.sh diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index 557b67c9701..388c1ca9fd3 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -63,3 +63,7 @@ jobs: - name: Style checks via clang-format (clang_format.sh) run: | bash ./misc/scripts/clang_format.sh + + - name: Style checks via dotnet format (dotnet_format.sh) + run: | + bash ./misc/scripts/dotnet_format.sh diff --git a/misc/scripts/dotnet_format.sh b/misc/scripts/dotnet_format.sh new file mode 100755 index 00000000000..645737f4197 --- /dev/null +++ b/misc/scripts/dotnet_format.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# This script runs dotnet format on all relevant files in the repo. +# This is the primary script responsible for fixing style violations in C# files. + +set -uo pipefail + +# Loops through all C# projects tracked by Git. +git ls-files -- '*.csproj' \ + ':!:.git/*' ':!:thirdparty/*' ':!:platform/android/java/lib/src/com/google/*' ':!:*-so_wrap.*' | +while read -r f; do + # Run dotnet format. + dotnet format "$f" +done + +diff=$(git diff --color) + +# If no diff has been generated all is OK, clean up, and exit. +if [ -z "$diff" ] ; then + printf "Files in this commit comply with the dotnet format style rules.\n" + exit 0 +fi + +# A diff has been created, notify the user, clean up, and exit. +printf "\n*** The following changes have been made to comply with the formatting rules:\n\n" +echo "$diff" +printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i '\n" +exit 1