Refactor ASP003

Author: JohanLarsson

…ests/ASP003ParameterTypeTests/CodeFix.cs …SP003ParameterSymbolTypeTests/CodeFix.csAspNetCoreAnalyzers.Tests/ASP003ParameterTypeTests/CodeFix.cs renamed to AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/CodeFix.cs AspNetCoreAnalyzers.Tests/ASP003ParameterTypeTests/CodeFix.cs renamed to AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/CodeFix.cs

@@ -8,7 +8,7 @@ namespace AspNetCoreAnalyzers.Tests.ASP003ParameterTypeTests
     public class CodeFix
     {
         private static readonly DiagnosticAnalyzer Analyzer = new AttributeAnalyzer();
-        private static readonly ExpectedDiagnostic ExpectedDiagnostic = ExpectedDiagnostic.Create(ASP003ParameterType.Descriptor);
+        private static readonly ExpectedDiagnostic ExpectedDiagnostic = ExpectedDiagnostic.Create(ASP003ParameterSymbolType.Descriptor);
         private static readonly CodeFixProvider Fix = new ParameterTypeFix();
 
         [TestCase("\"{id:int}\"",                                                 "int id")]

…ts/ASP003ParameterTypeTests/ValidCode.cs …003ParameterSymbolTypeTests/ValidCode.csAspNetCoreAnalyzers.Tests/ASP003ParameterTypeTests/ValidCode.cs renamed to AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/ValidCode.cs AspNetCoreAnalyzers.Tests/ASP003ParameterTypeTests/ValidCode.cs renamed to AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/ValidCode.cs

@@ -2,7 +2,7 @@ namespace AspNetCoreAnalyzers
 {
     using Microsoft.CodeAnalysis;
 
-    internal static class ASP003ParameterType
+    internal static class ASP003ParameterSymbolType
     {
         public const string DiagnosticId = "ASP003";
 

…pNetCoreAnalyzers/ASP003ParameterType.cs …reAnalyzers/ASP003ParameterSymbolType.csAspNetCoreAnalyzers/ASP003ParameterType.cs renamed to AspNetCoreAnalyzers/ASP003ParameterSymbolType.cs AspNetCoreAnalyzers/ASP003ParameterType.cs renamed to AspNetCoreAnalyzers/ASP003ParameterSymbolType.cs

@@ -17,7 +17,7 @@ public class AttributeAnalyzer : DiagnosticAnalyzer
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(
             ASP001ParameterName.Descriptor,
             ASP002MissingParameter.Descriptor,
-            ASP003ParameterType.Descriptor,
+            ASP003ParameterSymbolType.Descriptor,
             ASP005ParameterSyntax.Descriptor,
             ASP006ParameterRegex.Descriptor);
 
@@ -77,12 +77,12 @@ context.ContainingSymbol is IMethodSymbol method &&
 
                     foreach (var pair in pairs)
                     {
-                        if (HasWrongType(pair, out var typeName) &&
+                        if (HasWrongType(pair, out var typeName, out _) &&
                             methodDeclaration.TryFindParameter(pair.Symbol?.Name, out parameterSyntax))
                         {
                             context.ReportDiagnostic(
                                 Diagnostic.Create(
-                                    ASP003ParameterType.Descriptor,
+                                    ASP003ParameterSymbolType.Descriptor,
                                     parameterSyntax.Type.GetLocation(),
                                     ImmutableDictionary<string, string>.Empty.Add(
                                         nameof(TypeSyntax),
@@ -182,7 +182,7 @@ private static PooledList<ParameterPair> GetPairs(UrlTemplate template, IMethodS
             return list;
         }
 
-        private static bool HasWrongType(ParameterPair pair, out string correctType)
+        private static bool HasWrongType(ParameterPair pair, out string correctType, out string correctConstraint)
         {
             if (pair.Route?.Constraints is ImmutableArray<RouteConstraint> constraints &&
                 pair.Symbol is IParameterSymbol parameter)
@@ -193,6 +193,7 @@ private static bool HasWrongType(ParameterPair pair, out string correctType)
                     if (TryGetType(constraint.Span, out var type))
                     {
                         correctType = parameter.Type == type ? null : type.Alias ?? type.FullName;
+                        correctConstraint = null;
                         return correctType != null;
                     }
                 }
@@ -203,10 +204,12 @@ parameter.Type is INamedTypeSymbol namedType &&
                     namedType.TypeArguments.TrySingle(out var typeArg))
                 {
                     correctType = typeArg.ToString();
+                    correctConstraint = null;
                     return true;
                 }
             }
 
+            correctConstraint = null;
             correctType = null;
             return false;
 

AspNetCoreAnalyzers/Analyzers/AttributeAnalyzer.cs

@@ -14,7 +14,7 @@ namespace AspNetCoreAnalyzers
     public class ParameterTypeFix : DocumentEditorCodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds { get; } = ImmutableArray.Create(
-            ASP003ParameterType.DiagnosticId);
+            ASP003ParameterSymbolType.DiagnosticId);
 
         protected override async Task RegisterCodeFixesAsync(DocumentEditorCodeFixContext context)
         {