fix: review feedback 3

bmazzarol · Jan 8, 2025 · fcf8530 · fcf8530
1 parent cae2afb
commit fcf8530
Show file tree

Hide file tree

Showing 13 changed files with 253 additions and 28 deletions.
diff --git a/Tuxedo.SourceGenerator/Extensions/SymbolExtensions.cs b/Tuxedo.SourceGenerator/Extensions/SymbolExtensions.cs
@@ -18,8 +18,7 @@ is true
     public static bool HasInterface(this ITypeSymbol? symbol, string interfaceName)
     {
         return symbol?.AllInterfaces.Any(i =>
-            i.ToDisplayString().Equals(interfaceName, StringComparison.Ordinal)
-        )
-            is true;
+                i.ToDisplayString().Equals(interfaceName, StringComparison.Ordinal)
+            ) ?? false;
     }
 }
diff --git a/Tuxedo.SourceGenerator/Generators/RefinementSourceGenerator.MultiRefinedTypeSource.cs b/Tuxedo.SourceGenerator/Generators/RefinementSourceGenerator.MultiRefinedTypeSource.cs
@@ -43,7 +43,7 @@ private static string RenderMultiRefinedType(RefinedTypeDetails model)
                      /// Standard deconstruction to the underlying values
                      /// </summary>
                      /// <param name="value">raw {{model.RawType.EscapeXml()}}</param>
-                     /// <param name="altValue">alternative {{model.AlternativeType.EscapeXml()}}</param>
+                     /// <param name="altValue">The alternative {{model.AlternativeType.EscapeXml()}} produced when the refinement predicate is satisfied</param>
                      public void Deconstruct(out {{model.RawType}} value, out {{model.AlternativeType}} altValue)
                      {
                           value = Value;

diff --git a/Tuxedo.Tests/BoolRefinementsTests.Case4#FalseBool.g.verified.cs b/Tuxedo.Tests/BoolRefinementsTests.Case4#FalseBool.g.verified.cs
@@ -120,4 +120,12 @@ public override string ToString()
     {
         return Value.ToString() ?? string.Empty;
     }
+
+    /// <summary>
+    /// Returns the string representation of the underlying bool
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
 }
diff --git a/Tuxedo.Tests/BoolRefinementsTests.Case5#TrueBool.g.verified.cs b/Tuxedo.Tests/BoolRefinementsTests.Case5#TrueBool.g.verified.cs
@@ -120,4 +120,12 @@ public override string ToString()
     {
         return Value.ToString() ?? string.Empty;
     }
+
+    /// <summary>
+    /// Returns the string representation of the underlying bool
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
 }
diff --git a/Tuxedo.Tests/ConfigureRefinementTypesExample.Case1#Case3.g.verified.cs b/Tuxedo.Tests/ConfigureRefinementTypesExample.Case1#Case3.g.verified.cs
@@ -120,4 +120,12 @@ public override string ToString()
     {
         return Value.ToString() ?? string.Empty;
     }
+
+    /// <summary>
+    /// Returns the string representation of the underlying bool
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
 }
diff --git a/Tuxedo.Tests/ConfigureRefinementTypesExample.Case2#Case4.g.verified.cs b/Tuxedo.Tests/ConfigureRefinementTypesExample.Case2#Case4.g.verified.cs
@@ -120,4 +120,12 @@ public override string ToString()
     {
         return Value.ToString() ?? string.Empty;
     }
+
+    /// <summary>
+    /// Returns the string representation of the underlying bool
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
 }
diff --git a/Tuxedo.Tests/CustomAccessModifierTests.Case2#WhiteSpaceChar.g.verified.cs b/Tuxedo.Tests/CustomAccessModifierTests.Case2#WhiteSpaceChar.g.verified.cs
@@ -12,7 +12,7 @@ namespace <global namespace>;
 /// A refined char based on the Test.WhiteSpace refinement predicate
 /// </summary>
 [RefinedType]
