Fixed code generation for generic unions where some type parameters c…

…ontained constraints yielded invalid code. => release
sundews · Dec 13, 2023 · 8cb77ca · 8cb77ca
1 parent 5ec0b76
commit 8cb77ca
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/Source/Sundew.Base b/Source/Sundew.Base
diff --git a/Source/Sundew.DiscriminatedUnions.Generator.Baseline/OutputStage/StringBuilderExtensions.cs b/Source/Sundew.DiscriminatedUnions.Generator.Baseline/OutputStage/StringBuilderExtensions.cs
@@ -11,6 +11,7 @@ namespace Sundew.DiscriminatedUnions.Generator.OutputStage;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using Sundew.Base.Collections.Immutable;
 using Sundew.Base.Text;
@@ -176,19 +177,18 @@ public static StringBuilder TryAppendConstraints(this StringBuilder stringBuilde
                 typeParameters,
                 (builder, parameter) =>
                 {
-                    builder
-                        .Append(indentation)
-                        .Append(Where)
-                        .Append(' ')
-                        .Append(parameter.Name)
-                        .Append(' ')
-                        .Append(':')
-                        .Append(' ');
-                    stringBuilder.AppendItems(
-                            parameter.Constraints,
-                            (builder1, constraint) => builder1.Append(constraint),
-                            ListSeparator)
-                        .AppendLine();
+                    builder.If(
+                        !parameter.Constraints.IsEmpty,
+                        builder1 => builder1.Append(indentation)
+                            .Append(Where)
+                            .Append(' ')
+                            .Append(parameter.Name)
+                            .Append(' ').Append(':').Append(' ')
+                            .AppendItems(
+                                parameter.Constraints,
+                                (builder1, constraint) => builder1.Append(constraint),
+                                ListSeparator)
+                            .AppendLine());
                 },
                 string.Empty);
         }

diff --git a/...scriminatedUnions.Generator.Baseline/Sundew.DiscriminatedUnions.Generator.Baseline.csproj b/...scriminatedUnions.Generator.Baseline/Sundew.DiscriminatedUnions.Generator.Baseline.csproj
@@ -22,8 +22,8 @@
 
     <SundewBaseEqualityCompile Include="..\Sundew.Base\Source\Sundew.Base.Equality\Equality.cs" />
     <Compile Include="@(SundewBaseEqualityCompile)" LinkBase="Shared\Sundew.Base.Equality" />
-    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\Computation\R*.cs" />
-    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\Computation\O.cs" />
+    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\R*.cs" />
+    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\O.cs" />
     <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\EnumExtensions.cs" />
     <Compile Include="@(SundewBasePrimitivesCompile)" LinkBase="Shared\Sundew.Base.Primitives" />
     <SundewBaseCollectionsCompile Include="..\Sundew.Base\Source\Sundew.Base.Collections\Immutable\ValueArray{TItem}.cs" />

diff --git a/Source/Sundew.DiscriminatedUnions.Generator.IntegrationTests/BaselineValidationFixture.cs b/Source/Sundew.DiscriminatedUnions.Generator.IntegrationTests/BaselineValidationFixture.cs
@@ -10,7 +10,6 @@ namespace Sundew.DiscriminatedUnions.Generator.IntegrationTests;
 using System.IO;
 using System.Linq;
 using FluentAssertions;
-using NUnit.Framework;
 using Sundew.Testing.CodeAnalysis;
 using Sundew.Testing.IO;
 using Xunit;

diff --git a/Source/Sundew.DiscriminatedUnions.Generator/OutputStage/StringBuilderExtensions.cs b/Source/Sundew.DiscriminatedUnions.Generator/OutputStage/StringBuilderExtensions.cs
@@ -176,19 +176,18 @@ public static StringBuilder TryAppendConstraints(this StringBuilder stringBuilde
                 typeParameters,
                 (builder, parameter) =>
                 {
-                    builder
-                        .Append(indentation)
-                        .Append(Where)
-                        .Append(' ')
-                        .Append(parameter.Name)
-                        .Append(' ')
-                        .Append(':')
-                        .Append(' ');
-                    stringBuilder.AppendItems(
-                            parameter.Constraints,
-                            (builder1, constraint) => builder1.Append(constraint),
-                            ListSeparator)
-                        .AppendLine();
+                    builder.If(
+                        !parameter.Constraints.IsEmpty,
+                        builder1 => builder1.Append(indentation)
+                            .Append(Where)
+                            .Append(' ')
+                            .Append(parameter.Name)
+                            .Append(' ').Append(':').Append(' ')
+                            .AppendItems(
+                                parameter.Constraints,
+                                (builder1, constraint) => builder1.Append(constraint),
+                                ListSeparator)
+                            .AppendLine());
                 },
                 string.Empty);
         }

diff --git a/Source/Sundew.DiscriminatedUnions.Generator/Sundew.DiscriminatedUnions.Generator.csproj b/Source/Sundew.DiscriminatedUnions.Generator/Sundew.DiscriminatedUnions.Generator.csproj
@@ -21,8 +21,8 @@
 
     <SundewBaseEqualityCompile Include="..\Sundew.Base\Source\Sundew.Base.Equality\Equality.cs" />
     <Compile Include="@(SundewBaseEqualityCompile)" LinkBase="Shared\Sundew.Base.Equality" />
-    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\Computation\R*.cs" />
-    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\Computation\O.cs" />
+    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\R*.cs" />
+    <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\O.cs" />
     <SundewBasePrimitivesCompile Include="..\Sundew.Base\Source\Sundew.Base.Primitives\EnumExtensions.cs" />
     <Compile Include="@(SundewBasePrimitivesCompile)" LinkBase="Shared\Sundew.Base.Primitives" />
     <SundewBaseCollectionsCompile Include="..\Sundew.Base\Source\Sundew.Base.Collections\Immutable\ValueArray{TItem}.cs" />