Merge pull request #26 from polyadic/use-polyadic-code-style

Use Polyadic.CodeStyle and fix the prolems
polyadic · Jan 28, 2025 · 0c96462 · 0c96462
2 parents 0776f3d + 9243662
commit 0c96462
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,7 +16,7 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Messerli.CodeStyle" PrivateAssets="all" />
+		<PackageReference Include="Polyadic.CodeStyle" PrivateAssets="all" />
 	</ItemGroup>
 	<PropertyGroup Label="Deterministic Builds and Source Link">
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/Funcky.Money.SourceGenerator/XmlNodeExtensions.cs b/Funcky.Money.SourceGenerator/XmlNodeExtensions.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Xml;
 
 namespace Funcky.Money.SourceGenerator;

diff --git a/Funcky.Money.Test/MoneyTest.cs b/Funcky.Money.Test/MoneyTest.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using System.Globalization;
 using FsCheck;
 using FsCheck.Xunit;
 using Xunit;
@@ -8,9 +7,8 @@ namespace Funcky.Test;
 
 public sealed class MoneyTest
 {
-    public MoneyTest() =>
-        Arb
-            .Register<MoneyArbitraries>();
+    public MoneyTest()
+        => Arb.Register<MoneyArbitraries>();
 
     private static MoneyEvaluationContext SwissRounding
         => MoneyEvaluationContext

diff --git a/Funcky.Money/Money.cs b/Funcky.Money/Money.cs
@@ -36,7 +36,7 @@ public Money(int amount, Option<Currency> currency = default)
     public bool IsZero
         => Amount == 0m;
 
-    // These operators supports the operators on IMoneyExpression, because Money + Money or Money * factor does not work otherwise without a cast.
+    // These operators support the operators on IMoneyExpression, because Money + Money or Money * factor does not work otherwise without a cast.
     public static IMoneyExpression operator +(Money augend, IMoneyExpression addend)
         => augend.Add(addend);
 
@@ -61,8 +61,8 @@ public bool IsZero
     public static decimal operator /(Money dividend, IMoneyExpression divisor)
         => dividend.Divide(divisor);
 
-    private static Currency SelectCurrency(Option<Currency> currency)
-        => currency.GetOrElse(CurrencyCulture.CurrentCurrency);
+    TState IMoneyExpression.Accept<TState>(IMoneyExpressionVisitor<TState> visitor)
+        => visitor.Visit(this);
 
     public static Option<Money> ParseOrNone(string money, Option<Currency> currency = default)
         => CurrencyCulture
@@ -72,6 +72,14 @@ public static Option<Money> ParseOrNone(string money, Option<Currency> currency
                 some: ParseWithFormatProvider(money))
             .AndThen(amount => new Money(amount, SelectCurrency(currency)));
 
+    public override string ToString()
+        => CurrencyCulture.FormatProviderFromCurrency(Currency).Match(
+            none: () => string.Format($"{{0:N{Currency.MinorUnitDigits}}} {{1}}", Amount, Currency.AlphabeticCurrencyCode),
+            some: formatProvider => string.Format(formatProvider, $"{{0:C{Currency.MinorUnitDigits}}}", Amount));
+
+    private static Currency SelectCurrency(Option<Currency> currency)
+        => currency.GetOrElse(CurrencyCulture.CurrentCurrency);
+
     private static Func<Option<decimal>> ParseManually(string money)
         => ()
            => RemoveIsoCurrency(money).ParseDecimalOrNone();
@@ -87,12 +95,4 @@ private static string RemoveIsoCurrency(string money)
     private static Func<IFormatProvider, Option<decimal>> ParseWithFormatProvider(string money)
         => formatProvider
             => money.ParseDecimalOrNone(NumberStyles.Currency, formatProvider);
-
-    public override string ToString()
-        => CurrencyCulture.FormatProviderFromCurrency(Currency).Match(
-            none: () => string.Format($"{{0:N{Currency.MinorUnitDigits}}} {{1}}", Amount, Currency.AlphabeticCurrencyCode),
-            some: formatProvider => string.Format(formatProvider, $"{{0:C{Currency.MinorUnitDigits}}}", Amount));
-
-    TState IMoneyExpression.Accept<TState>(IMoneyExpressionVisitor<TState> visitor)
-        => visitor.Visit(this);
 }
diff --git a/Packages.props b/Packages.props
@@ -5,7 +5,7 @@
 	</ItemGroup>
 	<ItemGroup Label="Build Dependencies">
 		<PackageReference Update="Funcky.DiscriminatedUnion" Version="1.0.0" />
-		<PackageReference Update="Messerli.CodeStyle" Version="2.1.3 " />
+		<PackageReference Update="Polyadic.CodeStyle" Version="1.0.0" />
 		<PackageReference Update="IsExternalInit" Version="[1.0.3, 2.0.0)" />
 		<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
 		<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />