Fix tests.

Author: JohanLarsson

AspNetCoreAnalyzers.Tests/ASP001ParameterNameTests/CodeFix.cs

@@ -406,5 +406,71 @@ public async Task<IActionResult> GetOrder([FromRoute]int id)
 }";
             AnalyzerAssert.CodeFix(Analyzer, RenameParameterFix, ExpectedDiagnostic, new[] { order, db, before }, after);
         }
+
+        [Test]
+        public void BothParameters()
+        {
+            var orderItem = @"
+namespace ValidCode
+{
+    public class OrderItem
+    {
+        public int Id { get; set; }
+    }
+}";
+            var order = @"
+namespace ValidCode
+{
+    public class Order
+    {
+        public int Id { get; set; }
+
+        public IEnumerable<OrderItem> Items { get; set; }
+    }
+}";
+
+            var db = @"
+namespace ValidCode
+{
+    using Microsoft.EntityFrameworkCore;
+
+    public class Db : DbContext
+    {
+        public DbSet<Order> Orders { get; set; }
+    }
+}";
+            var before = @"
+namespace ValidCode
+{
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.EntityFrameworkCore;
+
+    [ApiController]
+    public class OrdersController : Controller
+    {
+        private readonly Db db;
+
+        public OrdersController(Db db)
+        {
+            this.db = db;
+        }
+
+        [HttpGet(""api/orders/{orderId}/items/{itemId}"")]
+        public async Task<IActionResult> GetOrder↓(int wrong1, int wrong2)
+        {
+            var match = await this.db.Orders.FirstOrDefaultAsync(x => x.Id == wrong1)?.FirstOrDefaultAsync(x => x.Id == wrong2);
+            if (match == null)
+            {
+                return this.NotFound();
+            }
+
+            return this.Ok(match);
+        }
+    }
+}";
+
+            AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic, orderItem, order, db, before);
+        }
     }
 }

AspNetCoreAnalyzers/ASP003ParameterType.cs

@@ -0,0 +1,19 @@
+namespace AspNetCoreAnalyzers
+{
+    using Microsoft.CodeAnalysis;
+
+    internal static class ASP003ParameterType
+    {
+        public const string DiagnosticId = "ASP003";
+
+        internal static readonly DiagnosticDescriptor Descriptor = new DiagnosticDescriptor(
+            id: DiagnosticId,
+            title: "Parameter type does not match template.",
+            messageFormat: "Parameter type does not match template.",
+            category: AnalyzerCategory.Routing,
+            defaultSeverity: DiagnosticSeverity.Hidden,
+            isEnabledByDefault: true,
+            description: "Parameter type does not match template.",
+            helpLinkUri: HelpLink.ForId(DiagnosticId));
+    }
+}

AspNetCoreAnalyzers/Analyzers/AttributeAnalyzer.cs

@@ -31,13 +31,25 @@ context.ContainingSymbol is IMethodSymbol method &&
                 using (var pairs = GetPairs(template, method))
                 {
                     if (pairs.TrySingle(x => x.Template == null, out var withMethodParameter) &&
-                        pairs.TrySingle(x => x.Method == null, out var withTemplateParameter))
+                        methodDeclaration.TryFindParameter(withMethodParameter.Method.Name, out var parameterSyntax) &&
+                        pairs.TrySingle(x => x.Method == null, out var withTemplateParameter) &&
+                        withTemplateParameter.Template is TemplateParameter templateParameter)
                     {
                         context.ReportDiagnostic(
                             Diagnostic.Create(
                                 ASP001ParameterName.Descriptor,
-                                withMethodParameter.Method.Locations.Single(),
-                                ImmutableDictionary<string, string>.Empty.Add(nameof(NameSyntax), withTemplateParameter.Template.Value.Name.Text)));
+                                parameterSyntax.Identifier.GetLocation(),
+                                ImmutableDictionary<string, string>.Empty.Add(
+                                    nameof(NameSyntax),
+                                    templateParameter.Name.Text)));
+                    }
+                    else if (pairs.Count(x => x.Template == null) > 1 &&
+                             pairs.Count(x => x.Method == null) > 1)
+                    {
+                        context.ReportDiagnostic(
+                            Diagnostic.Create(
+                                ASP001ParameterName.Descriptor,
+                                methodDeclaration.ParameterList.GetLocation()));
                     }
 
                     if (pairs.TrySingle(x => x.Template != null, out _) &&