Skip to content

Enable Nullable compilation on the Options source gen#88973

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
tarekgh merged 2 commits into from
Jul 18, 2023
Merged

Enable Nullable compilation on the Options source gen #88973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d606d2
Enable Nullable compilation on the Options source gen
tarekgh Jul 17, 2023
3b95dc0
Update Microsoft.Extensions.Options.SourceGeneration.csproj
ViktorHofer Jul 17, 2023
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
6 changes: 3 additions & 3 deletions src/libraries/Microsoft.Extensions.Options/gen/Generator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,20 +17,20 @@ public class Generator : IIncrementalGenerator
{
public void Initialize(IncrementalGeneratorInitializationContext context)
{
IncrementalValuesProvider<(TypeDeclarationSyntax TypeSyntax, SemanticModel SemanticModel)> typeDeclarations = context.SyntaxProvider
IncrementalValuesProvider<(TypeDeclarationSyntax? TypeSyntax, SemanticModel SemanticModel)> typeDeclarations = context.SyntaxProvider
.ForAttributeWithMetadataName(
SymbolLoader.OptionsValidatorAttribute,
(node, _) => node is TypeDeclarationSyntax,
(context, _) => (TypeSyntax:context.TargetNode as TypeDeclarationSyntax, SemanticModel: context.SemanticModel))
.Where(static m => m.TypeSyntax is not null);

IncrementalValueProvider<(Compilation, ImmutableArray<(TypeDeclarationSyntax TypeSyntax, SemanticModel SemanticModel)>)> compilationAndTypes =
IncrementalValueProvider<(Compilation, ImmutableArray<(TypeDeclarationSyntax? TypeSyntax, SemanticModel SemanticModel)>)> compilationAndTypes =
context.CompilationProvider.Combine(typeDeclarations.Collect());

context.RegisterSourceOutput(compilationAndTypes, static (spc, source) => HandleAnnotatedTypes(source.Item1, source.Item2, spc));
}

private static void HandleAnnotatedTypes(Compilation compilation, ImmutableArray<(TypeDeclarationSyntax TypeSyntax, SemanticModel SemanticModel)> types, SourceProductionContext context)
private static void HandleAnnotatedTypes(Compilation compilation, ImmutableArray<(TypeDeclarationSyntax? TypeSyntax, SemanticModel SemanticModel)> types, SourceProductionContext context)
{
if (!SymbolLoader.TryLoad(compilation, out var symbolHolder))
{
Expand Down
6 changes: 5 additions & 1 deletion ...ies/Microsoft.Extensions.Options/gen/Microsoft.Extensions.Options.SourceGeneration.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<!-- Source generators must target netstandard2.0 which doesn't support nullable reference types. In order
to enable the nullable reference type compiler checks, we also target NetCoreAppCurrent. -->
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
<CLSCompliant>false</CLSCompliant>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<UsingToolXliff>true</UsingToolXliff>
Expand DownExpand Up@@ -32,4 +35,5 @@
<Compile Include="SymbolLoader.cs" />
<Compile Include="TypeDeclarationSyntaxReceiver.cs" />
</ItemGroup>

</Project>
18 changes: 10 additions & 8 deletions src/libraries/Microsoft.Extensions.Options/gen/Parser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,9 @@ public IReadOnlyList<ValidatorType> GetValidatorTypes(IEnumerable<(TypeDeclarati
continue;
}

Location lowerLocationInCompilation = _compilation.ContainsSyntaxTree(modelType.GetLocation().SourceTree)
? modelType.GetLocation()
Location? modelTypeLocation = modelType.GetLocation();
Location lowerLocationInCompilation = modelTypeLocation is not null && modelTypeLocation.SourceTree is not null && _compilation.ContainsSyntaxTree(modelTypeLocation.SourceTree)
? modelTypeLocation
: syntax.GetLocation();

var membersToValidate = GetMembersToValidate(modelType, true, lowerLocationInCompilation, validatorType);
Expand DownExpand Up@@ -128,7 +129,7 @@ public IReadOnlyList<ValidatorType> GetValidatorTypes(IEnumerable<(TypeDeclarati
parents.Reverse();

results.Add(new ValidatorType(
validatorType.ContainingNamespace.IsGlobalNamespace ? string.Empty : validatorType.ContainingNamespace.ToString(),
validatorType.ContainingNamespace.IsGlobalNamespace ? string.Empty : validatorType.ContainingNamespace.ToString()!,
GetMinimalFQN(validatorType),
GetMinimalFQNWithoutGenerics(validatorType),
keyword,
Expand DownExpand Up@@ -267,8 +268,9 @@ private List<ValidatedMember> GetMembersToValidate(ITypeSymbol modelType, bool s
var membersToValidate = new List<ValidatedMember>();
foreach (var member in members)
{
Location location = _compilation.ContainsSyntaxTree(member.GetLocation().SourceTree)
? member.GetLocation()
Location? memberLocation = member.GetLocation();
Location location = memberLocation is not null && memberLocation.SourceTree is not null && _compilation.ContainsSyntaxTree(memberLocation.SourceTree)
? memberLocation
: lowerLocationInCompilation;

var memberInfo = GetMemberInfo(member, speculate, location, validatorType);
Expand DownExpand Up@@ -556,7 +558,7 @@ private List<ValidatedMember> GetMembersToValidate(ITypeSymbol modelType, bool s
var validatorTypeName = "__" + mt.Name + "Validator__";

var result = new ValidatorType(
mt.ContainingNamespace.IsGlobalNamespace ? string.Empty : mt.ContainingNamespace.ToString(),
mt.ContainingNamespace.IsGlobalNamespace ? string.Empty : mt.ContainingNamespace.ToString()!,
validatorTypeName,
validatorTypeName,
"class",
Expand DownExpand Up@@ -638,12 +640,12 @@ private string GetArgumentExpression(ITypeSymbol type, object? value)

if (type.SpecialType == SpecialType.System_String)
{
return $@"""{EscapeString(value.ToString())}""";
return $@"""{EscapeString(value.ToString()!)}""";
}

if (type.SpecialType == SpecialType.System_Char)
{
return $@"'{EscapeString(value.ToString())}'";
return $@"'{EscapeString(value.ToString()!)}'";
}

return $"({type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){Convert.ToString(value, CultureInfo.InvariantCulture)}";
Expand Down