-internal readonly partial struct WhiteSpaceChar : IEquatable<WhiteSpaceChar>
+internal readonly partial struct WhiteSpaceChar : IEquatable<WhiteSpaceChar>, IFormattable
 {
     private readonly char? _value;
 
@@ -120,4 +120,20 @@ public override string ToString()
     {
         return Value.ToString() ?? string.Empty;
     }
+
+    /// <summary>
+    /// Returns the string representation of the underlying char
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
+
+    /// <summary>
+    /// Returns the string representation of the underlying char
+    /// </summary>
+    public string ToString(string? format, IFormatProvider? formatProvider)
+    {
+        return ((IFormattable)Value).ToString(format, formatProvider) ?? string.Empty;
+    }
 }
diff --git a/Tuxedo.Tests/DateOnlyExample.Case3#DateOnlyString.g.verified.cs b/Tuxedo.Tests/DateOnlyExample.Case3#DateOnlyString.g.verified.cs
@@ -9,7 +9,7 @@
 namespace <global namespace>;
 
 /// <summary>
-/// A refined string based on the Test.DateOnly refinement predicate which produces an alternative DateOnly value
+/// A refined string based on the Test.DateOnly refinement predicate which produces an alternative System.DateOnly value
 /// </summary>
 [RefinedType]
 public readonly partial struct DateOnlyString : IEquatable<DateOnlyString>
@@ -31,24 +31,24 @@ public static implicit operator string(DateOnlyString @this)
         return @this.Value;
     }
 
-    private readonly DateOnly? _altValue;
+    private readonly System.DateOnly? _altValue;
 
     /// <summary>
-    /// The underlying DateOnly
+    /// The underlying System.DateOnly
     /// </summary>
-    public DateOnly AltValue => _altValue ?? throw new InvalidOperationException("Do not use the default value, please use the Parse and TryParse methods to construct a DateOnlyString");
+    public System.DateOnly AltValue => _altValue ?? throw new InvalidOperationException("Do not use the default value, please use the Parse and TryParse methods to construct a DateOnlyString");
 
     /// <summary>
-    /// Implicit conversion from the DateOnlyString to a DateOnly
+    /// Implicit conversion from the DateOnlyString to a System.DateOnly
     /// </summary>
     /// <param name="this">the DateOnlyString</param>
-    /// <returns>underlying DateOnly</returns>
-    public static implicit operator DateOnly(DateOnlyString @this)
+    /// <returns>underlying System.DateOnly</returns>
+    public static implicit operator System.DateOnly(DateOnlyString @this)
     {
         return @this.AltValue;
     }
 
-    private DateOnlyString(string value, DateOnly altValue)
+    private DateOnlyString(string value, System.DateOnly altValue)
     {
         _value = value;
         _altValue = altValue;
@@ -77,7 +77,7 @@ public static DateOnlyString Parse(string value)
     }
 
     /// <summary>
-    /// Try and refine the string against the Test.DateOnly refinement producing a DateOnly
+    /// Try and refine the string against the Test.DateOnly refinement producing a System.DateOnly
     /// </summary>
     /// <param name="value">raw string</param>
     /// <param name="refined">refined DateOnlyString when true</param>
@@ -139,12 +139,20 @@ public override string ToString()
         return Value.ToString() ?? string.Empty;
     }
 
+    /// <summary>
+    /// Returns the string representation of the underlying string
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
+
     /// <summary>
     /// Standard deconstruction to the underlying values
     /// </summary>
     /// <param name="value">raw string</param>
