[release/8.0-rc1] Use Roslyn interceptors feature in binder gen #90835
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
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
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
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,12 +1,14 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.Immutable; | ||
| using System.Diagnostics; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Linq; | ||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.Operations; | ||
|
|
||
| namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration | ||
| { | ||
|
|
@@ -147,7 +149,7 @@ type.TypeKind is TypeKind.TypeParameter or TypeKind.Pointer or TypeKind.Error || | |
| { | ||
| // List<string> is used in generated code as a temp holder for formatting | ||
| // an error for config properties that don't map to object properties. | ||
| _sourceGenSpec.Namespaces.Add("System.Collections.Generic"); | ||
|
There was a problem hiding this comment. The There was a problem hiding this comment. Thanks, I have pending 9.0 work to fix this #89587. |
||
|
|
||
| spec = CreateObjectSpec(namedType); | ||
| } | ||
|
|
@@ -169,32 +171,54 @@ type.TypeKind is TypeKind.TypeParameter or TypeKind.Pointer or TypeKind.Error || | |
| string @namespace = spec.Namespace; | ||
| if (@namespace is not null and not "<global namespace>") | ||
| { | ||
| _sourceGenSpec.Namespaces.Add(@namespace); | ||
| } | ||
|
|
||
| return _createdSpecs[type] = spec; | ||
| } | ||
|
|
||
| private void RegisterTypeForBindCoreMainGen(TypeSpec typeSpec) | ||
| { | ||
| if (typeSpec.NeedsMemberBinding) | ||
| { | ||
| RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCoreMain, typeSpec); | ||
| RegisterTypeForBindCoreGen(typeSpec); | ||
| _sourceGenSpec.MethodsToGen_CoreBindingHelper |= MethodsToGen_CoreBindingHelper.AsConfigWithChildren; | ||
| } | ||
| } | ||
|
|
||
| private void RegisterTypeForBindCoreGen(TypeSpec typeSpec) | ||
| { | ||
| if (typeSpec.NeedsMemberBinding) | ||
| { | ||
| RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.BindCore, typeSpec); | ||
| } | ||
| } | ||
|
|
||
| private void RegisterTypeForGetCoreGen(TypeSpec typeSpec) | ||
| { | ||
| RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper.GetCore, typeSpec); | ||
| _sourceGenSpec.MethodsToGen_CoreBindingHelper |= MethodsToGen_CoreBindingHelper.AsConfigWithChildren; | ||
| } | ||
|
|
||
| private void RegisterTypeForMethodGen(MethodsToGen_CoreBindingHelper method, TypeSpec type) | ||
| { | ||
| if (!_sourceGenSpec.TypesForGen_CoreBindingHelper_Methods.TryGetValue(method, out HashSet<TypeSpec>? types)) | ||
| { | ||
| _sourceGenSpec.TypesForGen_CoreBindingHelper_Methods[method] = types = new HashSet<TypeSpec>(); | ||
| } | ||
|
|
||
| types.Add(type); | ||
| _sourceGenSpec.MethodsToGen_CoreBindingHelper |= method; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Registers interceptors for root binding methods, except for ConfigurationBinder.Bind, | ||
| /// which is handled by <see cref="RegisterAsInterceptor_ConfigBinder_BindMethod"/> | ||
| /// </summary> | ||
| private void RegisterAsInterceptor(Enum method, IInvocationOperation operation) => | ||
| _sourceGenSpec.InterceptionInfo.RegisterCacheEntry(method, new InterceptorLocationInfo(operation)); | ||
|
|
||
| private static bool IsNullable(ITypeSymbol type, [NotNullWhen(true)] out ITypeSymbol? underlyingType) | ||
| { | ||
| if (type is INamedTypeSymbol { IsGenericType: true } genericType && | ||
|
|
@@ -335,7 +359,7 @@ private bool TryGetTypeSpec(ITypeSymbol type, DiagnosticDescriptor descriptor, o | |
|
|
||
| // We want a BindCore method for List<TElement> as a temp holder for the array values. We know the element type is supported. | ||
| EnumerableSpec listSpec = (GetOrCreateTypeSpec(_typeSymbols.List.Construct(arrayType.ElementType)) as EnumerableSpec)!; | ||
| RegisterTypeForBindCoreGen(listSpec); | ||
|
|
||
| EnumerableSpec spec = new EnumerableSpec(arrayType) | ||
| { | ||
|
|
@@ -347,7 +371,7 @@ private bool TryGetTypeSpec(ITypeSymbol type, DiagnosticDescriptor descriptor, o | |
| }; | ||
|
|
||
| Debug.Assert(spec.CanInitialize); | ||
| RegisterTypeForBindCoreGen(spec); | ||
|
|
||
| return spec; | ||
| } | ||
|
|
@@ -383,7 +407,7 @@ private bool IsSupportedArrayType(ITypeSymbol type) | |
|
|
||
| if (spec is not null) | ||
| { | ||
| RegisterTypeForBindCoreGen(spec); | ||
| spec.InitExceptionMessage ??= spec.ElementType.InitExceptionMessage; | ||
| } | ||
|
|
||
|
|
@@ -442,7 +466,7 @@ private DictionarySpec CreateDictionarySpec(INamedTypeSymbol type, ITypeSymbol k | |
| constructionStrategy = InitializationStrategy.ToEnumerableMethod; | ||
| populationStrategy = CollectionPopulationStrategy.Cast_Then_Add; | ||
| toEnumerableMethodCall = "ToDictionary(pair => pair.Key, pair => pair.Value)"; | ||
| _sourceGenSpec.Namespaces.Add("System.Linq"); | ||
| } | ||
| else | ||
| { | ||
|
|
@@ -711,7 +735,7 @@ private DictionarySpec CreateDictionarySpec(INamedTypeSymbol type, ITypeSymbol k | |
|
|
||
| if (objectSpec.NeedsMemberBinding) | ||
| { | ||
| RegisterTypeForBindCoreGen(objectSpec); | ||
| } | ||
|
|
||
| return objectSpec; | ||
|
|
@@ -890,4 +914,19 @@ private void RegisterTypeDiagnostic(ITypeSymbol causingType, InvocationDiagnosti | |
| } | ||
| } | ||
| } | ||
|
|
||
| public static class ParserExtensions | ||
| { | ||
| public static void RegisterCacheEntry<TKey, TValue, TEntry>(this Dictionary<TKey, TValue> cache, TKey key, TEntry entry) | ||
| where TKey : notnull | ||
| where TValue : ICollection<TEntry>, new() | ||
| { | ||
| if (!cache.TryGetValue(key, out TValue? entryCollection)) | ||
| { | ||
| cache[key] = entryCollection = new TValue(); | ||
| } | ||
|
|
||
| entryCollection.Add(entry); | ||
| } | ||
| } | ||
| } | ||
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.
When emitting lambdas in generated code consider using fully specified signatures: makes the code less subject to interference and reduces build / IDE analysis time.