[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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
carlossanlop merged 5 commits into from
Aug 17, 2023
Merged

[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen #90746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e03a22
Improve filtering of candidate binding invocations in config binder gen
layomia Aug 15, 2023
80ec49d
Address feedback
layomia Aug 16, 2023
4f9ca98
Address feedback: rename helper; further tighten constraint
layomia Aug 16, 2023
55ce3bb
Add follow-up TODO
layomia Aug 16, 2023
fef4920
Revert TypeSyntax clause to fix failing tests
layomia Aug 16, 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
10 changes: 3 additions & 7 deletions ...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

foreach (BinderInvocation invocation in _invocations)
{
IInvocationOperation invocationOperation = invocation.Operation!;
if (!invocationOperation.TargetMethod.IsExtensionMethod)
{
continue;
}
IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
Debug.Assert(targetMethod.IsExtensionMethod);

INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
{
RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
? new CompilationData((CSharpCompilation)compilation)
: null);

IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
.CreateSyntaxProvider(
(node, _) => node is InvocationExpressionSyntax invocation,
(node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
BinderInvocation.Create)
.Where(operation => operation is not null);
.Where(invocation => invocation is not null);

IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
}

Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
{
Emitter emitter = new(context, spec);
emitter.Emit();
Expand Down
59 changes: 24 additions & 35 deletions ...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
internal sealed record BinderInvocation
internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
{
public IInvocationOperation Operation { get; private set; }
public Location? Location { get; private set; }

public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
{
if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
!IsCandidateInvocation(operation))
{
return null;
}
Debug.Assert(IsCandidateSyntaxNode(context.Node));
InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

return new BinderInvocation()
{
Operation = operation,
Location = invocationSyntax.GetLocation()
};
return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
IsBindingOperation(operation)
? new BinderInvocation(operation, invocationSyntax.GetLocation())
: null;
}

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
{
if (node is InvocationExpressionSyntax
{
Expression: MemberAccessExpressionSyntax
{
Name.Identifier.ValueText: string memberName
}
} syntax && IsCandidateBindingMethodName(memberName))
return node is InvocationExpressionSyntax
{
invocationSyntax = syntax;
return true;
}

invocationSyntax = null;
return false;
// TODO: drill further into this evaluation for a declaring-type name check.
// https://github.com/dotnet/runtime/issues/90687.
Expression: MemberAccessExpressionSyntax
{
Name.Identifier.ValueText: string memberName,
}
} && IsCandidateBindingMethodName(memberName);

static bool IsCandidateBindingMethodName(string name) =>
IsCandidateMethodName_ConfigurationBinder(name) ||
IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
}

private static bool IsCandidateInvocation(IInvocationOperation operation)
private static bool IsBindingOperation(IInvocationOperation operation)
{
if (operation.TargetMethod is not IMethodSymbol
{
IsExtensionMethod: true,
Name: string methodName,
ContainingType: ITypeSymbol
ContainingType: INamedTypeSymbol
{
Name: string containingTypeName,
ContainingNamespace: INamespaceSymbol { } containingNamespace,
} containingType
} method ||
containingNamespace.ToDisplayString() is not string containingNamespaceName)
ContainingNamespace: INamespaceSymbol containingNamespace,
}
})
{
return false;
}

string containingNamespaceName = containingNamespace.ToDisplayString();

return (containingTypeName) switch
{
"ConfigurationBinder" =>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen#90746

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

carlossanlop
merged 5 commits into

from

Aug 17, 2023
 Merged


[release/8.0-rc1] Improve filtering of candidate binding invocations in config binder gen
#90746
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2e03a22

Improve filtering of candidate binding invocations in config binder gen


layomia Aug 15, 2023
80ec49d

Address feedback


layomia Aug 16, 2023
4f9ca98

Address feedback: rename helper; further tighten constraint


layomia Aug 16, 2023
55ce3bb

Add follow-up TODO


layomia Aug 16, 2023
fef4920

Revert TypeSyntax clause to fix failing tests


layomia Aug 16, 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


10 changes: 3 additions & 7 deletions
...ies/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
Expand DownExpand Up@@ -44,13 +43,10 @@ public Parser(SourceProductionContext context, KnownTypeSymbols typeSymbols, Imm

 foreach (BinderInvocation invocation in _invocations)
 {
 IInvocationOperation invocationOperation = invocation.Operation!;
 if (!invocationOperation.TargetMethod.IsExtensionMethod)
 {
 continue;
 }
 IMethodSymbol targetMethod = invocation.Operation.TargetMethod;
 INamedTypeSymbol? candidateBinderType = targetMethod.ContainingType;
 Debug.Assert(targetMethod.IsExtensionMethod);

 INamedTypeSymbol? candidateBinderType = invocationOperation.TargetMethod.ContainingType;
 if (SymbolEqualityComparer.Default.Equals(candidateBinderType, _typeSymbols.ConfigurationBinder))
 {
 RegisterMethodInvocation_ConfigurationBinder(invocation);
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 ? new CompilationData((CSharpCompilation)compilation)
 : null);

 IncrementalValuesProvider<BinderInvocation> inputCalls = context.SyntaxProvider
 IncrementalValuesProvider<BinderInvocation?> inputCalls = context.SyntaxProvider
 .CreateSyntaxProvider(
 (node, _) => node is InvocationExpressionSyntax invocation,
 (node, _) => BinderInvocation.IsCandidateSyntaxNode(node),
 BinderInvocation.Create)
 .Where(operation => operation is not null);
 .Where(invocation => invocation is not null);

 IncrementalValueProvider<(CompilationData?, ImmutableArray<BinderInvocation>)> inputData = compilationData.Combine(inputCalls.Collect());

Expand All@@ -59,7 +59,7 @@ private static void Execute(CompilationData compilationData, ImmutableArray<Bind
 }

 Parser parser = new(context, compilationData.TypeSymbols!, inputCalls);
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec { } spec)
 if (parser.GetSourceGenerationSpec() is SourceGenerationSpec spec)
 {
 Emitter emitter = new(context, spec);
 emitter.Emit();
Expand Down

59 changes: 24 additions & 35 deletions
...ibraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Parser/BinderInvocation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,74 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis;

namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
{
 internal sealed record BinderInvocation
 internal sealed record BinderInvocation(IInvocationOperation Operation, Location Location)
 {
 public IInvocationOperation Operation { get; private set; }
 public Location? Location { get; private set; }

 public static BinderInvocation? Create(GeneratorSyntaxContext context, CancellationToken cancellationToken)
 {
 if (!IsCandidateInvocationExpressionSyntax(context.Node, out InvocationExpressionSyntax? invocationSyntax) ||
 context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is not IInvocationOperation operation ||
 !IsCandidateInvocation(operation))
 {
 return null;
 }
 Debug.Assert(IsCandidateSyntaxNode(context.Node));
 InvocationExpressionSyntax invocationSyntax = (InvocationExpressionSyntax)context.Node;

 return new BinderInvocation()
 {
 Operation = operation,
 Location = invocationSyntax.GetLocation()
 };
 return context.SemanticModel.GetOperation(invocationSyntax, cancellationToken) is IInvocationOperation operation &&
 IsBindingOperation(operation)
 ? new BinderInvocation(operation, invocationSyntax.GetLocation())
 : null;
 }

private static bool IsCandidateInvocationExpressionSyntax(SyntaxNode node, out InvocationExpressionSyntax? invocationSyntax)
public static bool IsCandidateSyntaxNode(SyntaxNode node)
 {
 if (node is InvocationExpressionSyntax
 {
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName
 }
 } syntax && IsCandidateBindingMethodName(memberName))
 return node is InvocationExpressionSyntax
 {
 invocationSyntax = syntax;
 return true;
 }

 invocationSyntax = null;
 return false;
 // TODO: drill further into this evaluation for a declaring-type name check.
 // https://github.com/dotnet/runtime/issues/90687.
 Expression: MemberAccessExpressionSyntax
 {
 Name.Identifier.ValueText: string memberName,
 }
 } && IsCandidateBindingMethodName(memberName);

 static bool IsCandidateBindingMethodName(string name) =>
 IsCandidateMethodName_ConfigurationBinder(name) ||
 IsCandidateMethodName_OptionsBuilderConfigurationExtensions(name) ||
 IsValidMethodName_OptionsConfigurationServiceCollectionExtensions(name);
 }

 private static bool IsCandidateInvocation(IInvocationOperation operation)
 private static bool IsBindingOperation(IInvocationOperation operation)
 {
 if (operation.TargetMethod is not IMethodSymbol
 {
 IsExtensionMethod: true,
 Name: string methodName,
 ContainingType: ITypeSymbol
 ContainingType: INamedTypeSymbol
 {
 Name: string containingTypeName,
 ContainingNamespace: INamespaceSymbol { } containingNamespace,
 } containingType
 } method ||
 containingNamespace.ToDisplayString() is not string containingNamespaceName)
 ContainingNamespace: INamespaceSymbol containingNamespace,
 }
 })
 {
 return false;
 }

 string containingNamespaceName = containingNamespace.ToDisplayString();

 return (containingTypeName) switch
 {
 "ConfigurationBinder" =>
Expand Down