-    /// <param name="altValue">alternative DateOnly</param>
-    public void Deconstruct(out string value, out DateOnly altValue)
+    /// <param name="altValue">The alternative System.DateOnly produced when the refinement predicate is satisfied</param>
+    public void Deconstruct(out string value, out System.DateOnly altValue)
     {
          value = Value;
          altValue = AltValue;

diff --git a/Tuxedo.Tests/Extensions/GeneratorDriverExtensions.cs b/Tuxedo.Tests/Extensions/GeneratorDriverExtensions.cs
@@ -11,7 +11,12 @@ internal static GeneratorDriver BuildDriver(this string? source)
     {
         var compilation = CSharpCompilation.Create(
             "name",
-            source != null ? [CSharpSyntaxTree.ParseText(source)] : []
+            source != null ? [CSharpSyntaxTree.ParseText(source)] : [],
+            [
+                MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
+                MetadataReference.CreateFromFile(typeof(RefinementAttribute).Assembly.Location),
+            ],
+            new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
         );
         var generator = new RefinementSourceGenerator();
         var driver = CSharpGeneratorDriver.Create(generator);
@@ -34,6 +39,7 @@ internal static Task VerifyRefinement(
     )
     {
         var driver = $$"""
+            using System;
             using Tuxedo;
 
             internal static class Test

diff --git a/Tuxedo.Tests/GuidStringTests.Case3#GuidString.g.verified.cs b/Tuxedo.Tests/GuidStringTests.Case3#GuidString.g.verified.cs
@@ -9,7 +9,7 @@
 namespace <global namespace>;
 
 /// <summary>
-/// A refined string based on the Test.Guid refinement predicate which produces an alternative Guid value
+/// A refined string based on the Test.Guid refinement predicate which produces an alternative System.Guid value
 /// </summary>
 [RefinedType]
 public readonly partial struct GuidString : IEquatable<GuidString>
@@ -31,24 +31,24 @@ public static implicit operator string(GuidString @this)
         return @this.Value;
     }
 
-    private readonly Guid? _altValue;
+    private readonly System.Guid? _altValue;
 
     /// <summary>
-    /// The underlying Guid
+    /// The underlying System.Guid
     /// </summary>
-    public Guid AltValue => _altValue ?? throw new InvalidOperationException("Do not use the default value, please use the Parse and TryParse methods to construct a GuidString");
+    public System.Guid AltValue => _altValue ?? throw new InvalidOperationException("Do not use the default value, please use the Parse and TryParse methods to construct a GuidString");
 
     /// <summary>
-    /// Implicit conversion from the GuidString to a Guid
+    /// Implicit conversion from the GuidString to a System.Guid
     /// </summary>
     /// <param name="this">the GuidString</param>
-    /// <returns>underlying Guid</returns>
-    public static implicit operator Guid(GuidString @this)
+    /// <returns>underlying System.Guid</returns>
+    public static implicit operator System.Guid(GuidString @this)
     {
         return @this.AltValue;
     }
 
-    private GuidString(string value, Guid altValue)
+    private GuidString(string value, System.Guid altValue)
     {
         _value = value;
         _altValue = altValue;
@@ -77,7 +77,7 @@ public static GuidString Parse(string value)
     }
 
     /// <summary>
-    /// Try and refine the string against the Test.Guid refinement producing a Guid
+    /// Try and refine the string against the Test.Guid refinement producing a System.Guid
     /// </summary>
     /// <param name="value">raw string</param>
     /// <param name="refined">refined GuidString when true</param>
@@ -139,12 +139,20 @@ public override string ToString()
         return Value.ToString() ?? string.Empty;
     }
 
+    /// <summary>
+    /// Returns the string representation of the underlying string
+    /// </summary>
+    public string ToString(IFormatProvider? provider)
+    {
+        return ((IConvertible)Value).ToString(provider) ?? string.Empty;
+    }
+
     /// <summary>
     /// Standard deconstruction to the underlying values
     /// </summary>
     /// <param name="value">raw string</param>
-    /// <param name="altValue">alternative Guid</param>
-    public void Deconstruct(out string value, out Guid altValue)
+    /// <param name="altValue">The alternative System.Guid produced when the refinement predicate is satisfied</param>
+    public void Deconstruct(out string value, out System.Guid altValue)
     {
          value = Value;
          altValue = AltValue;