Browse Source

Rename EnumParserHelper

pull/7935/head
Steven He 4 years ago
parent
commit
67b18b8e3f
  1. 2
      Avalonia.sln
  2. 2
      src/Avalonia.Base/Avalonia.Base.csproj
  3. 4
      src/Avalonia.Base/Input/KeyGesture.cs
  4. 2
      src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
  5. 4
      src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
  6. 6
      src/Shared/EnumHelper.cs

2
Avalonia.sln

@ -38,7 +38,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
src\Shared\EnumParserHelper.cs = src\Shared\EnumParserHelper.cs
src\Shared\EnumHelper.cs = src\Shared\EnumHelper.cs
src\Shared\ModuleInitializer.cs = src\Shared\ModuleInitializer.cs
src\Shared\SourceGeneratorAttributes.cs = src\Shared\SourceGeneratorAttributes.cs
EndProjectSection

2
src/Avalonia.Base/Avalonia.Base.csproj

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Assets\*.trie" />
<Compile Include="..\Shared\EnumParserHelper.cs" />
<Compile Include="..\Shared\EnumHelper.cs" />
</ItemGroup>
<Import Project="..\..\build\Base.props" />
<Import Project="..\..\build\Binding.props" />

4
src/Avalonia.Base/Input/KeyGesture.cs

@ -155,7 +155,7 @@ namespace Avalonia.Input
if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
return rv;
return EnumParserHelper.ParseEnum<Key>(key, true);
return EnumHelper.Parse<Key>(key, true);
}
private static KeyModifiers ParseModifier(ReadOnlySpan<char> modifier)
@ -172,7 +172,7 @@ namespace Avalonia.Input
return KeyModifiers.Meta;
}
return EnumParserHelper.ParseEnum<KeyModifiers>(modifier.ToString(), true);
return EnumHelper.Parse<KeyModifiers>(modifier.ToString(), true);
}
private Key ResolveNumPadOperationKey(Key key)

2
src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj

@ -19,7 +19,7 @@
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
<Compile Include="..\Shared\EnumParserHelper.cs" />
<Compile Include="..\Shared\EnumHelper.cs" />
</ItemGroup>
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\ApiDiff.props" />

4
src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs

@ -320,13 +320,13 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
? null
: modifiersText
.Split(',')
.Select(x => EnumParserHelper.ParseEnum<InputProtocol.InputModifiers>(x, true))
.Select(x => EnumHelper.Parse<InputProtocol.InputModifiers>(x, true))
.ToArray();
private static InputProtocol.MouseButton ParseMouseButton(string buttonText) =>
string.IsNullOrWhiteSpace(buttonText)
? InputProtocol.MouseButton.None
: EnumParserHelper.ParseEnum<InputProtocol.MouseButton>(buttonText, true);
: EnumHelper.Parse<InputProtocol.MouseButton>(buttonText, true);
private static double ParseDouble(string text) =>
double.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture);

6
src/Shared/EnumParserHelper.cs → src/Shared/EnumHelper.cs

@ -2,15 +2,15 @@
namespace Avalonia
{
internal class EnumParserHelper
internal class EnumHelper
{
#if NET6_0
public static T ParseEnum<T>(ReadOnlySpan<char> key, bool ignoreCase) where T : struct
public static T Parse<T>(ReadOnlySpan<char> key, bool ignoreCase) where T : struct
{
return Enum.Parse<T>(key, ignoreCase);
}
#else
public static T ParseEnum<T>(string key, bool ignoreCase) where T : struct
public static T Parse<T>(string key, bool ignoreCase) where T : struct
{
return (T)Enum.Parse(typeof(T), key, ignoreCase);
}
Loading…
Cancel
Save