Merge pull request #1533 from sharwell/sa1129-exception

Fix invalid cast in SA1129 code fix

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1129UnitTests.cs

@@ -90,6 +90,8 @@ public async Task VerifyInvalidValueTypeCreationAsync()
     public void TestMethod()
     {
         var v1 = new TestStruct();
+
+        System.Console.WriteLine(new TestStruct());
     }
 
     private struct TestStruct
@@ -104,6 +106,8 @@ private struct TestStruct
     public void TestMethod()
     {
         var v1 = default(TestStruct);
+
+        System.Console.WriteLine(default(TestStruct));
     }
 
     private struct TestStruct
@@ -115,7 +119,8 @@ private struct TestStruct
 
             DiagnosticResult[] expected =
             {
-                this.CSharpDiagnostic().WithLocation(5, 18)
+                this.CSharpDiagnostic().WithLocation(5, 18),
+                this.CSharpDiagnostic().WithLocation(7, 34),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1129CodeFixProvider.cs

@@ -50,7 +50,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
         {
             var syntaxRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
 
-            var newExpression = syntaxRoot.FindNode(diagnostic.Location.SourceSpan);
+            var newExpression = syntaxRoot.FindNode(diagnostic.Location.SourceSpan, getInnermostNodeForTie: true);
             var newSyntaxRoot = syntaxRoot.ReplaceNode(newExpression, GetReplacementNode(newExpression));
             return document.WithSyntaxRoot(newSyntaxRoot);
         }
@@ -82,7 +82,7 @@ protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fi
 
                 var syntaxRoot = await document.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
 
-                var nodes = diagnostics.Select(diagnostic => syntaxRoot.FindNode(diagnostic.Location.SourceSpan));
+                var nodes = diagnostics.Select(diagnostic => syntaxRoot.FindNode(diagnostic.Location.SourceSpan, getInnermostNodeForTie: true));
 
                 return syntaxRoot.ReplaceNodes(nodes, (originalNode, rewrittenNode) => GetReplacementNode(rewrittenNode));
             }