-
-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[dotnet] Add trimming attributes, address some trim warnings #14637
Open
RenderMichael
wants to merge
5
commits into
SeleniumHQ:trunk
Choose a base branch
from
RenderMichael:trim-improvement
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
923f23f
[dotnet] Add trimming attributes, address some trim warnings
RenderMichael 1b6adc1
Merge branch 'trunk' into trim-improvement
RenderMichael 84714f3
Make DomainType struct readonly
RenderMichael 5c2430a
Merge branch 'trim-improvement' of https://github.com/RenderMichael/s…
RenderMichael ec91f98
Merge branch 'trunk' into trim-improvement
RenderMichael File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 9 additions & 4 deletions
13
dotnet/src/webdriver/DevTools/Json/JsonEnumMemberConverter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,30 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Diagnostics.CodeAnalysis; | ||
using System.Linq; | ||
using System.Runtime.Serialization; | ||
using System.Text.Json; | ||
using System.Text.Json.Serialization; | ||
|
||
namespace OpenQA.Selenium.DevTools.Json | ||
{ | ||
internal class JsonEnumMemberConverter<TEnum> : JsonConverter<TEnum> where TEnum : Enum | ||
internal class JsonEnumMemberConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum> | ||
: JsonConverter<TEnum> where TEnum : struct, Enum | ||
{ | ||
private readonly Dictionary<TEnum, string> _enumToString = new Dictionary<TEnum, string>(); | ||
private readonly Dictionary<string, TEnum> _stringToEnum = new Dictionary<string, TEnum>(); | ||
|
||
public JsonEnumMemberConverter() | ||
{ | ||
var type = typeof(TEnum); | ||
var values = Enum.GetValues(type); | ||
|
||
#if NET5_0_OR_GREATER | ||
TEnum[] values = Enum.GetValues<TEnum>(); | ||
#else | ||
Array values = Enum.GetValues(type); | ||
#endif | ||
foreach (var value in values) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
{ | ||
var enumMember = type.GetMember(value.ToString())[0]; | ||
var enumMember = type.GetField(value.ToString()); | ||
var attr = enumMember.GetCustomAttributes(typeof(EnumMemberAttribute), false) | ||
.Cast<EnumMemberAttribute>() | ||
.FirstOrDefault(); | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the kind of workaround necessary when using a
Type
as a generic argument, and in a way which requires trimming annotations. Hope this is acceptable.