Merge pull request #41 from episerver/bugfix/40-partial-router

Fixed issue with out of range exception in partial route rewrite

Author: jbearfoot

src/EpiSourceUpdater/EpiPartialRouterAnalyzer.cs

@@ -28,7 +28,7 @@ public sealed class EpiPartialRouterAnalyzer : EpiSubTypeAnalyzer
         private const string Category = "Upgrade";
 
 
-        private static readonly string MethodName = "RoutePartial";
+        private static readonly string MethodName = "GetPartialVirtualPath";
         private static readonly string RegistrationMethod = "RegisterPartialRouter";
         private static readonly string[] BaseTypes = new[] { "IPartialRouter" };
 
@@ -75,7 +75,7 @@ private void AnalyzeIfInterfaceMethod(SyntaxNodeAnalysisContext context)
             if (namespaceName.Equals(MethodName, StringComparison.Ordinal))
             {
                 var parameters = methodDirective.ParameterList.Parameters;
-                if (IsSubType(methodDirective.Parent as ClassDeclarationSyntax))
+                if (IsSubType(methodDirective.Parent as ClassDeclarationSyntax) && parameters.Count == 4)
                 {
                     var diagnostic = Diagnostic.Create(Rule, methodDirective.Parent.GetLocation(), methodDirective.ToFullString());
                     context.ReportDiagnostic(diagnostic);

src/EpiSourceUpdater/EpiPartialRouterCodeFixProvider.cs

@@ -76,12 +76,12 @@ private static async Task<Document> ReplaceParametersAsync(Document document, Cl
             var parameters = routePartialMethod.ParameterList.Parameters;
             var obsoleteParameter = routePartialMethod.ParameterList.Parameters[1];
             parameters = parameters.Remove(obsoleteParameter);
-            parameters = parameters.Add(obsoleteParameter.WithType(SyntaxFactory.ParseTypeName("UrlResolverContext")));
+            parameters = parameters.Add(obsoleteParameter.WithType(SyntaxFactory.ParseTypeName("UrlResolverContext").WithTrailingTrivia(SyntaxFactory.Whitespace(" "))));
             var updatedMethod = routePartialMethod.WithParameterList(SyntaxFactory.ParameterList(parameters));
 
             var newRoot = root.ReplaceNode(routePartialMethod, updatedMethod);
             var updatedDocument = document.WithSyntaxRoot(newRoot);
-            localDeclaration = newRoot.FindNode(localDeclaration.Span) as ClassDeclarationSyntax;
+            localDeclaration = newRoot.FindNode(localDeclaration.Identifier.Span) as ClassDeclarationSyntax;
 
             var virtualPathMethod = FindMethod(localDeclaration, "GetPartialVirtualPath");
             parameters = virtualPathMethod.ParameterList.Parameters;