fix #125 - RECS0015 code fix generate invalid code (Missing parenthesis)

icsharpcode · Oct 21, 2015 · 03fb944 · 03fb944
1 parent a6b806b
commit 03fb944
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/...entials/CSharp/Diagnostics/Synced/Opportunities/InvokeAsExtensionMethodCodeFixProvider.cs b/...entials/CSharp/Diagnostics/Synced/Opportunities/InvokeAsExtensionMethodCodeFixProvider.cs
@@ -34,9 +34,13 @@ public async override Task RegisterCodeFixesAsync(CodeFixContext context)
             var node = root.FindNode(context.Span).Parent.Parent as InvocationExpressionSyntax;
             if (node == null)
                 return;
-            var newRoot = root.ReplaceNode((SyntaxNode)node, node.WithArgumentList(node.ArgumentList.WithArguments(node.ArgumentList.Arguments.RemoveAt(0)))
-                .WithExpression(((MemberAccessExpressionSyntax)node.Expression).WithExpression(node.ArgumentList.Arguments.First().Expression))
-                .WithLeadingTrivia(node.GetLeadingTrivia()));
+            var invocationTarget = ((MemberAccessExpressionSyntax)node.Expression)
+                .WithExpression(CSharpUtil.AddParensIfRequired(node.ArgumentList.Arguments.First().Expression));
+            var newNode = node
+                .WithArgumentList(node.ArgumentList.WithArguments(node.ArgumentList.Arguments.RemoveAt(0)))
+                .WithExpression(invocationTarget)
+                .WithLeadingTrivia(node.GetLeadingTrivia());
+            var newRoot = root.ReplaceNode(node, newNode);
             context.RegisterCodeFix(CodeActionFactory.Create(node.Span, diagnostic.Severity, "Convert to extension method call", document.WithSyntaxRoot(newRoot)), diagnostic);
         }
     }

diff --git a/Tests/CSharp/Diagnostics/StaticMethodInvocationToExtensionMethodInvocationTests.cs b/Tests/CSharp/Diagnostics/StaticMethodInvocationToExtensionMethodInvocationTests.cs
@@ -237,6 +237,38 @@ void F()
 }");
         }
 
+        [Test]
+        public void AddParenthesesIfNecessary()
+        {
+            Analyze<InvokeAsExtensionMethodAnalyzer>(@"using System;
+
+static class Foo
+{
+    public static decimal Abs(this decimal value) => Math.Abs(value);
+}
+
+class Program
+{
+    static void Main()
+    {
+        Foo.$Abs$(-1.0m); // Apply code fix here
+    }
+}", @"using System;
+
+static class Foo
+{
+    public static decimal Abs(this decimal value) => Math.Abs(value);
+}
+
+class Program
+{
+    static void Main()
+    {
+        (-1.0m).Abs(); // Apply code fix here
+    }
+}");
+        }
+
         [Test]
         public void IgnoresDelegateExtensionMethodOnMethod()
         {