Rename and consolidate "DelegateEndpoint" types (#36768)

Author: halter73

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs

@@ -8,18 +8,18 @@ namespace Microsoft.AspNetCore.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 internal static class DiagnosticDescriptors
 {
-    internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnDelegateEndpointParameters = new(
+    internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnRouteHandlerParameters = new(
         "ASP0003",
-        "Do not use model binding attributes with Map handlers",
+        "Do not use model binding attributes with route handlers",
         "{0} should not be specified for a {1} Delegate parameter",
         "Usage",
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
         helpLinkUri: "https://aka.ms/aspnet/analyzers");
 
-    internal static readonly DiagnosticDescriptor DoNotReturnActionResultsFromMapActions = new(
+    internal static readonly DiagnosticDescriptor DoNotReturnActionResultsFromRouteHandlers = new(
         "ASP0004",
-        "Do not use action results with Map actions",
+        "Do not use action results with route handlers",
         "IActionResult instances should not be returned from a {0} Delegate parameter. Consider returning an equivalent result from Microsoft.AspNetCore.Http.Results.",
         "Usage",
         DiagnosticSeverity.Warning,
@@ -28,8 +28,8 @@ internal static class DiagnosticDescriptors
 
     internal static readonly DiagnosticDescriptor DetectMisplacedLambdaAttribute = new(
         "ASP0005",
-        "Do not place attribute on route handlers",
-        "'{0}' should be placed on the endpoint delegate to be effective",
+        "Do not place attribute on method called by route handler lambda",
+        "'{0}' should be placed directly on the route handler lambda to be effective",
         "Usage",
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/DetectMismatchedParameterOptionality.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMismatchedParameterOptionality.cs

@@ -9,9 +9,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
-public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
+public partial class RouteHandlerAnalyzer : DiagnosticAnalyzer
 {
     private static void DetectMismatchedParameterOptionality(
         in OperationAnalysisContext context,

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/DetectMisplacedLambdaAttribute.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs

@@ -7,9 +7,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
-public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
+public partial class RouteHandlerAnalyzer : DiagnosticAnalyzer
 {
     private static void DetectMisplacedLambdaAttribute(
         in OperationAnalysisContext context,

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/DisallowMvcBindArgumentsOnParameters.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowMvcBindArgumentsOnParameters.cs

@@ -6,9 +6,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
-public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
+public partial class RouteHandlerAnalyzer : DiagnosticAnalyzer
 {
     private static void DisallowMvcBindArgumentsOnParameters(
         in OperationAnalysisContext context,
@@ -33,7 +33,7 @@ private static void DisallowMvcBindArgumentsOnParameters(
                 var methodName = invocation.TargetMethod.Name;
 
                 context.ReportDiagnostic(Diagnostic.Create(
-                    DiagnosticDescriptors.DoNotUseModelBindingAttributesOnDelegateEndpointParameters,
+                    DiagnosticDescriptors.DoNotUseModelBindingAttributesOnRouteHandlerParameters,
                     location,
                     modelBindingAttribute.AttributeClass.Name,
                     methodName));

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/DisallowReturningActionResultFromMapMethods.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowReturningActionResultFromMapMethods.cs

@@ -6,9 +6,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
-public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
+public partial class RouteHandlerAnalyzer : DiagnosticAnalyzer
 {
     private static void DisallowReturningActionResultFromMapMethods(
         in OperationAnalysisContext context,
@@ -40,7 +40,7 @@ private static void DisallowReturningActionResultFromMapMethods(
         {
             // if we don't have a method body, and the action is IResult or ActionResult<T> returning, produce diagnostics for the entire method.
             context.ReportDiagnostic(Diagnostic.Create(
-                DiagnosticDescriptors.DoNotReturnActionResultsFromMapActions,
+                DiagnosticDescriptors.DoNotReturnActionResultsFromRouteHandlers,
                 invocationOperation.Arguments[2].Syntax.GetLocation(),
                 invocationOperation.TargetMethod.Name));
             return;
@@ -74,7 +74,7 @@ private static void DisallowReturningActionResultFromMapMethods(
             if (wellKnownTypes.IActionResult.IsAssignableFrom(type))
             {
                 context.ReportDiagnostic(Diagnostic.Create(
-                    DiagnosticDescriptors.DoNotReturnActionResultsFromMapActions,
+                    DiagnosticDescriptors.DoNotReturnActionResultsFromRouteHandlers,
                     returnOperation.Syntax.GetLocation(),
                     invocationOperation.TargetMethod.Name));
             }

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/DelegateEndpointAnalyzer.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/RouteHandlerAnalyzer.cs

@@ -9,15 +9,15 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
+public partial class RouteHandlerAnalyzer : DiagnosticAnalyzer
 {
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(new[]
     {
-        DiagnosticDescriptors.DoNotUseModelBindingAttributesOnDelegateEndpointParameters,
-        DiagnosticDescriptors.DoNotReturnActionResultsFromMapActions,
+        DiagnosticDescriptors.DoNotUseModelBindingAttributesOnRouteHandlerParameters,
+        DiagnosticDescriptors.DoNotReturnActionResultsFromRouteHandlers,
         DiagnosticDescriptors.DetectMisplacedLambdaAttribute,
         DiagnosticDescriptors.DetectMismatchedParameterOptionality
     });
@@ -40,7 +40,7 @@ public override void Initialize(AnalysisContext context)
             {
                 var invocation = (IInvocationOperation)operationAnalysisContext.Operation;
                 var targetMethod = invocation.TargetMethod;
-                if (IsDelegateHandlerInvocation(wellKnownTypes, invocation, targetMethod))
+                if (!IsRouteHandlerInvocation(wellKnownTypes, invocation, targetMethod))
                 {
                     return;
                 }
@@ -109,13 +109,15 @@ public override void Initialize(AnalysisContext context)
         });
     }
 
-    private static bool IsDelegateHandlerInvocation(
+    private static bool IsRouteHandlerInvocation(
         WellKnownTypes wellKnownTypes,
         IInvocationOperation invocation,
         IMethodSymbol targetMethod)
     {
-        return !targetMethod.Name.StartsWith("Map", StringComparison.Ordinal) ||
-            !SymbolEqualityComparer.Default.Equals(wellKnownTypes.DelegateEndpointRouteBuilderExtensions, targetMethod.ContainingType) ||
-            invocation.Arguments.Length != 3;
+        return targetMethod.Name.StartsWith("Map", StringComparison.Ordinal) &&
+            SymbolEqualityComparer.Default.Equals(wellKnownTypes.EndpointRouteBuilderExtensions, targetMethod.ContainingType) &&
+            invocation.Arguments.Length == 3 &&
+            targetMethod.Parameters.Length == 3 &&
+            SymbolEqualityComparer.Default.Equals(wellKnownTypes.Delegate, targetMethod.Parameters[2].Type);
     }
 }

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DelegateEndpoints/WellKnownTypes.cs renamed to src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/WellKnownTypes.cs

@@ -4,15 +4,21 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
 internal sealed class WellKnownTypes
 {
     public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out WellKnownTypes? wellKnownTypes)
     {
         wellKnownTypes = default;
-        const string DelegateEndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions";
-        if (compilation.GetTypeByMetadataName(DelegateEndpointRouteBuilderExtensions) is not { } delegateEndpointRouteBuilderExtensions)
+        const string EndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.EndpointRouteBuilderExtensions";
+        if (compilation.GetTypeByMetadataName(EndpointRouteBuilderExtensions) is not { } endpointRouteBuilderExtensions)
+        {
+            return false;
+        }
+
+        const string Delegate = "System.Delegate";
+        if (compilation.GetTypeByMetadataName(Delegate) is not { } @delegate)
         {
             return false;
         }
@@ -51,7 +57,8 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We
 
         wellKnownTypes = new WellKnownTypes
         {
-            DelegateEndpointRouteBuilderExtensions = delegateEndpointRouteBuilderExtensions,
+            EndpointRouteBuilderExtensions = endpointRouteBuilderExtensions,
+            Delegate = @delegate,
             IBinderTypeProviderMetadata = ibinderTypeProviderMetadata,
             BindAttribute = bindAttribute,
             IResult = iResult,
@@ -62,7 +69,8 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We
         return true;
     }
 
-    public ITypeSymbol DelegateEndpointRouteBuilderExtensions { get; private init; }
+    public INamedTypeSymbol EndpointRouteBuilderExtensions { get; private init; }
+    public INamedTypeSymbol Delegate { get; private init; }
     public INamedTypeSymbol IBinderTypeProviderMetadata { get; private init; }
     public INamedTypeSymbol BindAttribute { get; private init; }
     public INamedTypeSymbol IResult { get; private init; }

src/Framework/AspNetCoreAnalyzers/src/CodeFixes/DetectMismatchedParameterOptionalityFixer.cs

@@ -1,19 +1,17 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Linq;
 using System.Threading;
 using System.Collections.Immutable;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.Editing;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints.Fixers;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers.Fixers;
 
 public class DetectMismatchedParameterOptionalityFixer : CodeFixProvider
 {

src/Framework/AspNetCoreAnalyzers/test/DelegateEndpoints/DetectMismatchedParameterOptionalityTest.cs renamed to src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DetectMismatchedParameterOptionalityTest.cs

@@ -3,11 +3,11 @@
 
 using Microsoft.CodeAnalysis.Testing;
 using Xunit;
-using VerifyCS = Microsoft.AspNetCore.Analyzers.DelegateEndpoints.CSharpDelegateEndpointsCodeFixVerifier<
-    Microsoft.AspNetCore.Analyzers.DelegateEndpoints.DelegateEndpointAnalyzer,
-    Microsoft.AspNetCore.Analyzers.DelegateEndpoints.Fixers.DetectMismatchedParameterOptionalityFixer>;
+using VerifyCS = Microsoft.AspNetCore.Analyzers.RouteHandlers.CSharpRouteHandlerCodeFixVerifier<
+    Microsoft.AspNetCore.Analyzers.RouteHandlers.RouteHandlerAnalyzer,
+    Microsoft.AspNetCore.Analyzers.RouteHandlers.Fixers.DetectMismatchedParameterOptionalityFixer>;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
 public partial class DetectMismatchedParameterOptionalityTest
 {
@@ -377,7 +377,7 @@ public async Task MatchingRequiredOptionality_WithDisabledNullability()
     public void RouteTokenizer_Works_ForSimpleRouteTemplates(string template, string[] expectedNames, string[] expectedQualifiers)
     {
         // Arrange
-        var tokenizer = new DelegateEndpointAnalyzer.RouteTokenEnumerator(template);
+        var tokenizer = new RouteHandlerAnalyzer.RouteTokenEnumerator(template);
         var actualNames = new List<string>();
         var actualQualifiers = new List<string>();
 

src/Framework/AspNetCoreAnalyzers/test/DelegateEndpoints/DetectMisplacedLambdaAttributeTest.cs renamed to src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DetectMisplacedLambdaAttributeTest.cs

@@ -5,11 +5,11 @@
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
+namespace Microsoft.AspNetCore.Analyzers.RouteHandlers;
 
 public partial class DetectMisplacedLambdaAttributeTest
 {
-    private TestDiagnosticAnalyzerRunner Runner { get; } = new(new DelegateEndpointAnalyzer());
+    private TestDiagnosticAnalyzerRunner Runner { get; } = new(new RouteHandlerAnalyzer());
 
     [Fact]
     public async Task MinimalAction_WithCorrectlyPlacedAttribute_Works()
@@ -48,7 +48,7 @@ void Hello() { }
         var diagnostic = Assert.Single(diagnostics);
         Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
         AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-        Assert.Equal("'AuthorizeAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+        Assert.Equal("'AuthorizeAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
     }
 
     [Fact]
@@ -70,7 +70,7 @@ public async Task MinimalAction_WithMisplacedAttributeAndBlockSyntax_ProducesDia
         var diagnostic = Assert.Single(diagnostics);
         Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
         AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-        Assert.Equal("'AuthorizeAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+        Assert.Equal("'AuthorizeAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
     }
 
     [Fact]
@@ -95,12 +95,12 @@ void Hello() { }
             diagnostic => {
                 Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
                 AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-                Assert.Equal("'AuthorizeAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+                Assert.Equal("'AuthorizeAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
             },
             diagnostic => {
                 Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
                 AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-                Assert.Equal("'ProducesAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+                Assert.Equal("'ProducesAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
             }
         );
     }
@@ -126,7 +126,7 @@ void Hello() { }
             diagnostic => {
                 Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
                 AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-                Assert.Equal("'ProducesAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+                Assert.Equal("'ProducesAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
             }
         );
     }
@@ -215,7 +215,7 @@ public static void Hello() { }
         var diagnostic = Assert.Single(diagnostics);
         Assert.Same(DiagnosticDescriptors.DetectMisplacedLambdaAttribute, diagnostic.Descriptor);
         AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
-        Assert.Equal("'AuthorizeAttribute' should be placed on the endpoint delegate to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
+        Assert.Equal("'AuthorizeAttribute' should be placed directly on the route handler lambda to be effective", diagnostic.GetMessage(CultureInfo.InvariantCulture));
     }
 
     [Fact]