Skip to content

Add API entry for JsonDocument converter #60236

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.

Sign up for GitHub

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

Merged
eiriktsarpalis merged 6 commits into from
Apr 20, 2022
Merged

Add API entry for JsonDocument converter #60236

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56b3720
Add API entry for JsonDocument converter
strobelt Oct 10, 2021
857693f
Add reference to System.Text.Json
strobelt Oct 10, 2021
3408c93
Add JsonElementConverter from MetadataServices
strobelt Oct 12, 2021
13975b4
Correct converter naming
strobelt Oct 12, 2021
8f09f7c
Add JsonDocument type to source generation
strobelt Oct 12, 2021
9acc45d
include testing
eiriktsarpalis Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add JsonDocument type to source generation
  • Loading branch information
@strobelt @eiriktsarpalis
strobelt authored and eiriktsarpalis committed Apr 20, 2022
commit 8f09f7c7987a923f711ce61c2bf9a41bcacc6cb5
4 changes: 4 additions & 0 deletions src/libraries/System.Text.Json/gen/JsonSourceGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ private sealed class Parser
private const string JsonNodeFullName = "System.Text.Json.Nodes.JsonNode";
private const string JsonObjectFullName = "System.Text.Json.Nodes.JsonObject";
private const string JsonValueFullName = "System.Text.Json.Nodes.JsonValue";
private const string JsonDocumentFullName = "System.Text.Json.JsonDocument";
private const string JsonIgnoreAttributeFullName = "System.Text.Json.Serialization.JsonIgnoreAttribute";
private const string JsonIgnoreConditionFullName = "System.Text.Json.Serialization.JsonIgnoreCondition";
private const string JsonIncludeAttributeFullName = "System.Text.Json.Serialization.JsonIncludeAttribute";
Expand Down Expand Up @@ -92,6 +93,7 @@ private sealed class Parser
private readonly Type? _jsonNodeType;
private readonly Type? _jsonObjectType;
private readonly Type? _jsonValueType;
private readonly Type? _jsonDocumentType;

// Unsupported types
private readonly Type _delegateType;
Expand Down Expand Up @@ -229,6 +231,7 @@ public Parser(Compilation compilation, in JsonSourceGenerationContext sourceGene
_jsonNodeType = _metadataLoadContext.Resolve(JsonNodeFullName);
_jsonObjectType = _metadataLoadContext.Resolve(JsonObjectFullName);
_jsonValueType = _metadataLoadContext.Resolve(JsonValueFullName);
_jsonDocumentType = _metadataLoadContext.Resolve(JsonDocumentFullName);

// Unsupported types.
_delegateType = _metadataLoadContext.Resolve(SpecialType.System_Delegate);
Expand Down Expand Up @@ -1556,6 +1559,7 @@ private void PopulateKnownTypes()
AddTypeIfNotNull(_knownTypes, _jsonNodeType);
AddTypeIfNotNull(_knownTypes, _jsonObjectType);
AddTypeIfNotNull(_knownTypes, _jsonValueType);
AddTypeIfNotNull(_knownTypes, _jsonDocumentType);

_knownUnsupportedTypes.Add(_typeType);
_knownUnsupportedTypes.Add(_serializationInfoType);
Expand Down