Skip to content

Commit a0696f8

Browse files
committed
Replace ValidateNormalizationFormAttribute to ValidateEnumValueAttribute`
1 parent 41dfd46 commit a0696f8

3 files changed

Lines changed: 4 additions & 22 deletions

File tree

src/FixNormalization/Commands/FixCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Ookii.CommandLine.Conversion;
88
using System.IO.Abstractions;
99

10-
using FixNormalization.Validation;
10+
using Ookii.CommandLine.Validation;
1111

1212
namespace FixNormalization.Commands;
1313

@@ -29,7 +29,7 @@ public partial class FixCommand : AsyncCommandBase
2929
[Description("Normalization form to be used. You can choose NFC (The most common types in the majority of environments) and NFD (Used in macOS or Darwin)")]
3030
[ValueDescription("form")]
3131
[ArgumentConverter(typeof(NormalizationFormConverter))]
32-
[ValidateNormalizationForm(AllowNonDefinedValues = true,
32+
[ValidateEnumValue(AllowNonDefinedValues = TriState.True,
3333
IncludeInUsageHelp = true,
3434
IncludeValuesInErrorMessage = true)]
3535
public NormalizationForm NForm { get; set; }

src/FixNormalization/NormalizationFormConverter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System.Globalization;
66
using System.Text;
77

8-
using FixNormalization.Validation;
9-
108
namespace FixNormalization;
119

1210
public sealed class NormalizationFormConverter : ArgumentConverter
@@ -23,7 +21,7 @@ public sealed class NormalizationFormConverter : ArgumentConverter
2321

2422
public object? Convert(string value, CultureInfo culture, CommandLineArgument argument)
2523
{
26-
var attribute = argument.Validators.OfType<ValidateNormalizationFormAttribute>()!.FirstOrDefault();
24+
var attribute = argument.Validators.OfType<ValidateEnumValueAttribute>()!.FirstOrDefault();
2725

2826
try
2927
{
@@ -58,7 +56,7 @@ public sealed class NormalizationFormConverter : ArgumentConverter
5856
_ => throw new ArgumentException($"Value {target.ToString()} is invalid.")
5957
};
6058

61-
private string GetExceptionMessage(string value, CommandLineArgument argument, ValidateNormalizationFormAttribute? attr)
59+
private string GetExceptionMessage(string value, CommandLineArgument argument, ValidateEnumValueAttribute? attr)
6260
{
6361
return attr!.GetErrorMessage(argument, value) ?? argument.Parser.StringProvider.ValidateEnumValueFailed(argument.ArgumentName, typeof(NormalizationForm), value, true);
6462
}

src/FixNormalization/ValidateNormalizationFormAttribute.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)