Add MaybeBoolUtils.MaybeBoolType() factory method

Author: Exanite

sources/SilkTouch/SilkTouch/Mods/Common/MaybeBoolUtils.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+namespace Silk.NET.SilkTouch.Mods;
+
+/// <summary>
+/// Utilities related to working with the <see cref="MaybeBool{T}"/> type.
+/// </summary>
+public static class MaybeBoolUtils
+{
+    /// <summary>
+    /// Creates a generic name syntax representing the <see cref="MaybeBool{T}"/> type
+    /// using the provided generic arguments.
+    /// </summary>
+    /// <param name="type">The underlying type used by the <see cref="MaybeBool{T}"/> type.</param>
+    /// <param name="scheme">The scheme used to determine the underlying value.</param>
+    public static GenericNameSyntax MaybeBoolType(TypeSyntax type, string? scheme) =>
+        string.IsNullOrWhiteSpace(scheme)
+            ? GenericName(Identifier("MaybeBool"), TypeArgumentList([type]))
+            : GenericName(
+                Identifier("MaybeBool"),
+                TypeArgumentList([type, IdentifierName(scheme)])
+            );
+}

sources/SilkTouch/SilkTouch/Mods/TransformProperties.cs

@@ -71,22 +71,7 @@ private class Rewriter(Configuration config) : CSharpSyntaxRewriter
                 || (nativeType == "bool" && node.Declaration.Type.ToString().Trim() != "bool") // stdbool.h, hopefully...
             )
             {
-                var newType = string.IsNullOrWhiteSpace(scheme)
-                    ? GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(SingletonSeparatedList(node.Declaration.Type))
-                    )
-                    : GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(
-                            SeparatedList(
-                                // ReSharper disable once RedundantCast <-- false positive
-                                (IEnumerable<TypeSyntax>)
-                                    [node.Declaration.Type, IdentifierName(scheme)]
-                            )
-                        )
-                    );
-
+                var newType = MaybeBoolUtils.MaybeBoolType(node.Declaration.Type, scheme);
                 node = node.WithDeclaration(node.Declaration.WithType(newType));
             }
 
@@ -102,21 +87,7 @@ private class Rewriter(Configuration config) : CSharpSyntaxRewriter
                 || (nativeType == "bool" && node.Type.ToString().Trim() != "bool") // stdbool.h, hopefully...
             )
             {
-                var newType = string.IsNullOrWhiteSpace(scheme)
-                    ? GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(SingletonSeparatedList(node.Type))
-                    )
-                    : GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(
-                            SeparatedList(
-                                // ReSharper disable once RedundantCast <-- false positive
-                                (IEnumerable<TypeSyntax>)[node.Type, IdentifierName(scheme)]
-                            )
-                        )
-                    );
-
+                var newType = MaybeBoolUtils.MaybeBoolType(node.Type, scheme);
                 node = node.WithType(newType);
             }
 

sources/SilkTouch/SilkTouch/Mods/Transformation/BoolTransformer.cs

@@ -31,23 +31,8 @@ Action<MethodDeclarationSyntax> next
             || (retNative == "bool" && current.ReturnType.ToString().Trim() != "bool") // stdbool.h, hopefully...
         )
         {
-            current = current.WithReturnType(
-                newRetType = string.IsNullOrWhiteSpace(retBoolScheme)
-                    ? GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(SingletonSeparatedList(current.ReturnType))
-                    )
-                    : GenericName(
-                        Identifier("MaybeBool"),
-                        TypeArgumentList(
-                            SeparatedList(
-                                // ReSharper disable once RedundantCast <-- false positive
-                                (IEnumerable<TypeSyntax>)
-                                    [current.ReturnType, IdentifierName(retBoolScheme)]
-                            )
-                        )
-                    )
-            );
+            newRetType = MaybeBoolUtils.MaybeBoolType(current.ReturnType, retBoolScheme);
+            current = current.WithReturnType(newRetType);
         }
 
         List<ParameterSyntax>? @params = null;
@@ -65,23 +50,8 @@ paramNative is not null
                 )
             )
             {
-                (@params ??= [.. current.ParameterList.Parameters])[i] = param.WithType(
-                    string.IsNullOrWhiteSpace(paramBoolScheme)
-                        ? GenericName(
-                            Identifier("MaybeBool"),
-                            TypeArgumentList(SingletonSeparatedList(param.Type))
-                        )
-                        : GenericName(
-                            Identifier("MaybeBool"),
-                            TypeArgumentList(
-                                SeparatedList(
-                                    // ReSharper disable once RedundantCast <-- false positive
-                                    (IEnumerable<TypeSyntax>)
-                                        [param.Type, IdentifierName(paramBoolScheme)]
-                                )
-                            )
-                        )
-                );
+                var newType = MaybeBoolUtils.MaybeBoolType(param.Type, paramBoolScheme);
+                (@params ??= [.. current.ParameterList.Parameters])[i] = param.WithType(newType);
             }
         }